matth
/
daapr
1
0
Fork 0
Code Releases Activity

\!

Browse Source
master
Matthieu Lalonde 12 years ago committed by xSmurf
parent 49a8229162
commit 448d32a873
8 changed files with 49 additions and 51 deletions
Show Stats Download Patch File Download Diff File

34
resources/css/app.css
Unescape View File

@ -178,44 +178,44 @@ body > .ui-layout-center > div {
display: block; display: block;
} }
body > .ui-layout-center > div > div:first { body > .ui-layout-center > div {
margin: 0; margin: 0;
padding: 0; padding: 0;
background: #FFF url(../img/grid3-hrow2.gif) repeat-x; background: #FFF url(../img/grid3-hrow2.gif) repeat-x;
} }
body > .ui-layout-center > div > div:first > div.third { body > .ui-layout-center > div > div.third {
width: 33.3333%; width: 33.3333%;
float: left; float: left;
clear: none; clear: none;
} }
body > .ui-layout-center > div > div:first > div.third:first-child { body > .ui-layout-center > div > div.third:first-child {
clear: left; clear: left;
} }
body > .ui-layout-center > div > div:first > div.third:last-child { body > .ui-layout-center > div > div.third:last-child {
clear: right; clear: right;
} }
body > .ui-layout-center > div > div:first > div.third > div.dataTables_wrapper, body > .ui-layout-center > div > div.third > div.dataTables_wrapper,
body > .ui-layout-center > div > div:first > div.third > div.dataTables_wrapper { body > .ui-layout-center > div > div.third > div.dataTables_wrapper {
border-left: 1px solid #C6C6C6; border-left: 1px solid #C6C6C6;
} }
body > .ui-layout-center > div > div:first > div:first-child > div.dataTables_wrapper, body > .ui-layout-center > div > div:first-child > div.dataTables_wrapper,
body > .ui-layout-center > div > div:first > div:first-child > div.dataTables_wrapper { body > .ui-layout-center > div > div:first-child > div.dataTables_wrapper {
border-left: none; border-left: none;
padding-left: 1px; padding-left: 1px;
} }
body > .ui-layout-center > div > div:first > div.third > div.dataTables_wrapper table td { body > .ui-layout-center > div > div.third > div.dataTables_wrapper table td {
padding-left: 4px; padding-left: 4px;
} }
body > .ui-layout-center > div > div:first table.dataTable tr td.sorting_1 { background-color: transparent; } body > .ui-layout-center > div table.dataTable tr td.sorting_1 { background-color: transparent; }
body > .ui-layout-center > div > div:first table.dataTable tr td.sorting_2 { background-color: transparent; } body > .ui-layout-center > div table.dataTable tr td.sorting_2 { background-color: transparent; }
body > .ui-layout-center > div > div:first table.dataTable tr td.sorting_3 { background-color: transparent; } body > .ui-layout-center > div table.dataTable tr td.sorting_3 { background-color: transparent; }
.ui-layout-center .client-view-container { .ui-layout-center .client-view-container {
@ -344,7 +344,7 @@ div.dataTables_scrollHeadInner th {
border: none; border: none;
} }
body > .ui-layout-center > div > div:first div.dataTables_scrollHeadInner th { body > .ui-layout-center > div div.dataTables_scrollHeadInner th {
padding-left: 4px; padding-left: 4px;
} }
@ -361,10 +361,10 @@ table.dataTable tbody tr.selected td,
table.dataTable tbody tr.selected td.sorting_1, table.dataTable tbody tr.selected td.sorting_1,
table.dataTable tbody tr.selected td.sorting_2, table.dataTable tbody tr.selected td.sorting_2,
table.dataTable tbody tr.selected td.sorting_3, table.dataTable tbody tr.selected td.sorting_3,
body > .ui-layout-center > div > div:first > div.third > div.dataTables_wrapper table tr.selected td, body > .ui-layout-center > div > div.third > div.dataTables_wrapper table tr.selected td,
body > .ui-layout-center > div > div:first > div.third > div.dataTables_wrapper table tr.selected td.sorting_1, body > .ui-layout-center > div > div.third > div.dataTables_wrapper table tr.selected td.sorting_1,
body > .ui-layout-center > div > div:first > div.third > div.dataTables_wrapper table tr.selected td.sorting_2, body > .ui-layout-center > div > div.third > div.dataTables_wrapper table tr.selected td.sorting_2,
body > .ui-layout-center > div > div:first > div.third > div.dataTables_wrapper table tr.selected td.sorting_3, body > .ui-layout-center > div > div.third > div.dataTables_wrapper table tr.selected td.sorting_3,
.dropdown-menu * a:hover, .dropdown-menu * a:hover,
.dropdown-menu * a:focus, .dropdown-menu * a:focus,
.dropdown-menu * li:hover, .dropdown-menu * li:hover,

9
resources/js/app.js
Unescape View File

@ -178,7 +178,7 @@ _
pushState: true pushState: true
, root: Config.docRoot , root: Config.docRoot
}); });
console.log(Bootstrap);
// For now let's reset the state when we start up // For now let's reset the state when we start up
//that.navigate("", false); //that.navigate("", false);
@ -211,13 +211,14 @@ console.log(Bootstrap);
if (server && client) { if (server && client) {
that.Views.SideBar.select(server); that.Views.SideBar.select(server);
// FIXME: This needs to take client states into account
var __fnAppEventClientLoaded = function () { var __fnAppEventClientLoaded = function () {
if (!that.Views.Main.getView(server.get("hostname"))) { if (!that.Views.Main.getView(server.get("hostname"))) {
console.log(server);
that.Views.Main.setView(server.client.attributes.hostname, new ClientView({ that.Views.Main.setView(server.client.attributes.hostname, new ClientView({
/*el: that.Views.App.Layout.panes.center /*el: that.Views.App.Layout.panes.center
, */server: server , */server: server
, aoppendEl: that.Views.App.Layout.panes.center , appendEl: that.Views.App.Layout.panes.center
})); }));
} }
@ -347,6 +348,8 @@ console.log(Bootstrap);
that._modalAbout = $(tmplModalAbout); that._modalAbout = $(tmplModalAbout);
that._modalAbout.on("hidden", function __fnEventAppModalAboutClosed(event) { that._modalAbout.on("hidden", function __fnEventAppModalAboutClosed(event) {
// FIXME: Doesn't seem to work
console.log(window.history.length, that.historyStart);
if (window.history.length === that.historyStart) { if (window.history.length === that.historyStart) {
that.navigate("", false); that.navigate("", false);
} else { } else {

1
resources/js/views/browser.js
Unescape View File

@ -43,7 +43,6 @@ _
; ;
Browser.__super__.initialize.apply(that); Browser.__super__.initialize.apply(that);
that.client = client; that.client = client;
} }
}); });

9
resources/js/views/client.js
Unescape View File

@ -32,7 +32,8 @@ _
var Client = Backbone.View.extend({ var Client = Backbone.View.extend({
id: null id: null
, el: $(tmplClientLayout) //, el: $(tmplClientLayout)
, tagName: "div"
, Server: null , Server: null
@ -61,10 +62,8 @@ _
that.el.id = "__view-cient-" + that.Server.client.attributes.hostname.replace(".", "_"); that.el.id = "__view-cient-" + that.Server.client.attributes.hostname.replace(".", "_");
that.id = that.Server.client.attributes.hostname; that.id = that.Server.client.attributes.hostname;
that.el.innerHTML = tmplClientLayout;
/* that.el.innerHTML = that.el.innerHTML.replace("this.type", that.Server.client.url());
*/
} }
, _initLayout: function () { , _initLayout: function () {

7
resources/js/views/main.js
Unescape View File

@ -71,18 +71,15 @@ _
console.debug("Show view: "+ name);//, that.$el, that.children[name], that.children[name].$el); console.debug("Show view: "+ name);//, that.$el, that.children[name], that.children[name].$el);
if (that.children[name] && that.children[name].$el) { if (that.children[name] && that.children[name].$el) {
console.log(that.$el.find(that.children[name].$el));
if (that.$el.find(that.children[name].$el).length === 0) { if (that.$el.find(that.children[name].$el).length === 0) {
that.$el.append(that.children[name].$el); that.$el.append(that.children[name].$el);
} }
if (that.children[name].show) { if (that.children[name].show) {
setTimeout(function __fnTimeoutMainViewShow() {
that.children[name].show(); that.children[name].show();
}, 50);
} else { } else {
setTimeout(function __fnTimeoutMainViewShow() {
that.children[name].$el.show(); that.children[name].$el.show();
}, 50);
} }
} }
} }
@ -102,7 +99,7 @@ _
} }
setTimeout(function __fnTimeoutMainViewHide() { setTimeout(function __fnTimeoutMainViewHide() {
that.$el.find(that.children[name].$el).remove(); that.$el.find(that.children[name].$el).detach();
}, 50); }, 50);
} }
} }

2
resources/js/views/sidebar.js
Unescape View File

@ -200,6 +200,8 @@ console.log(event);
model.destroy(); model.destroy();
}, 10); }, 10);
} }
event.preventDefault();
}; };
}(item)); }(item));

10
resources/templates/app/modal-login.html
Unescape View File

@ -4,19 +4,19 @@
<fieldset> <fieldset>
<legend>{{dmap_itemname}} login</legend> <legend>{{dmap_itemname}} login</legend>
<p> <p>
<input type="text" class="input-large" placeholder="Login"> <input type="text" class="input-large" placeholder="Login" tabindex="1">
</p> </p>
<p> <p>
<input type="password" class="input-large" placeholder="Password"> <input type="password" class="input-large" placeholder="Password" tabindex="2">
</p> </p>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox"> Remember me <input type="checkbox" tabindex="3"> Remember me
</label> </label>
</fieldset> </fieldset>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-mini" data-dismiss="modal" aria-hidden="true"><i class="icon-remove"></i>&nbsp;Cancel</a> <a class="btn btn-mini" data-dismiss="modal" aria-hidden="true" tabindex="5"><i class="icon-remove"></i>&nbsp;Cancel</a>
<button class="btn btn-mini btn-primary" data-dismiss="action" aria-hidden="true"><i class="icon-ok"></i>&nbsp;Login</button> <button class="btn btn-mini btn-primary" data-dismiss="action" aria-hidden="true" tabindex="5"><i class="icon-ok"></i>&nbsp;Login</button>
</div> </div>
</form> </form>
</div> </div>

2
resources/templates/client/layout.html
Unescape View File

@ -1,4 +1,3 @@
<div class="client-view-container">
<div class="ui-layout-north row-fluid span12"> <div class="ui-layout-north row-fluid span12">
<div class="third"> <div class="third">
<table cellpadding="0" cellspacing="0" border="0" class="table-genres"><tr><td><h1>" + this.type + "</h1></td></tr></table> <table cellpadding="0" cellspacing="0" border="0" class="table-genres"><tr><td><h1>" + this.type + "</h1></td></tr></table>
@ -11,4 +10,3 @@
</div> </div>
</div> </div>
<div class="ui-layout-center"></div> <div class="ui-layout-center"></div>
</div>
Write Preview
Loading…
Cancel
Save