From 35cc081f0e5f640d98de94a5b1eb649dc68efefb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Fri, 4 Apr 2014 08:20:13 +0000 Subject: [PATCH] Server info page --- public/js/app/router.js | 2 +- public/js/app/views/servers/info.js | 15 +++++++++++++++ public/js/app/views/servers/view.js | 16 +++++++++++++++- public/js/tpl/servers/info.html | 1 + public/js/tpl/servers/view.html | 12 +++++------- 5 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 public/js/app/views/servers/info.js create mode 100644 public/js/tpl/servers/info.html diff --git a/public/js/app/router.js b/public/js/app/router.js index 7a76030..2edbc19 100644 --- a/public/js/app/router.js +++ b/public/js/app/router.js @@ -45,7 +45,7 @@ define(function (require) { }, server: function () { - layoutView.content.show(new ServerView()); + layoutView.content.show(new ServerView({model: servers.first()})); } }); diff --git a/public/js/app/views/servers/info.js b/public/js/app/views/servers/info.js new file mode 100644 index 0000000..9760dcf --- /dev/null +++ b/public/js/app/views/servers/info.js @@ -0,0 +1,15 @@ +define(function (require) { + + "use strict"; + + var $ = require('jquery'), + _ = require('underscore'), + Backbone = require('backbone'), + Marionette = require('marionette'), + tpl = require('text!tpl/servers/info.html'); + + return Marionette.ItemView.extend({ + template: _.template(tpl), + }); + +}); \ No newline at end of file diff --git a/public/js/app/views/servers/view.js b/public/js/app/views/servers/view.js index 4dbceb8..1b569fa 100644 --- a/public/js/app/views/servers/view.js +++ b/public/js/app/views/servers/view.js @@ -6,10 +6,24 @@ define(function (require) { _ = require('underscore'), Backbone = require('backbone'), Marionette = require('marionette'), + Mods = require('app/collections/mods'), + InfoView = require('app/views/servers/info'), + ModsListView = require('app/views/mods/list'), tpl = require('text!tpl/servers/view.html'); - return Marionette.ItemView.extend({ + return Marionette.Layout.extend({ template: _.template(tpl), + + regions: { + info: "#info", + mods: "#mods", + settings: "#settings" + }, + + onRender: function() { + this.info.show(new InfoView({model: this.model})); + this.mods.show(new ModsListView({collection: new Mods(this.model.get('mods'))})); + }, }); }); \ No newline at end of file diff --git a/public/js/tpl/servers/info.html b/public/js/tpl/servers/info.html new file mode 100644 index 0000000..9e1f995 --- /dev/null +++ b/public/js/tpl/servers/info.html @@ -0,0 +1 @@ +

<%-title%>

\ No newline at end of file diff --git a/public/js/tpl/servers/view.html b/public/js/tpl/servers/view.html index 5f0d1f7..2a4b2a1 100644 --- a/public/js/tpl/servers/view.html +++ b/public/js/tpl/servers/view.html @@ -1,15 +1,13 @@
-
...
-
...
-
...
-
...
+
+
+
\ No newline at end of file