several frontend bugfixes, optimizations

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

@@ -23,8 +23,7 @@
       "cInfo/:colname": "cInfo",
       "collection/:colid/:docid": "document",
       "shell": "shell",
-      "queries": "query2",
+      "queries": "query",
-      "query2": "query",
       "workMonitor": "workMonitor",
       "databases": "databases",
       "settings": "databases",
@@ -558,27 +557,12 @@
       this.shellView.render();
     },
 
-    /*query: function (initialized) {
+    query: function (initialized) {
       this.checkUser();
       if (!initialized) {
         this.waitForInit(this.query.bind(this));
         return;
       }
-      if (!this.queryView) {
-        this.queryView = new window.queryView({
-          collection: this.queryCollection
-        });
-      }
-      this.queryView.render();
-    },
-    */
-
-    query2: function (initialized) {
-      this.checkUser();
-      if (!initialized) {
-        this.waitForInit(this.query2.bind(this));
-        return;
-      }
       if (!this.queryView2) {
         this.queryView2 = new window.queryView2({
           collection: this.queryCollection

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

@@ -499,7 +499,7 @@
           advancedTableContent.push(
             window.modalView.createSelectEntry(
               "new-collection-sync",
-              "Sync",
+              "Wait for sync",
               "",
               "Synchronize to disk before returning from a create or update of a document.",
               [{value: false, label: "No"}, {value: true, label: "Yes"}]

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

@@ -109,7 +109,7 @@
       $('#queryImportDialog').modal('show'); 
     },
 
-    closeExportDialo: function() {
+    closeExportDialog: function() {
       $('#queryImportDialog').modal('hide'); 
     },
 
@@ -690,10 +690,12 @@
 
     checkForNewBindParams: function() {
       var self = this,
-      words = (this.aqlEditor.getValue()).split(" "),
+      text = this.aqlEditor.getValue() //Remove comments
+      .replace(/\s*\/\/.*\n/g, '\n')
+      .replace(/\s*\/\*.*?\*\//g, ''),
+      words = text.split(" "),
       words1 = [],
       pos = 0;
-
       _.each(words, function(word) {
         word = word.split("\n");
         _.each(word, function(x) {
@@ -1295,6 +1297,7 @@
           warnings += "\r\n" + "Result:" + "\r\n\r\n";
         }
         outputEditor.setValue(warnings + JSON.stringify(data.result, undefined, 2));
+        outputEditor.getSession().setScrollTop(0);
       };
 
       var fetchQueryResult = function(data) {

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

@@ -92,11 +92,10 @@
             arangoHelper.arangoError('Could not delete collection.');
           },
           success: function() {
-            window.modalView.hide();
+            window.App.navigate("#collections", {trigger: true});
           }
         }
       );
-      this.collectionsView.render();
     },
 
     saveModifiedCollection: function() {

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

@@ -187,7 +187,6 @@ div.headerBar {
     right: 0;
     top: 0;
   };
-  text-transform: capitalize;
 
   .fa {
     margin-left: 10px;

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

@@ -51,12 +51,12 @@
 
   .fa {
     color: rgba(0, 0, 0, .2);
-    float: right;
+    float: left;
     font-size: 14pt;
+    left: 30px;
     margin-right: 44px;
     margin-top: 11px;
     position: absolute;
-    right: -11px;
 
     &.fa-lock {
       right: -9px;
@@ -87,7 +87,8 @@
     height: 40px;
     margin: 0 0 15px;
     outline: 0;
-    padding: 15px;
+    padding: 10px;
+    padding-left: 35px;
     width: 100%;
   }
 

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

@@ -296,11 +296,15 @@
   }
 
   .errorMessage {
-    color: $c-negative;
+    background: $c-negative;
+    border-radius: 4px;
+    color: $c-white;
     font-size: 9pt;
-    font-weight: 400;
+    font-weight: 100;
     margin-bottom: 5px;
-    margin-top: -9px;
+    margin-top: -7px;
+    padding-left: 5px;
+    padding-right: 5px;
     position: absolute;
   }
 

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

@@ -5,6 +5,10 @@
   .selected-row {
     background-color: rgba(46, 204, 113, .2);
   }
+
+  .dataTables_empty {
+    padding-left: 10px;
+  }
 }
 
 .pure-table {