diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js b/js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js index aeb4115e88..4231c81e96 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js @@ -409,7 +409,8 @@ array.push({ collection: aardvark.collection, id: aardvark.id, - type: aardvark.type + type: aardvark.type, + desc: aardvark.desc }); } else { diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/models/arangoCollectionModel.js b/js/apps/system/_admin/aardvark/APP/frontend/js/models/arangoCollectionModel.js index 8b7fd2c9fd..45b2ea7044 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/models/arangoCollectionModel.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/models/arangoCollectionModel.js @@ -15,7 +15,8 @@ type: "", isSystem: false, picture: "", - locked: false + locked: false, + desc: undefined }, getProperties: function () { @@ -112,7 +113,7 @@ window.arangoHelper.addAardvarkJob({ id: xhr.getResponseHeader('x-arango-async-id'), type: 'index', - desc: 'Creating index...', + desc: 'Creating Index', collection: self.get("id") }); callback(false, data); @@ -144,7 +145,7 @@ window.arangoHelper.addAardvarkJob({ id: xhr.getResponseHeader('x-arango-async-id'), type: 'index', - desc: 'Removing index...', + desc: 'Removing Index', collection: self.get("id") }); callback(false, data); diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/collectionsItemView.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/collectionsItemView.ejs index ecabcb9476..30e23720ca 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/collectionsItemView.ejs +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/collectionsItemView.ejs @@ -13,9 +13,15 @@
+ <% if(model.get('desc')) { %> +
+ <%= model.get('desc') %> +
+ <% } else if (model.get('status') === "loaded") { %>
<%= model.get('status') %>
+ <% } %>
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsItemView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsItemView.js index 325d1ca5b6..be09577fe6 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsItemView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsItemView.js @@ -26,11 +26,11 @@ render: function () { if (this.model.get("locked")) { $(this.el).addClass('locked'); + $(this.el).addClass(this.model.get("lockType")); } else { $(this.el).removeClass('locked'); } - if (this.model.get("status") === 'loading') { $(this.el).addClass('locked'); } diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsView.js index 74f2907241..04cb1e0443 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsView.js @@ -28,6 +28,7 @@ }); model.set('locked', true); model.set('lockType', locked.type); + model.set('desc', locked.desc); }); this.collection.each(function(model) { diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_tiles.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_tiles.scss index 7d7de761bd..b588a89971 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_tiles.scss +++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_tiles.scss @@ -71,7 +71,13 @@ $iconsize: 50px; &.locked { cursor: not-allowed; - opacity: .5; + + .iconSet, + .borderBox, + .collection-type-icon, + .collectionName { + opacity: .5; + } .iconSet { span:hover { @@ -226,6 +232,7 @@ $iconsize: 50px; .borderBox { border: 1px solid $c-tile-border; + border-bottom: 0; border-radius: 3px; height: 75px; position: absolute; @@ -276,7 +283,6 @@ $iconsize: 50px; border-bottom: 16px solid $c-unloaded; } - .deleted div { border-bottom: 16px solid $c-state-critical; } @@ -323,6 +329,10 @@ $iconsize: 50px; border-bottom-color: $c-positive; } + &.inProgress { + border-bottom-color: $c-progress-bar; + } + &.unloaded { border-bottom-color: $c-unloaded; }