From 86d8ddb71e4580c4437a52a2aa556b0c51758e1a Mon Sep 17 00:00:00 2001 From: Michael Hackstein Date: Thu, 30 Jan 2014 20:37:21 +0100 Subject: [PATCH 1/4] Removed pointless console.log --- .../aardvark/frontend/js/graphViewer/graph/arangoAdapter.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/apps/system/aardvark/frontend/js/graphViewer/graph/arangoAdapter.js b/js/apps/system/aardvark/frontend/js/graphViewer/graph/arangoAdapter.js index 3a7ce5486c..f6b7e01c62 100644 --- a/js/apps/system/aardvark/frontend/js/graphViewer/graph/arangoAdapter.js +++ b/js/apps/system/aardvark/frontend/js/graphViewer/graph/arangoAdapter.js @@ -153,7 +153,6 @@ function ArangoAdapter(nodes, edges, viewer, config) { throw "[" + data.errorNum + "] " + data.errorMessage; } catch (e) { - console.log(e); throw "Undefined ERROR"; } } From 875100a195a107fe6a86de2832f0203143bc4aec Mon Sep 17 00:00:00 2001 From: Michael Hackstein Date: Thu, 30 Jan 2014 20:38:49 +0100 Subject: [PATCH 2/4] Encapsulated the GraphViewer menu into a container with padding --- js/apps/system/aardvark/frontend/css/general.css | 10 ++++++++-- .../aardvark/frontend/js/templates/graphView.ejs | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/js/apps/system/aardvark/frontend/css/general.css b/js/apps/system/aardvark/frontend/css/general.css index 75d24c120e..1ed8a29ca8 100644 --- a/js/apps/system/aardvark/frontend/css/general.css +++ b/js/apps/system/aardvark/frontend/css/general.css @@ -1,6 +1,5 @@ /* Sets the default values shared for content views*/ -#content -{ +#content { background-color: rgba(0, 0, 0, 0.15); margin-top: 30px; margin-bottom: 33px; @@ -10,6 +9,13 @@ margin-left: 20px; margin-left: 0; } + +div.content { + padding-top: 13px; + padding-left: 5px; + padding-right: 5px; + padding-bottom: 5px; +} /* layout.css #aboutDiv { padding-bottom: 5px; diff --git a/js/apps/system/aardvark/frontend/js/templates/graphView.ejs b/js/apps/system/aardvark/frontend/js/templates/graphView.ejs index 1fd5109d19..7a708e13ea 100644 --- a/js/apps/system/aardvark/frontend/js/templates/graphView.ejs +++ b/js/apps/system/aardvark/frontend/js/templates/graphView.ejs @@ -24,7 +24,7 @@ gs = _.sortBy(gs, sortF); - + From 521a46088c334e37685a6caf6ee7e9dd7188bfbe Mon Sep 17 00:00:00 2001 From: Michael Hackstein Date: Thu, 30 Jan 2014 20:39:37 +0100 Subject: [PATCH 3/4] Fixed a bug with undefined values printed to console.log but they had no effect --- .../aardvark/frontend/js/collections/arangoDatabase.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/js/apps/system/aardvark/frontend/js/collections/arangoDatabase.js b/js/apps/system/aardvark/frontend/js/collections/arangoDatabase.js index 498273fdb4..d329190b49 100644 --- a/js/apps/system/aardvark/frontend/js/collections/arangoDatabase.js +++ b/js/apps/system/aardvark/frontend/js/collections/arangoDatabase.js @@ -2,13 +2,15 @@ /*global window, Backbone, $, window, _*/ (function() { + 'use strict'; + window.ArangoDatabase = Backbone.Collection.extend({ + model: window.Database, comparator: "name", sync: function(method, model, options) { - 'use strict'; if (method === "read") { options.url = model.url() + "user"; } @@ -20,6 +22,9 @@ }, parse: function(response) { + if (!response) { + return; + } return _.map(response.result, function(v) { return {name:v}; }); From 7f92c53519d0c29b2411d806e9aa1ef6fb3049ac Mon Sep 17 00:00:00 2001 From: Claudius Weinberger Date: Fri, 31 Jan 2014 00:56:56 +0100 Subject: [PATCH 4/4] Some layout changes --- js/apps/system/aardvark/frontend/css/buttons.css | 11 +++++++---- js/apps/system/aardvark/frontend/css/databaseView.css | 2 +- js/apps/system/aardvark/frontend/css/documentView.css | 2 +- .../system/aardvark/frontend/css/documentsView.css | 5 ++++- js/apps/system/aardvark/frontend/css/general.css | 2 +- js/apps/system/aardvark/frontend/css/layout.css | 6 +++--- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/js/apps/system/aardvark/frontend/css/buttons.css b/js/apps/system/aardvark/frontend/css/buttons.css index 1f3916c97e..87ff9c9fc6 100644 --- a/js/apps/system/aardvark/frontend/css/buttons.css +++ b/js/apps/system/aardvark/frontend/css/buttons.css @@ -6,13 +6,13 @@ .addButton { position: relative; margin-right: 7px; - font-size: 20px; + font-size: 22px; color: #8AA050; margin-top: 2px; } .deleteButton { color: #B30000; - font-size: 20px; + font-size: 22px; padding-right: 3px; top: 3px; position: relative; @@ -37,13 +37,16 @@ a.headerButton { margin-left: 5px; margin-right: 5px; min-height: 19px; - border-radius: 2px; + border-radius: 3px; position: relative; box-shadow: none; + background: #8AA051 !important; + /* background: #8f8d8c !important; + */ color:#FFFFFF !important; height:20px; - width:14px; + width:13px; padding: 5px 11px 2px 9px; } diff --git a/js/apps/system/aardvark/frontend/css/databaseView.css b/js/apps/system/aardvark/frontend/css/databaseView.css index 2e95ae8cb9..1fdd0247bf 100644 --- a/js/apps/system/aardvark/frontend/css/databaseView.css +++ b/js/apps/system/aardvark/frontend/css/databaseView.css @@ -44,7 +44,7 @@ #databaseTable td span { float: right; color: #B30000; - font-size: 18px; + font-size: 22px; } #databaseTable td { diff --git a/js/apps/system/aardvark/frontend/css/documentView.css b/js/apps/system/aardvark/frontend/css/documentView.css index 509b79c387..a0e7a4d72b 100644 --- a/js/apps/system/aardvark/frontend/css/documentView.css +++ b/js/apps/system/aardvark/frontend/css/documentView.css @@ -100,7 +100,7 @@ } .addAttribute, .deleteAttribute { - font-size: 27px; + font-size: 22px; float:right; padding-top: 2px; } diff --git a/js/apps/system/aardvark/frontend/css/documentsView.css b/js/apps/system/aardvark/frontend/css/documentsView.css index 6a68642c70..104832f0da 100644 --- a/js/apps/system/aardvark/frontend/css/documentsView.css +++ b/js/apps/system/aardvark/frontend/css/documentsView.css @@ -120,7 +120,7 @@ .snippet-no-num { font-size: 1em; - font-weight: 300; + font-weight: 400; font-family: 'Open Sans', sans-serif; margin-bottom:0px; } @@ -184,7 +184,10 @@ } .pagination ul > li > a:hover, .pagination ul > .active > a, .pagination ul > .active > span { + /* background-color: #8aa050; + */ + background-color: #8f8d8c; color:#FFFFFF; } diff --git a/js/apps/system/aardvark/frontend/css/general.css b/js/apps/system/aardvark/frontend/css/general.css index 75d24c120e..b0c8fee805 100644 --- a/js/apps/system/aardvark/frontend/css/general.css +++ b/js/apps/system/aardvark/frontend/css/general.css @@ -2,7 +2,7 @@ #content { background-color: rgba(0, 0, 0, 0.15); - margin-top: 30px; + margin-top: 25px; margin-bottom: 33px; min-height: 80px; height: 100%; diff --git a/js/apps/system/aardvark/frontend/css/layout.css b/js/apps/system/aardvark/frontend/css/layout.css index 9b05dd7192..1dee5819e9 100644 --- a/js/apps/system/aardvark/frontend/css/layout.css +++ b/js/apps/system/aardvark/frontend/css/layout.css @@ -259,10 +259,10 @@ button { } li a [class^="icon_arangodb"], li a [class*=" icon_arangodb"] { - font-size: 26px; + font-size: 22px; position: absolute; - right: 4px; - top: 0px; + right: 5px; + top: 2px; } .modal-body .icon_arangodb_info {