summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2014-06-25 21:08:34 +0300
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2014-06-25 23:35:45 +0300
commit9b1a1d67f288ef3ba01d2c6c5724d844eb67ca02 (patch)
treed883f73b2cf3d0b8d35ecfc281f08da6654741c5 /web
parent215f94b00c3540dc60f3b498e4fdf7094f30324b (diff)
downloadaconf-9b1a1d67f288ef3ba01d2c6c5724d844eb67ca02.tar.bz2
aconf-9b1a1d67f288ef3ba01d2c6c5724d844eb67ca02.tar.xz
web client: do not attach labels when displaying sets
Diffstat (limited to 'web')
-rw-r--r--web/widget/abstract/fields.js4
-rw-r--r--web/widget/inline.js22
2 files changed, 15 insertions, 11 deletions
diff --git a/web/widget/abstract/fields.js b/web/widget/abstract/fields.js
index 67ccf88..7a9773f 100644
--- a/web/widget/abstract/fields.js
+++ b/web/widget/abstract/fields.js
@@ -113,7 +113,9 @@ define(
!set,
!set && _.contains(meta.removable, name)
);
- this.setupWidget(widget, meta["ui-member"] + " " + name);
+ this.setupWidget(
+ widget, set ? null : meta["ui-member"] + " " + name
+ );
widget.trigger("start");
return widget;
},
diff --git a/web/widget/inline.js b/web/widget/inline.js
index d016088..87e6bc7 100644
--- a/web/widget/inline.js
+++ b/web/widget/inline.js
@@ -98,20 +98,22 @@ define(
var self = this;
var description = el.data("description");
- var labelTd = $("<td>").text(label);
- el.on("hasDetails", function(event, path) {
- labelTd.html(dom.objectRef(path).text(label));
- el.on("statusChanged", function(event, status) {
- dom.setStatus(labelTd, status);
- event.stopPropagation();
+ var labelTd = label ? $("<td>").text(label) : null;
+ if (labelTd)
+ el.on("hasDetails", function(event, path) {
+ labelTd.html(dom.objectRef(path).text(label));
+ el.on("statusChanged", function(event, status) {
+ dom.setStatus(labelTd, status);
+ event.stopPropagation();
+ });
+ event.stopPropagation();
});
- event.stopPropagation();
- });
+ function prependLabel(el) { if (labelTd) el.prepend(labelTd); }
el = dom.makeRow(el);
if (el.is("tr")) {
- el.prepend(labelTd);
+ prependLabel(el);
if (description) el.append($("<td>").text(description));
this.appendRow(el);
}
@@ -124,7 +126,7 @@ define(
tr.prepend($("<td>"));
});
tr.children().first().remove();
- tr.prepend(labelTd);
+ prependLabel(tr);
this.table = el;
}
else this.table = null;