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

js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster.js

@@ -14724,6 +14724,29 @@ nv.models.stackedAreaChart = function() {
       };
     },
 
+    setCheckboxStatus: function(id) {
+      $.each($(id).find('ul').find('li'), function(key, element) {
+         if (!$(element).hasClass("nav-header")) {
+           if ($(element).find('input').attr('checked')) {
+             if ($(element).find('i').hasClass('css-round-label')) {
+               $(element).find('i').addClass('fa-dot-circle-o');
+             }
+             else {
+               $(element).find('i').addClass('fa-check-circle-o');
+             }
+           }
+           else {
+             if ($(element).find('i').hasClass('css-round-label')) {
+               $(element).find('i').addClass('fa-circle-o');
+             }
+             else {
+               $(element).find('i').addClass('fa-circle-o');
+             }
+           }
+         }
+      });
+    },
+
     calculateCenterDivHeight: function() {
       var navigation = $('.navbar').height();
       var footer = $('.footer').height();

js/apps/system/_admin/aardvark/APP/clusterFrontend/build/style.css

@@ -1926,15 +1926,15 @@ nav.navbar {
     margin-top: -1px;
     width: 40%; }
   nav.navbar .nav > .active > a {
-    background-color: #8aa051;
+    background-color: #fff;
-    color: #fff;
+    color: #000;
     -webkit-box-shadow: 0 0 0 transparent inset;
     -moz-box-shadow: 0 0 0 transparent inset;
     box-shadow: 0 0 0 transparent inset; }
   nav.navbar .nav > li > a:focus {
     background-color: #fff; }
   nav.navbar .nav > li > a:hover {
-    background-color: #8aa051;
+    background-color: #000;
     color: #686766; }
 
 div.navlogo {
@@ -1964,9 +1964,32 @@ ul.navlist {
     ul.navlist li.active .tab {
       border-bottom: 2px solid #8aa051;
       padding-bottom: 4px; }
-  ul.navlist > li.active, ul.navlist li.dropdown-item:hover, ul.navlist > li:hover {
+  ul.navlist > li.active {
     background-color: transparent; }
-    ul.navlist > li.active a, ul.navlist li.dropdown-item:hover a, ul.navlist > li:hover a {
+    ul.navlist > li.active a {
+      color: #000; }
+  ul.navlist > li.active:hover {
+    background-color: transparent; }
+    ul.navlist > li.active:hover a {
+      color: #000; }
+  ul.navlist li.navbar-spacer, ul.navlist li.divider {
+    border: none; }
+  ul.navlist li.divider {
+    background-color: rgba(0, 0, 0, 0.2); }
+  ul.navlist li {
+    border-top: 1px solid transparent;
+    border-left: 1px solid transparent;
+    border-right: 1px solid transparent; }
+    ul.navlist li.dropdown:hover {
+      border-top: 1px solid rgba(0, 0, 0, 0.2);
+      border-left: 1px solid rgba(0, 0, 0, 0.2);
+      border-right: 1px solid rgba(0, 0, 0, 0.2);
+      border-bottom-left-radius: 0;
+      border-bottom-right-radius: 0; }
+  ul.navlist li.dropdown-item:hover, ul.navlist > li:hover {
+    background-color: #fff;
+    border-radius: 3px; }
+    ul.navlist li.dropdown-item:hover a, ul.navlist > li:hover a {
       color: #000; }
   ul.navlist li.dropdown-item {
     margin-left: 0; }
@@ -1993,6 +2016,14 @@ a.tab {
   border-bottom: 0 !important;
   font-weight: 300; }
 
+ul.link-dropdown-menu {
+  background-color: #fff;
+  z-index: -10;
+  margin-top: 7px;
+  margin-right: -1px;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  border-top-right-radius: 0; }
+
 ul.script-dropdown-menu li.dropdown-item {
   margin-left: 0; }
   ul.script-dropdown-menu li.dropdown-item a {
@@ -2013,7 +2044,7 @@ ul.gv-dropdown-menu {
   ul.gv-dropdown-menu:after {
     border-bottom-color: #fff; }
   ul.gv-dropdown-menu li:hover {
-    background-color: #8aa051;
+    background-color: #fff;
     background-image: none; }
   ul.gv-dropdown-menu li a {
     padding: 0; }
@@ -4603,9 +4634,7 @@ div.dropdownInner {
   div.dropdownInner ul li .fa {
     margin-right: 5px;
     color: #8c8a89; }
-    div.dropdownInner ul li .fa.fa-square-0 {
+    div.dropdownInner ul li .fa.fa-check-circle-o, div.dropdownInner ul li .fa.fa-dot-circle-o {
-      margin-left: 1px; }
-    div.dropdownInner ul li .fa.fa-check-square-o, div.dropdownInner ul li .fa.fa-check-circle-o {
       color: #8aa051; }
 
 div.queryline {

js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js

@@ -54,6 +54,29 @@
       };
     },
 
+    setCheckboxStatus: function(id) {
+      $.each($(id).find('ul').find('li'), function(key, element) {
+         if (!$(element).hasClass("nav-header")) {
+           if ($(element).find('input').attr('checked')) {
+             if ($(element).find('i').hasClass('css-round-label')) {
+               $(element).find('i').addClass('fa-dot-circle-o');
+             }
+             else {
+               $(element).find('i').addClass('fa-check-circle-o');
+             }
+           }
+           else {
+             if ($(element).find('i').hasClass('css-round-label')) {
+               $(element).find('i').addClass('fa-circle-o');
+             }
+             else {
+               $(element).find('i').addClass('fa-circle-o');
+             }
+           }
+         }
+      });
+    },
+
     calculateCenterDivHeight: function() {
       var navigation = $('.navbar').height();
       var footer = $('.footer').height();

js/apps/system/_admin/aardvark/APP/frontend/js/templates/applicationsView.ejs

@@ -18,22 +18,25 @@
       <li class="nav-header">Type</li>
       <li><a href="#applications">
         <label class="checkbox checkboxLabel">
-          <input class="css-checkbox" type="checkbox" id="checkProduction">
+          <input class="css-checkbox" type="checkbox" id="checkProduction"/>
-          <label class="css-label"></label>Production
+          <i class="fa"></i>
+          Production
         </label>
       </a></li>
 
       <li><a href="#applications">
         <label class="checkbox checkboxLabel">
-          <input class="css-checkbox" type="checkbox" id="checkDevel">
+          <input class="css-checkbox" type="checkbox" id="checkDevel"/>
-          <label class="css-label"></label>Development
+          <i class="fa"></i>
+          Development
         </label>
       </a></li>
 
       <li><a href="#applications">
         <label class="checkbox checkboxLabel">
-          <input class="css-checkbox" id="checkSystem" type="checkbox">
+          <input class="css-checkbox" id="checkSystem" type="checkbox"/>
-          <label class="css-label"></label>System applications
+          <i class="fa"></i>
+          System applications
         </label>
       </a></li>
     </ul>

js/apps/system/_admin/aardvark/APP/frontend/js/templates/dbSelectionView.ejs

@@ -4,7 +4,7 @@
 <%
 if (list.length > 0) {
 %>
-    <li class="dropdown-header">DBs</li>
+    <li class="dropdown-header">Databases</li>
   <%
     _.each(list, function(i) {
   %>
@@ -23,7 +23,7 @@ if (list.length > 0) {
     <% } %>
     <li class="dropdown-header">Manager</li>
     <li id="databaseNavi" class="dropdown-item">
-      <a id="databases" class="tab" href="#databases">Manage DBs</a>
+      <a id="databases" class="tab" href="#databases">Manage Databases</a>
     </li>
     <% } %>
 </ul>

js/apps/system/_admin/aardvark/APP/frontend/js/templates/graphManagementView.ejs

@@ -28,7 +28,8 @@
         <li><a>
           <label class="checkbox checkboxLabel">
             <input class="css-checkbox" type="checkbox" id="graphSortDesc">
-            <label class="css-label" id="graphSortDesc"></label>Sort descending
+            <i class="fa"></i>
+            Sort descending
           </label>
         </a></li>
       </ul>

js/apps/system/_admin/aardvark/APP/frontend/js/templates/userManagementView.ejs

@@ -44,7 +44,8 @@
       <li><a href="#">
         <label class="checkbox checkboxLabel">
           <input class="css-checkbox" type="checkbox" id="userSortDesc">
-          <label class="css-label"></label>Sort descending
+          <i class="fa"></i>
+          Sort descending
         </label>
       </a></li>
     </ul>

js/apps/system/_admin/aardvark/APP/frontend/js/views/applicationsView.js

@@ -13,26 +13,32 @@
       "click #foxxToggle"            : "slideToggle",
       "click #checkDevel"            : "toggleDevel",
       "click #checkProduction"       : "toggleProduction",
-      "click #checkSystem"           : "toggleSystem",
+      "click #checkSystem"           : "toggleSystem"
-      "click .css-label"             : "checkBoxes"
     },
 
-
+    fixCheckboxes: function() {
-    checkBoxes: function (e) {
+      if (this._showDevel) {
-      //chrome bugfix
+        $('#checkDevel').attr('checked', 'checked');
-
-      var isChromium = window.chrome,
-      vendorName = window.navigator.vendor,
-      clicked = e.currentTarget;
-
-      if (clicked.id === '' || clicked.id === undefined) {
-        if(isChromium !== null && isChromium !== undefined && vendorName === "Google Inc.") {
-          $(clicked).prev().click();
-        }
       }
       else {
-        $('#'+clicked.id).click();
+        $('#checkDevel').removeAttr('checked');
       }
+      if (this._showSystem) {
+        $('#checkSystem').attr('checked', 'checked');
+      }
+      else {
+        $('#checkSystem').removeAttr('checked');
+      }
+      if (this._showProd) {
+        $('#checkProduction').attr('checked', 'checked');
+      }
+      else {
+        $('#checkProduction').removeAttr('checked');
+      }
+      $('#checkDevel').next().removeClass('fa fa-check-circle-o fa-circle-o').addClass('fa');
+      $('#checkSystem').next().removeClass('fa fa-check-circle-o fa-circle-o').addClass('fa');
+      $('#checkProduction').next().removeClass('fa fa-check-circle-o fa-circle-o').addClass('fa');
+      arangoHelper.setCheckboxStatus('#foxxDropdown');
     },
 
     toggleDevel: function() {
@@ -41,6 +47,7 @@
       _.each(this._installedSubViews, function(v) {
         v.toggle("devel", self._showDevel);
       });
+      this.fixCheckboxes();
     },
 
     toggleProduction: function() {
@@ -49,6 +56,7 @@
       _.each(this._installedSubViews, function(v) {
         v.toggle("production", self._showProd);
       });
+      this.fixCheckboxes();
     },
 
     toggleSystem: function() {
@@ -57,6 +65,7 @@
       _.each(this._installedSubViews, function(v) {
         v.toggle("system", self._showSystem);
       });
+      this.fixCheckboxes();
     },
 
     reload: function() {
@@ -117,6 +126,7 @@
       $('#checkDevel').attr('checked', this._showDevel);
       $('#checkProduction').attr('checked', this._showProd);
       $('#checkSystem').attr('checked', this._showSystem);
+      arangoHelper.setCheckboxStatus("#foxxDropdown");
       
       var self = this;
       _.each(this._installedSubViews, function(v) {

js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsView.js

@@ -47,7 +47,7 @@
       }
 
       var length;
-      this.setCheckboxStatus("#collectionsDropdown");
+      arangoHelper.setCheckboxStatus("#collectionsDropdown");
 
       try {
         length = searchOptions.searchPhrase.length;
@@ -64,29 +64,6 @@
       return this;
     },
 
-    setCheckboxStatus: function(id) {
-      $.each($(id).find('ul').find('li'), function(key, element) {
-         if (!$(element).hasClass("nav-header")) {
-           if ($(element).find('input').attr('checked')) {
-             if ($(element).find('i').hasClass('css-round-label')) {
-               $(element).find('i').addClass('fa-dot-circle-o');
-             }
-             else {
-               $(element).find('i').addClass('fa-check-circle-o');
-             }
-           }
-           else {
-             if ($(element).find('i').hasClass('css-round-label')) {
-               $(element).find('i').addClass('fa-circle-o');
-             }
-             else {
-               $(element).find('i').addClass('fa-circle-o');
-             }
-           }
-         }
-      });
-    },
-
     events: {
       "click #createCollection"        : "createCollection",
       "keydown #searchInput"           : "restrictToSearchPhraseKey",

js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js

@@ -147,6 +147,7 @@
       this.events["click .tableRow"] = this.showHideDefinition.bind(this);
       this.events['change tr[id*="newEdgeDefinitions"]'] = this.setFromAndTo.bind(this);
       this.events["click .graphViewer-icon-button"] = this.addRemoveDefinition.bind(this);
+      arangoHelper.setCheckboxStatus("#graphManagementDropdown");
 
       return this;
     },

js/apps/system/_admin/aardvark/APP/frontend/js/views/userManagementView.js

@@ -103,6 +103,8 @@
         this.editCurrentUser();
       }
 
+      arangoHelper.setCheckboxStatus('#userManagementDropdown');
+
       return this;
     },
 

js/apps/system/_admin/aardvark/APP/frontend/scss/_dropdowns.scss

@@ -74,12 +74,8 @@ div.dropdownInner {
         margin-right: 5px;
         color: #8c8a89;
 
-        &.fa-square-0 {
+        &.fa-check-circle-o,
-          margin-left: 1px;
+        &.fa-dot-circle-o {
-        }
-
-        &.fa-check-square-o,
-        &.fa-check-circle-o {
           color: $c-positive;
         }
       }

js/apps/system/_admin/aardvark/APP/frontend/scss/_navbar.scss

@@ -32,8 +32,8 @@ nav.navbar {
     & > .active {
 
       & > a {
-        background-color: $c-positive;
+        background-color: $c-white;
-        color: $c-white;
+        color: $c-black;
         @include box-shadow(0 0 0 $c-transp inset);
       }
     }
@@ -45,7 +45,7 @@ nav.navbar {
       }
 
       & > a:hover {
-        background-color: $c-positive;
+        background-color: $c-black;
         color: $c-bar-bg;
       }
     }
@@ -101,9 +101,7 @@ ul.navlist {
     }
   }
 
-  > li.active,
+  > li.active {
-  li.dropdown-item:hover,
-  > li:hover {
     background-color: $c-transp;
 
     a {
@@ -111,7 +109,49 @@ ul.navlist {
     }
   }
 
-  li.dropdown-item:hover {
+  > li.active:hover {
+    background-color: $c-transp;
+
+    a {
+      color: $c-black;
+    }
+
+  }
+  li {
+    &.navbar-spacer,
+    &.divider {
+      border: none;
+    }
+
+    &.divider {
+      background-color: rgba(0,0,0,0.2);
+    }
+  }
+
+
+  li {
+
+   border-top: 1px solid transparent;
+   border-left: 1px solid transparent;
+   border-right: 1px solid transparent;
+
+    &.dropdown:hover {
+      border-top: 1px solid rgba(0,0,0,0.2);
+      border-left: 1px solid rgba(0,0,0,0.2);
+      border-right: 1px solid rgba(0,0,0,0.2);
+      border-bottom-left-radius: 0;
+      border-bottom-right-radius: 0;
+    }
+  }
+
+  li.dropdown-item:hover,
+  > li:hover {
+    background-color: $c-white;
+    border-radius: 3px;
+
+    a {
+      color: $c-black;
+    }
   }
 
   li.dropdown-item {
@@ -155,6 +195,12 @@ a.tab {
 
 ul.link-dropdown-menu {
   @extend %dropdown-menu;
+  background-color: $c-white;
+  z-index: -10;
+  margin-top: 7px;
+  margin-right: -1px;
+  border: 1px solid rgba(0,0,0,0.2);
+  border-top-right-radius: 0;
 }
 
 ul.user-dropdown-menu {
@@ -199,7 +245,7 @@ ul.gv-dropdown-menu {
   li {
 
     &:hover {
-      background-color: $c-positive;
+      background-color: $c-white;
       background-image: none;
     }