diff --git a/html/admin/css/dashboardView.css b/html/admin/css/dashboardView.css index 3aefe9e1af..9a76e1aa9f 100644 --- a/html/admin/css/dashboardView.css +++ b/html/admin/css/dashboardView.css @@ -62,7 +62,7 @@ .statSingleClient { height: 300px; width: 100%; - margin-top: 0px; + margin-top: 10px; margin-left: 9px !important; margin-right: 9px; margin-bottom: 0px !important; diff --git a/html/admin/css/documentsView.css b/html/admin/css/documentsView.css index fb7924089f..30aec859fb 100644 --- a/html/admin/css/documentsView.css +++ b/html/admin/css/documentsView.css @@ -131,7 +131,7 @@ table.dataTable thead th { #documentsTableID .even, #logContent .odd, #logContent .even { - margin-bottom: 5px; + margin-bottom: 2px; border:1px solid #c1bdba; background-color: #F9F9F9; } diff --git a/html/admin/css/layout.css b/html/admin/css/layout.css index 8f4cbc82d5..6a451e0d09 100644 --- a/html/admin/css/layout.css +++ b/html/admin/css/layout.css @@ -244,3 +244,7 @@ table .sorting { .marginRight10 { padding-right: 33px !important; } + +.form-actions { + margin-top: -10px !important; +} diff --git a/html/admin/css/modal.css b/html/admin/css/modal.css index 0e0af36939..927f2496b7 100644 --- a/html/admin/css/modal.css +++ b/html/admin/css/modal.css @@ -104,4 +104,6 @@ width: 100%; } - +.modal { + border-radius: 0 !important; +} diff --git a/html/admin/js/views/dashboardView.js b/html/admin/js/views/dashboardView.js index 807177ed2d..c01429ffbc 100644 --- a/html/admin/js/views/dashboardView.js +++ b/html/admin/js/views/dashboardView.js @@ -23,6 +23,7 @@ var dashboardView = Backbone.View.extend({ detailGraph: "userTime", initialize: function () { + this.loadGraphState(); this.arangoReplication = new window.ArangoReplication(); var self = this; @@ -254,6 +255,7 @@ var dashboardView = Backbone.View.extend({ self.renderCharts(); } + this.loadGraphState(); return this; }, @@ -396,6 +398,7 @@ var dashboardView = Backbone.View.extend({ var figure = $(a.target).attr("value"); $('#'+figure+'Checkbox').prop('checked', false); $('#'+figure).hide(); + this.saveGraphState(); }, renderDetailChart: function (a) { @@ -609,18 +612,17 @@ var dashboardView = Backbone.View.extend({ self.graphState[identifier] = false; } }); - console.log("after"); - console.log(this.graphState); + localStorage.setItem("dbGraphState", this.graphState); }, loadGraphState: function () { + localStorage.getItem("dbGraphState"); console.log(this.graphState); $.each(this.graphState, function(k,v) { if (v === true) { $("#"+k).show(); } else { - console.log("tohide"); $("#"+k).hide(); } }); @@ -649,7 +651,6 @@ var dashboardView = Backbone.View.extend({ $('.db-info').tooltip({ placement: "top" }); - this.saveGraphState(figure); } }); diff --git a/html/admin/js/views/navigationView.js b/html/admin/js/views/navigationView.js index 1b40ce09d8..3c492fd307 100644 --- a/html/admin/js/views/navigationView.js +++ b/html/admin/js/views/navigationView.js @@ -8,13 +8,14 @@ var navigationView = Backbone.View.extend({ $(window).resize(function() { self.handleResize(); }); - self.handleResize(); + this.handleResize(); }, template: new EJS({url: 'js/templates/navigationView.ejs'}), render: function() { $(this.el).html(this.template.text); + this.handleResize(); return this; }, @@ -32,6 +33,8 @@ var navigationView = Backbone.View.extend({ $('#content').width(newWidth); $('#content').css('margin-left', marginWidth); $('#content').css('margin-right', marginWidth); + $('.arango-logo').css('margin-left', marginWidth -20); + console.log(marginWidth); }, selectMenuItem: function (menuItem) {