1
0
Fork 0

added description to locked collections

This commit is contained in:
hkernbach 2016-02-17 17:50:00 +01:00
parent 493db4431b
commit 34e47326b9
6 changed files with 26 additions and 7 deletions

View File

@ -409,7 +409,8 @@
array.push({ array.push({
collection: aardvark.collection, collection: aardvark.collection,
id: aardvark.id, id: aardvark.id,
type: aardvark.type type: aardvark.type,
desc: aardvark.desc
}); });
} }
else { else {

View File

@ -15,7 +15,8 @@
type: "", type: "",
isSystem: false, isSystem: false,
picture: "", picture: "",
locked: false locked: false,
desc: undefined
}, },
getProperties: function () { getProperties: function () {
@ -112,7 +113,7 @@
window.arangoHelper.addAardvarkJob({ window.arangoHelper.addAardvarkJob({
id: xhr.getResponseHeader('x-arango-async-id'), id: xhr.getResponseHeader('x-arango-async-id'),
type: 'index', type: 'index',
desc: 'Creating index...', desc: 'Creating Index',
collection: self.get("id") collection: self.get("id")
}); });
callback(false, data); callback(false, data);
@ -144,7 +145,7 @@
window.arangoHelper.addAardvarkJob({ window.arangoHelper.addAardvarkJob({
id: xhr.getResponseHeader('x-arango-async-id'), id: xhr.getResponseHeader('x-arango-async-id'),
type: 'index', type: 'index',
desc: 'Removing index...', desc: 'Removing Index',
collection: self.get("id") collection: self.get("id")
}); });
callback(false, data); callback(false, data);

View File

@ -13,9 +13,15 @@
<!--<img src="<%= model.get('picture') %>" height="50" width="50" alt="" class="icon">--> <!--<img src="<%= model.get('picture') %>" height="50" width="50" alt="" class="icon">-->
<div class="tileBadge"> <div class="tileBadge">
<span> <span>
<% if(model.get('desc')) { %>
<div class="corneredBadge inProgress">
<%= model.get('desc') %>
</div>
<% } else if (model.get('status') === "loaded") { %>
<div class="corneredBadge <%= model.get('status') %>"> <div class="corneredBadge <%= model.get('status') %>">
<%= model.get('status') %> <%= model.get('status') %>
</div> </div>
<% } %>
</span> </span>
</div> </div>

View File

@ -26,11 +26,11 @@
render: function () { render: function () {
if (this.model.get("locked")) { if (this.model.get("locked")) {
$(this.el).addClass('locked'); $(this.el).addClass('locked');
$(this.el).addClass(this.model.get("lockType"));
} }
else { else {
$(this.el).removeClass('locked'); $(this.el).removeClass('locked');
} }
if (this.model.get("status") === 'loading') { if (this.model.get("status") === 'loading') {
$(this.el).addClass('locked'); $(this.el).addClass('locked');
} }

View File

@ -28,6 +28,7 @@
}); });
model.set('locked', true); model.set('locked', true);
model.set('lockType', locked.type); model.set('lockType', locked.type);
model.set('desc', locked.desc);
}); });
this.collection.each(function(model) { this.collection.each(function(model) {

View File

@ -71,7 +71,13 @@ $iconsize: 50px;
&.locked { &.locked {
cursor: not-allowed; cursor: not-allowed;
opacity: .5;
.iconSet,
.borderBox,
.collection-type-icon,
.collectionName {
opacity: .5;
}
.iconSet { .iconSet {
span:hover { span:hover {
@ -226,6 +232,7 @@ $iconsize: 50px;
.borderBox { .borderBox {
border: 1px solid $c-tile-border; border: 1px solid $c-tile-border;
border-bottom: 0;
border-radius: 3px; border-radius: 3px;
height: 75px; height: 75px;
position: absolute; position: absolute;
@ -276,7 +283,6 @@ $iconsize: 50px;
border-bottom: 16px solid $c-unloaded; border-bottom: 16px solid $c-unloaded;
} }
.deleted div { .deleted div {
border-bottom: 16px solid $c-state-critical; border-bottom: 16px solid $c-state-critical;
} }
@ -323,6 +329,10 @@ $iconsize: 50px;
border-bottom-color: $c-positive; border-bottom-color: $c-positive;
} }
&.inProgress {
border-bottom-color: $c-progress-bar;
}
&.unloaded { &.unloaded {
border-bottom-color: $c-unloaded; border-bottom-color: $c-unloaded;
} }