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

VS2012/arango.sln

@@ -41,8 +41,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Arangoimp Binary", "Arangoi
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Arangodump Binary", "Arangodump Binary\Arangodump Binary.vcxproj", "{B4985B94-29DA-4649-A2F2-FEDF4E0560EF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9FB69E35-6ADE-4AAD-9766-B5409C1D2595} = {9FB69E35-6ADE-4AAD-9766-B5409C1D2595}
+		{8985F67A-A9CC-41C8-80D4-364678550F2F} = {8985F67A-A9CC-41C8-80D4-364678550F2F}
+		{604036DD-7013-4463-B827-D06016BD41FC} = {604036DD-7013-4463-B827-D06016BD41FC}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Arangorestore Binary", "Arangorestore Binary\Arangorestore Binary.vcxproj", "{9DB047E8-AD65-4EBB-9BD2-D0A0B6F6BB25}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9FB69E35-6ADE-4AAD-9766-B5409C1D2595} = {9FB69E35-6ADE-4AAD-9766-B5409C1D2595}
+		{8985F67A-A9CC-41C8-80D4-364678550F2F} = {8985F67A-A9CC-41C8-80D4-364678550F2F}
+		{604036DD-7013-4463-B827-D06016BD41FC} = {604036DD-7013-4463-B827-D06016BD41FC}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

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

@@ -24,7 +24,7 @@
 }
 
 .api-actions .resource .heading h2 a {
-  color: #686766 !important;
+  color: #000000 !important;
   font-weight: 300 !important;
 }
 
@@ -73,6 +73,8 @@
   font-size: 14px !important;
   font-weight: 300 !important;
   padding: 8px 16px !important;
+  float: right !important;
+  margin-top: 10px !important;
 }
 
 .api-actions .resource > .heading > .options {

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

@@ -73,10 +73,16 @@
   margin-top: 3px;
   padding: 2px;
   vertical-align: middle;
-  width:207px !important;
+  width:212px !important;
   border-radius: 0px 0px 0px 0px !important;
 }
 
+#searchInput:focus {
+  outline: none;
+  border-color: #8AA051;
+  box-shadow: 0 0 10px #8AA051;
+}
+
 #searchSubmit {
   height: 14px;
   margin-left: -18px;

js/apps/system/aardvark/frontend/js/routers/router.js

@@ -5,8 +5,9 @@ $(document).ready(function() {
 
   window.Router = Backbone.Router.extend({
     routes: {
-      ""                                    : "collections",
+      ""                                    : "dashboard",
       "collection/:colid"                   : "collection",
+      "collections"                         : "collections",
       "collectionInfo/:colid"               : "collectionInfo",
       "new"                                 : "newCollection",
       "login"                               : "login",
@@ -14,7 +15,6 @@ $(document).ready(function() {
       "collection/:colid/:docid"            : "document",
       "collection/:colid/:docid/source"     : "source",
       "shell"                               : "shell",
-      "dashboard"                           : "dashboard",
       "query"                               : "query",
       "logs"                                : "logs",
       "about"                               : "about",

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

@@ -9,8 +9,8 @@
                 </ul>
 
                 <ul class="arango-nav nav pull-right" id="arangoCollectionUl">
-                    <li class="dashboard-menu"><a href="#dashboard">Dashboard</a></li>
+                    <li class="dashboard-menu"><a href="#">Dashboard</a></li>
-                    <li class="collections-menu"><a href="#">Collections</a></li>
+                    <li class="collections-menu"><a href="#collections">Collections</a></li>
                     <li class="applications-menu"><a href="#applications">Applications</a></li>
                     <li class="graphviewer-menu"><a href="#graph">Graphs</a></li>
                     <li class="query-menu"><a href="#query">AQL Editor</a></li>

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

@@ -35,7 +35,7 @@ var collectionInfoView = Backbone.View.extend({
     }
   },
   hidden: function () {
-    window.App.navigate("#", {trigger: true});
+    window.App.navigate("#collections", {trigger: true});
   },
   fillModal: function() {
     try {

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

@@ -55,7 +55,7 @@ var collectionView = Backbone.View.extend({
     }
   },
   hidden: function () {
-    window.App.navigate("#", {trigger: true});
+    window.App.navigate("#collections", {trigger: true});
   },
   toggleNewIndexView: function () {
     $('#indexEditView').toggle("fast");

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

@@ -425,6 +425,8 @@ var dashboardView = Backbone.View.extend({
           return pad(date.getHours()) + ":" + pad(date.getMinutes()) + ":" + pad(date.getSeconds());
         });
 
+	chart.tooltips(false);
+
         var label = figure.units;
 
         if (figure.units === 'bytes') {
@@ -471,7 +473,7 @@ var dashboardView = Backbone.View.extend({
 
     this.loadGraphState();
 
-    //fix position for last value label in detailgraph
+    //fix position for last x-value label in detailgraph
     $('.nv-x.nv-axis .nvd3.nv-wrap.nv-axis:last-child text').attr('x','-5');
   },
 
@@ -602,7 +604,8 @@ var dashboardView = Backbone.View.extend({
       figure.name + '</label></a></li>'
     );
     $('.db-info').tooltip({
-      placement: "top"
+      placement: "top",
+      delay: {show: 3000, hide: 100}
     });
   }
 

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

@@ -311,7 +311,8 @@ var documentsView = Backbone.View.extend({
     if (doctype === 'edge') {
       $('#edgeCreateModal').modal('show');
       $('.modalTooltips').tooltip({
-        placement: "left"
+        placement: "left",
+        delay: {show: 3000, hide: 100}
       });
     }
     else {
@@ -557,7 +558,8 @@ var documentsView = Backbone.View.extend({
     });
 
     $('.glyphicon, .arangoicon').tooltip({
-      placement: "top"
+      placement: "top",
+      delay: {show: 3000, hide: 100}
     });
 
     return this;

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

@@ -166,7 +166,8 @@ var queryView = Backbone.View.extend({
         });
 
         $('.queryTooltips').tooltip({
-            placement: "top"
+            placement: "top",
+            delay: {show: 3000, hide: 100}
         });
 
         $('#aqlEditor .ace_text-input').focus();