From cfb5ca5953ee347b38e318a824ea6f65fddc6628 Mon Sep 17 00:00:00 2001
From: Guido Schwab <g.schwab@triagens.de>
Date: Fri, 21 Feb 2014 15:28:00 +0100
Subject: [PATCH 1/6] fixed links in DB-menu

---
 .../aardvark/frontend/js/templates/dbSelectionView.ejs      | 6 ++++--
 .../aardvark/frontend/js/templates/navigationView.ejs       | 1 -
 js/apps/system/aardvark/frontend/scss/_navbar.scss          | 2 +-
 js/apps/system/aardvark/frontend/scss/generated.css         | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/js/apps/system/aardvark/frontend/js/templates/dbSelectionView.ejs b/js/apps/system/aardvark/frontend/js/templates/dbSelectionView.ejs
index 83e659f083..1c70ea5547 100644
--- a/js/apps/system/aardvark/frontend/js/templates/dbSelectionView.ejs
+++ b/js/apps/system/aardvark/frontend/js/templates/dbSelectionView.ejs
@@ -13,7 +13,7 @@ if (list.length > 1) {
       }
   %>
     <li class="dropdown-item">
-        <a id=<%=i%> class="dbSelectionLink" href="#"><%=i%></a>
+        <a id=<%=i%> class="dbSelectionLink tab" href="#"><%=i%></a>
     </li>
   <%
     });
@@ -23,7 +23,9 @@ if (list.length > 1) {
 %>
     <% if (current === "_system") { %>
     <li class="dropdown-header">Manager</li>
-    <li id="databaseNavi" class="dropdown-item"><a id="databases" class="" href="#databases">Manage DBs</a></li>
+    <li id="databaseNavi" class="dropdown-item">
+      <a id="databases" class="tab" href="#databases">Manage DBs</a>
+    </li>
     <% } %>
 </ul>
 </script>
diff --git a/js/apps/system/aardvark/frontend/js/templates/navigationView.ejs b/js/apps/system/aardvark/frontend/js/templates/navigationView.ejs
index 2e89ee35da..b78de59c8b 100644
--- a/js/apps/system/aardvark/frontend/js/templates/navigationView.ejs
+++ b/js/apps/system/aardvark/frontend/js/templates/navigationView.ejs
@@ -7,7 +7,6 @@
     <li class="graphviewer-menu"><a id="graph" class="tab" href="#graph">Graphs</a></li>
     <li class="applications-menu navbar-spacer-big"><a id="applications" class="tab" href="#applications">Applications</a></li>
     <li class="query-menu"><a id="query" class="tab" href="#query">AQL Editor</a></li>
-<!--    <li class="api-menu"><a id="api" class="tab" href="#api">API</a></li> -->
     <li class="dropdown tools-menu navbar-spacer-med" id="toolsDropdown">
         <a href="#" class="tab" id="tools">Tools <b class="caret"></b></a>
         <ul class="link-dropdown-menu" id="tools_dropdown">
diff --git a/js/apps/system/aardvark/frontend/scss/_navbar.scss b/js/apps/system/aardvark/frontend/scss/_navbar.scss
index fc6cf98d04..571ef6f391 100644
--- a/js/apps/system/aardvark/frontend/scss/_navbar.scss
+++ b/js/apps/system/aardvark/frontend/scss/_navbar.scss
@@ -40,7 +40,7 @@ a.tab {
     right: 10px;
   }
   &.userImg {
-    padding-bottom: 4px;
+    padding-bottom: 5px;
   }
   color: $c_white;
   display: block;
diff --git a/js/apps/system/aardvark/frontend/scss/generated.css b/js/apps/system/aardvark/frontend/scss/generated.css
index 3d2d811f2f..39872d6c24 100644
--- a/js/apps/system/aardvark/frontend/scss/generated.css
+++ b/js/apps/system/aardvark/frontend/scss/generated.css
@@ -215,7 +215,7 @@ a.tab {
   color: white;
   display: block; }
   a.tab.userImg {
-    padding-bottom: 4px; }
+    padding-bottom: 5px; }
 
 #arangoCollectionSelect {
   display: none;

From 7e08be3f3303b5ed16add089b6c38e156814c500 Mon Sep 17 00:00:00 2001
From: Guido Schwab <g.schwab@triagens.de>
Date: Fri, 21 Feb 2014 15:52:29 +0100
Subject: [PATCH 2/6] finally fixed links in DB-menu

---
 js/apps/system/aardvark/frontend/js/views/dbSelectionView.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/apps/system/aardvark/frontend/js/views/dbSelectionView.js b/js/apps/system/aardvark/frontend/js/views/dbSelectionView.js
index e51a06cd8c..7b71f845de 100644
--- a/js/apps/system/aardvark/frontend/js/views/dbSelectionView.js
+++ b/js/apps/system/aardvark/frontend/js/views/dbSelectionView.js
@@ -18,8 +18,7 @@
     },
 
     changeDatabase: function(e) {
-//        var changeTo = $(".dbSelectionLink > option:selected").attr("id");
-        var changeTo = $(".dbSelectionLink").attr("id");
+      var changeTo = $(e.currentTarget).closest(".dbSelectionLink.tab").attr("id");
       var url = this.collection.createDatabaseURL(changeTo);
       window.location.replace(url);
     },

From 43e59bf946ca0695afacaa6c54718d0309aff946 Mon Sep 17 00:00:00 2001
From: Guido Schwab <g.schwab@triagens.de>
Date: Fri, 21 Feb 2014 16:18:46 +0100
Subject: [PATCH 3/6] restricted max length of db name in navbar

---
 .../aardvark/frontend/js/templates/dbSelectionView.ejs      | 2 +-
 js/apps/system/aardvark/frontend/scss/_dbSelection.scss     | 6 ++++++
 js/apps/system/aardvark/frontend/scss/generated.css         | 6 ++++++
 js/apps/system/aardvark/frontend/scss/style.scss            | 2 ++
 4 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 js/apps/system/aardvark/frontend/scss/_dbSelection.scss

diff --git a/js/apps/system/aardvark/frontend/js/templates/dbSelectionView.ejs b/js/apps/system/aardvark/frontend/js/templates/dbSelectionView.ejs
index 1c70ea5547..0f207754f3 100644
--- a/js/apps/system/aardvark/frontend/js/templates/dbSelectionView.ejs
+++ b/js/apps/system/aardvark/frontend/js/templates/dbSelectionView.ejs
@@ -1,5 +1,5 @@
 <script id="dbSelectionView.ejs" type="text/template">
-<a href="#" class="tab" id="dbselection">DB: <%=current%> <b class="caret"></b></a>
+<a href="#" class="tab dbselection" id="dbselection">DB: <%=current%> <b class="caret"></b></a>
 <ul class="link-dropdown-menu" id="dbs_dropdown">
 <%
 if (list.length > 1) {
diff --git a/js/apps/system/aardvark/frontend/scss/_dbSelection.scss b/js/apps/system/aardvark/frontend/scss/_dbSelection.scss
new file mode 100644
index 0000000000..01363dd6b4
--- /dev/null
+++ b/js/apps/system/aardvark/frontend/scss/_dbSelection.scss
@@ -0,0 +1,6 @@
+.dbselection {
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  max-width: 180px;
+}
\ No newline at end of file
diff --git a/js/apps/system/aardvark/frontend/scss/generated.css b/js/apps/system/aardvark/frontend/scss/generated.css
index 39872d6c24..e387573cee 100644
--- a/js/apps/system/aardvark/frontend/scss/generated.css
+++ b/js/apps/system/aardvark/frontend/scss/generated.css
@@ -513,3 +513,9 @@ select.filterSelect {
   max-width: 300px !important;
   word-wrap: break-word !important;
   white-space: normal !important; }
+
+.dbselection {
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  max-width: 180px; }
diff --git a/js/apps/system/aardvark/frontend/scss/style.scss b/js/apps/system/aardvark/frontend/scss/style.scss
index 56f3c9f91b..828f127466 100644
--- a/js/apps/system/aardvark/frontend/scss/style.scss
+++ b/js/apps/system/aardvark/frontend/scss/style.scss
@@ -28,3 +28,5 @@
 @import "userMenu";
 // Tooltips
 @import "tooltips";
+// dbSelection
+@import "dbSelection";

From 85d1f6af3d4ea443b1c2d44aad210c51440790c5 Mon Sep 17 00:00:00 2001
From: Guido Schwab <g.schwab@triagens.de>
Date: Fri, 21 Feb 2014 16:38:39 +0100
Subject: [PATCH 4/6] restricted max length of db name in navbar - fixed caret

---
 js/apps/system/aardvark/frontend/scss/_dbSelection.scss | 2 ++
 js/apps/system/aardvark/frontend/scss/generated.css     | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/apps/system/aardvark/frontend/scss/_dbSelection.scss b/js/apps/system/aardvark/frontend/scss/_dbSelection.scss
index 01363dd6b4..1957b1f5f5 100644
--- a/js/apps/system/aardvark/frontend/scss/_dbSelection.scss
+++ b/js/apps/system/aardvark/frontend/scss/_dbSelection.scss
@@ -3,4 +3,6 @@
   white-space: nowrap;
   overflow: hidden;
   max-width: 180px;
+  float: left;
+  margin-right: 3px;
 }
\ No newline at end of file
diff --git a/js/apps/system/aardvark/frontend/scss/generated.css b/js/apps/system/aardvark/frontend/scss/generated.css
index e387573cee..73557e27e5 100644
--- a/js/apps/system/aardvark/frontend/scss/generated.css
+++ b/js/apps/system/aardvark/frontend/scss/generated.css
@@ -518,4 +518,6 @@ select.filterSelect {
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
-  max-width: 180px; }
+  max-width: 180px;
+  float: left;
+  margin-right: 3px; }

From 1dd358e5ecbdfc86c704f8a339cd834a8852f33c Mon Sep 17 00:00:00 2001
From: Guido Schwab <g.schwab@triagens.de>
Date: Fri, 21 Feb 2014 16:43:15 +0100
Subject: [PATCH 5/6] restricted max length of db name in navbar - shortened

---
 .../system/aardvark/frontend/js/templates/dbSelectionView.ejs   | 2 +-
 js/apps/system/aardvark/frontend/scss/_dbSelection.scss         | 2 +-
 js/apps/system/aardvark/frontend/scss/generated.css             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/apps/system/aardvark/frontend/js/templates/dbSelectionView.ejs b/js/apps/system/aardvark/frontend/js/templates/dbSelectionView.ejs
index 0f207754f3..1bb30aceff 100644
--- a/js/apps/system/aardvark/frontend/js/templates/dbSelectionView.ejs
+++ b/js/apps/system/aardvark/frontend/js/templates/dbSelectionView.ejs
@@ -1,5 +1,5 @@
 <script id="dbSelectionView.ejs" type="text/template">
-<a href="#" class="tab dbselection" id="dbselection">DB: <%=current%> <b class="caret"></b></a>
+<a href="#" class="tab" id="dbselection"></span><div class="dbselection">DB: <%=current%></div> <b class="caret"></b></a>
 <ul class="link-dropdown-menu" id="dbs_dropdown">
 <%
 if (list.length > 1) {
diff --git a/js/apps/system/aardvark/frontend/scss/_dbSelection.scss b/js/apps/system/aardvark/frontend/scss/_dbSelection.scss
index 1957b1f5f5..88ebd3190b 100644
--- a/js/apps/system/aardvark/frontend/scss/_dbSelection.scss
+++ b/js/apps/system/aardvark/frontend/scss/_dbSelection.scss
@@ -2,7 +2,7 @@
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
-  max-width: 180px;
+  max-width: 160px;
   float: left;
   margin-right: 3px;
 }
\ No newline at end of file
diff --git a/js/apps/system/aardvark/frontend/scss/generated.css b/js/apps/system/aardvark/frontend/scss/generated.css
index 73557e27e5..01bf159cb1 100644
--- a/js/apps/system/aardvark/frontend/scss/generated.css
+++ b/js/apps/system/aardvark/frontend/scss/generated.css
@@ -518,6 +518,6 @@ select.filterSelect {
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
-  max-width: 180px;
+  max-width: 160px;
   float: left;
   margin-right: 3px; }

From b35906f4eb5fec12727531c70eef15e4a5db11d4 Mon Sep 17 00:00:00 2001
From: Jan Steemann <jan@arangodb.com>
Date: Fri, 21 Feb 2014 17:43:08 +0100
Subject: [PATCH 6/6] ?como me llamo?

---
 etc/arangodb/arangod.conf.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/arangodb/arangod.conf.in b/etc/arangodb/arangod.conf.in
index 15150d4b13..a94a210c7a 100644
--- a/etc/arangodb/arangod.conf.in
+++ b/etc/arangodb/arangod.conf.in
@@ -1,4 +1,4 @@
-# AragoDB configuration file
+# ArangoDB configuration file
 # 
 # Documentation: 
 # http://www.arangodb.org/manuals/current/CommandLine.html