diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/luci-base/htdocs/luci-static/resources/form.js | 10 | ||||
| -rw-r--r-- | modules/luci-compat/luasrc/view/cbi/cell_valueheader.htm | 2 | ||||
| -rw-r--r-- | modules/luci-compat/luasrc/view/cbi/tblsection.htm | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/form.js b/modules/luci-base/htdocs/luci-static/resources/form.js index 7de5e0f76..1c6f84304 100644 --- a/modules/luci-base/htdocs/luci-static/resources/form.js +++ b/modules/luci-base/htdocs/luci-static/resources/form.js @@ -1103,7 +1103,7 @@ var CBITableSection = CBITypedSection.extend({ trEl.appendChild(E('div', { 'class': 'th cbi-section-table-cell', - 'data-type': opt.__name__ + 'data-widget': opt.__name__ })); if (opt.width != null) @@ -1139,7 +1139,7 @@ var CBITableSection = CBITypedSection.extend({ trEl.appendChild(E('div', { 'class': 'th cbi-section-table-cell', - 'data-type': opt.__name__ + 'data-widget': opt.__name__ }, opt.description)); if (opt.width != null) @@ -1444,7 +1444,7 @@ var CBIGridSection = CBITableSection.extend({ 'data-title': (title != '') ? title : null, 'data-description': (descr != '') ? descr : null, 'data-name': opt.option, - 'data-type': opt.typename || opt.__name__ + 'data-widget': opt.typename || opt.__name__ }, (value != null) ? value : E('em', _('none'))); }, @@ -1586,7 +1586,7 @@ var CBIValue = CBIAbstractValue.extend({ 'data-title': (title != '') ? title : null, 'data-description': this.stripTags(this.description).trim(), 'data-name': this.option, - 'data-type': this.typename || (this.template ? this.template.replace(/^.+\//, '') : null) || this.__name__ + 'data-widget': this.typename || (this.template ? this.template.replace(/^.+\//, '') : null) || this.__name__ }, E('div', { 'id': 'cbi-%s-%s-%s'.format(config_name, section_id, this.option), 'data-index': option_index, @@ -1602,7 +1602,7 @@ var CBIValue = CBIAbstractValue.extend({ 'data-depends': depend_list, 'data-field': this.cbid(section_id), 'data-name': this.option, - 'data-type': this.typename || (this.template ? this.template.replace(/^.+\//, '') : null) || this.__name__ + 'data-widget': this.typename || (this.template ? this.template.replace(/^.+\//, '') : null) || this.__name__ }); if (this.last_child) diff --git a/modules/luci-compat/luasrc/view/cbi/cell_valueheader.htm b/modules/luci-compat/luasrc/view/cbi/cell_valueheader.htm index 4b7095754..db5c66850 100644 --- a/modules/luci-compat/luasrc/view/cbi/cell_valueheader.htm +++ b/modules/luci-compat/luasrc/view/cbi/cell_valueheader.htm @@ -5,7 +5,7 @@ -%> <div class="td cbi-value-field<% if self.error and self.error[section] then %> cbi-value-error<% end %><% if self.password then %> nowrap<% end %>"<%= attr("data-name", self.option) .. - ifattr(ftype and #ftype > 0, "data-type", ftype) .. + ifattr(ftype and #ftype > 0, "data-widget", ftype) .. ifattr(title and #title > 0, "data-title", title, true) .. ifattr(descr and #descr > 0, "data-description", descr, true) %>> diff --git a/modules/luci-compat/luasrc/view/cbi/tblsection.htm b/modules/luci-compat/luasrc/view/cbi/tblsection.htm index 11c2206d8..1e067edf3 100644 --- a/modules/luci-compat/luasrc/view/cbi/tblsection.htm +++ b/modules/luci-compat/luasrc/view/cbi/tblsection.htm @@ -52,7 +52,7 @@ function render_titles() for i, k in ipairs(self.children) do if not k.optional then %><div class="th cbi-section-table-cell"<%= - width(k) .. attr('data-type', k.typename) %>><% + width(k) .. attr('data-widget', k.typename) %>><% if k.titleref then %><a title="<%=self.titledesc or translate('Go to relevant configuration page')%>" class="cbi-title-ref" href="<%=k.titleref%>"><% @@ -88,7 +88,7 @@ function render_descriptions() for i, k in ipairs(self.children) do if not k.optional then %><div class="th cbi-section-table-cell"<%= - width(k) .. attr("data-type", k.typename) %>><% + width(k) .. attr("data-widget", k.typename) %>><% write(k.description) |