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

html/admin/css/collectionsItemView.css

@@ -66,3 +66,12 @@
 .icon-edit:hover, .icon-info-sign:hover { 
   opacity: 1.0;
 }
+
+.disabled-info-view {
+  opacity: 0.2 !important;
+}
+
+.disabled-info-view:hover {
+  opacity: 0.2 !important;
+  cursor: default !important;
+}

html/admin/js/templates/queryView.ejs

@@ -4,7 +4,7 @@
   </div>
 </ul>
 
-<div id="queryDiv" class="form-actions">
+<div id="queryDiv" class="form-actions" style="display:none">
   <div id="outputLabel">Result</div>
   <div id="outputToolbar">
     <i class="icon-ban-circle queryTooltips" title="Clear" id="clearOutput"></i>

html/admin/js/views/collectionInfoView.js

@@ -13,8 +13,6 @@ var collectionInfoView = Backbone.View.extend({
   render: function() {
     $(this.el).html(this.template.text);
     $('#show-collection').modal('show');
-    $('#show-collection').on('hidden', function () {
-    });
     this.fillModal();
 
     $('.modalInfoTooltips').tooltip({

html/admin/js/views/collectionsItemView.js

@@ -14,7 +14,7 @@ window.CollectionListItemView = Backbone.View.extend({
   events: {
     'click .pull-left' : 'noop',
     'click .icon-edit' : 'editProperties',
-    'click .icon-info-sign' : 'showProperties',
+    'click .show-info-view' : 'showProperties',
     'click': 'selectCollection'
   },
   render: function () {

html/admin/js/views/collectionsView.js

@@ -30,9 +30,13 @@ var collectionsView = Backbone.View.extend({
 
     //append info icon for loaded collections
     $('.loaded').parent().prev().append(
-      '<i class="icon-info-sign" alt="Show collection properties"'+
+      '<i class="icon-info-sign show-info-view" alt="Show collection properties"'+
       'title="Show collection properties"></i>'
     );
+    $('.unloaded').parent().prev().append(
+      '<i class="icon-info-sign disabled-info-view" alt="disabled"'+
+      'title="disabled"></i>'
+    );
 
     $('#searchInput').val(searchOptions.searchPhrase);
     $('#searchInput').focus();

html/admin/js/views/dashboardView.js

@@ -95,6 +95,9 @@ var dashboardView = Backbone.View.extend({
     this.replLogState = this.arangoReplication.getLogState();
     this.replApplyState = this.arangoReplication.getApplyState();
     this.putReplicationStatus();
+
+    console.log(this.replLogState);
+    console.log(this.replApplyState);
   },
   putReplicationStatus: function () {
 

html/admin/js/views/newCollectionView.js

@@ -41,6 +41,7 @@ var newCollectionView = Backbone.View.extend({
   },
 
   hidden: function () {
+    window.App.navigate("#", {trigger: true});
   },
 
   saveNewCollection: function(a) {

html/admin/js/views/queryView.js

@@ -32,6 +32,7 @@ var queryView = Backbone.View.extend({
     'change #queryModalSelect'       : 'updateEditSelect',
     'change #querySelect'            : 'importSelected'
   },
+
   listenKey: function (e) {
     if (e.keyCode === 13) {
       this.saveAQL(e);
@@ -42,7 +43,7 @@ var queryView = Backbone.View.extend({
     var outputEditor = ace.edit("queryOutput");
     outputEditor.setValue('');
   },
-  
+
   clearInput: function() {
     var inputEditor = ace.edit("aqlEditor");
     inputEditor.setValue('');
@@ -126,6 +127,7 @@ var queryView = Backbone.View.extend({
     outputEditor.resize();
 
     this.renderSelectboxes();
+    $('#queryDiv').show();
 
     return this;
   },