summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2014-02-20 11:44:00 +0200
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2014-02-20 19:28:52 +0200
commit5a77f59e3bdecd583963ca3eac2a6774214a580d (patch)
tree6bd32947b5f9935a471977f979cd513b1f7ea54e
parent6dd8f7d0fa0864fba7d1cb11730c4606c45dc46c (diff)
downloadacf2-5a77f59e3bdecd583963ca3eac2a6774214a580d.tar.bz2
acf2-5a77f59e3bdecd583963ca3eac2a6774214a580d.tar.xz
web client: display field descriptions
-rw-r--r--web/widget/abstract/fields.js4
-rw-r--r--web/widget/inline.js3
-rw-r--r--web/widget/table/header.js2
-rw-r--r--web/widget/table/row.js2
4 files changed, 7 insertions, 4 deletions
diff --git a/web/widget/abstract/fields.js b/web/widget/abstract/fields.js
index 01e4c0c..6957fe8 100644
--- a/web/widget/abstract/fields.js
+++ b/web/widget/abstract/fields.js
@@ -76,7 +76,9 @@ define(
editable,
removable
);
- var container = this.appendWidget(widget, label);
+ var container = this.appendWidget(
+ widget, label, meta.description
+ );
widget.on("setVisible", function(event, visible) {
if (visible) container.show();
else container.hide();
diff --git a/web/widget/inline.js b/web/widget/inline.js
index b354f5c..4326ba0 100644
--- a/web/widget/inline.js
+++ b/web/widget/inline.js
@@ -95,12 +95,13 @@ define(
}
},
- appendWidget: function(el, label) {
+ appendWidget: function(el, label, description) {
var self = this;
el = dom.makeRow(el);
if (el.is("tr")) {
el.prepend($("<td>").text(label));
+ if (description) el.append($("<td>").text(description));
this.appendRow(el);
}
else {
diff --git a/web/widget/table/header.js b/web/widget/table/header.js
index 7c2f760..a5770c0 100644
--- a/web/widget/table/header.js
+++ b/web/widget/table/header.js
@@ -25,7 +25,7 @@ define(["acf2/widget/table/row", "jquery"], function(Base, $) {
return table;
},
- appendWidget: function(el, label) {
+ appendWidget: function(el, label, description) {
el = Base.appendWidget.call(this, el, label);
if (el) this.header.append($("<th>").text(label));
return el;
diff --git a/web/widget/table/row.js b/web/widget/table/row.js
index 23aadc3..717b4da 100644
--- a/web/widget/table/row.js
+++ b/web/widget/table/row.js
@@ -12,7 +12,7 @@ define(["acf2/widget/abstract/fields", "jquery"], function(Base, $) {
showHeading: false,
- appendWidget: function(el, label) {
+ appendWidget: function(el, label, description) {
if (!el.is("td")) return null;
if (this.previous) this.previous.after(el);
else {