Fixed Selection box within the navigation bar and removed it from footer. Database tab is now functional

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

@@ -1,20 +1,12 @@
-span.selectDB > select {
-  width: 150px;
-  line-height: 20px;
-  height: 20px;
-  margin: -3px 0px 2px 0px;
-  border-radius: 0 !important;
-  border: 1px solid;
-}
-
-span.selectDB2 {
+span.selectDB {
   top: 6px;
   left: 210px;
   position: absolute;
 }
 
-span.selectDB2 > select {
+span.selectDB > select {
   line-height: 20px;
   height: 20px;
   width: 150px;
+  padding: 0px;
 }

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

@@ -12,9 +12,5 @@ if (list.length > 1) {
   %>
 </select>
 <%
-} else {
-%>
-  <%=current%>
-<%
 }
 %>

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

@@ -12,6 +12,6 @@
 </div>
 
 <div class="footer-right">
-  <p <%=margin?"style='margin-right:"+margin+"px'":""%>><% if(n) { %>Server: <%=n%> <%=v%>, Database: <span id="selectDB" class="selectDB"></span><% } %></p>
+  <p <%=margin?"style='margin-right:"+margin+"px'":""%>><% if(n) { %>Server: <%=n%> <%=v%>, Database: <%=db%><% } %></p>
 </div>
 <div class="footer-invisible" id="databaseName"></div>

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

@@ -3,7 +3,7 @@
         <div class="container">
 
           <a class="arango-logo brand navlogo" href="#"><img src="img/logo_arangob_white.gif"/></a>
-          <span id="selectDB2" class="selectDB2"></span>
+          <span id="selectDB" class="selectDB"></span>
             <div class="nav-collapse arangoNavSwitch">
                 <ul class="nav">
                 </ul>

js/apps/system/aardvark/frontend/js/views/footerView.js

@@ -5,7 +5,6 @@ var footerView = Backbone.View.extend({
   el: '.footer',
   system: {},
   isOffline: true,
-  dbSelectionView: null,
 
   initialize: function () {
     //also server online check
@@ -13,10 +12,6 @@ var footerView = Backbone.View.extend({
     window.setInterval(function(){
       self.getVersion();
     }, 15000);
-    this.dbSelectionView = new window.DBSelectionView({
-      collection: arangoDatabase
-    });
-    
     self.getVersion();
   },
 
@@ -89,7 +84,6 @@ var footerView = Backbone.View.extend({
         database: this.system.database,
         margin: this.resizeMargin
       }));
-      this.dbSelectionView.render($("#selectDB"));
      /* 
           var tag = 'Server: ' + this.system.name + ' ' + this.system.version + 
         ', Database: ' + this.system.database;
@@ -113,7 +107,6 @@ var footerView = Backbone.View.extend({
       database: this.system.database,
       margin: this.resizeMargin
     }));
-    this.dbSelectionView.render($("#selectDB"));
     return this;
   }
 

js/apps/system/aardvark/frontend/js/views/navigationView.js

@@ -15,13 +15,13 @@ var navigationView = Backbone.View.extend({
   render: function() {
     $(this.el).html(this.template.render({}));
     this.handleSelectNavigation();
-    this.dbSelectionView.render($("#selectDB2"));
+    this.dbSelectionView.render($("#selectDB"));
     return this;
   },
 
   handleResize: function (margin) {
     $('.arango-logo').css('margin-left', margin - 17);
-    $("#selectDB2").css('margin-left', margin - 17);
+    $("#selectDB").css('margin-left', margin - 17);
     $('.nav-collapse').css('margin-right', margin - 10);
   },