Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

js/apps/system/aardvark/frontend/css/buttons.css

@@ -6,16 +6,15 @@
 .addButton {
   position: relative;
   margin-right: 7px;
-  font-size: 20px;
+  font-size: 22px;
   color: #8AA050;
   margin-top: 2px;
   cursor: pointer;
 }
 
 .deleteButton {
-  /*color: #B30000;*/
   color: #DA4F49;
-  font-size: 20px;
+  font-size: 22px;
   padding-right: 3px;
   top: 3px;
   position: relative;
@@ -45,13 +44,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;
 }
 

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 {

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;
 }

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;
 }
 

js/apps/system/aardvark/frontend/css/general.css

@@ -1,8 +1,7 @@
 /* Sets the default values shared for content views*/
-#content
-{
+#content {
   background-color: rgba(0, 0, 0, 0.15);
-  margin-top: 30px;
+  margin-top: 25px;
   margin-bottom: 33px;
   min-height: 80px;
   height: 100%;
@@ -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;

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 {

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};
       });

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";
           }
         }

js/apps/system/aardvark/frontend/js/templates/graphView.ejs

@@ -24,7 +24,7 @@ gs = _.sortBy(gs, sortF);
     </div>
   </ul>
 
-  <ul class="thumbnails">
+  <div class="content">
     <form action="javascript:void(0);" autocomplete="on" class="form-horizontal" id="creationDialog">
       <fieldset>
         <div class="control-group">
@@ -172,5 +172,5 @@ gs = _.sortBy(gs, sortF);
         </div>
       </fieldset>
     </form>
-  </ul>
+  </div>
 </div>