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

html/admin/css/footerView.css

@@ -10,6 +10,7 @@
   left: 0;
   right: 0;
   bottom: 0px;
+  z-index: 9999;
 }
 
 .footerExtra {
@@ -75,3 +76,24 @@
   background: none repeat scroll 0 0 #383434;
   color: #FFFFFF;
 }
+
+.footer-left {
+  background: none repeat scroll 0 0 #383434;
+  color: #FFFFFF;
+  width: 33.3%;
+  float: left;
+}
+
+.footer-mid {
+  background: none repeat scroll 0 0 #383434;
+  color: #FFFFFF;
+  width: 33.3%;
+  float: left;
+}
+
+.footer-right {
+  background: none repeat scroll 0 0 #383434;
+  color: #383434;
+  width: 33.3%;
+  float: left;
+}

html/admin/js/templates/footerView.ejs

@@ -1,2 +1,10 @@
-        <div class="copy"><p>Copyright (c) triAGENS GmbH | <a href="#about">About</a></p></div>
 
+<div class="footer-left">
+  <p>Welcome <a id="currentUser" style="color:#FFFFFF"> Guest </a><a id="loginLink"> Login</a></p>
+</div>
+
+<div class="copy footer-mid">
+  <p>Copyright (c) triAGENS GmbH | <a href="#about">About</a></p>
+</div>
+
+<div class="footer-right"><p>.</p></div>

html/admin/js/views/queryView.js

@@ -19,7 +19,7 @@ var queryView = Backbone.View.extend({
   template: new EJS({url: 'js/templates/queryView.ejs'}),
 
   render: function() {
-
+    var self = this;
     $(this.el).html(this.template.text);
     var editor = ace.edit("aqlEditor");
     var editor2 = ace.edit("queryOutput");
@@ -36,8 +36,10 @@ var queryView = Backbone.View.extend({
       handles: "s",
       ghost: true,
       stop: function () {
-        var editor2 = ace.edit("queryOutput");
-        editor2.resize();
+        setTimeout(function (){
+          var editor2 = ace.edit("queryOutput");
+          editor2.resize();
+        },200);
       }
     });
     $('#aqlEditor').resizable({
@@ -45,8 +47,10 @@ var queryView = Backbone.View.extend({
       ghost: true,
       //helper: "resizable-helper",
       stop: function () {
-        var editor = ace.edit("aqlEditor");
-        editor.resize();
+        setTimeout(function (){
+          var editor = ace.edit("aqlEditor");
+          editor.resize();
+        },200);
       }
     });