luci-base: mvalue: fix column wrapping

[project/luci.git] / modules / luci-base / luasrc / view / cbi / mvalue.htm

diff --git a/modules/luci-base/luasrc/view/cbi/mvalue.htm b/modules/luci-base/luasrc/view/cbi/mvalue.htm
index 5d09261..db17450 100644 (file)
--- a/modules/luci-base/luasrc/view/cbi/mvalue.htm
+++ b/modules/luci-base/luasrc/view/cbi/mvalue.htm
@@ -1,19 +1,43 @@
-<% local v = self:valuelist(section) or {} -%>
+<%
+       local i, key
+       local v = self:valuelist(section) or {}
+-%>
+
 <%+cbi/valueheader%>
 <% if self.widget == "select" then %>
-       <select class="cbi-input-select" multiple="multiple" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%= attr("name", cbid) .. ifattr(self.size, "size") %>>
-       <% for i, key in pairs(self.keylist) do -%>
-               <option<%= attr("value", key) .. ifattr(luci.util.contains(v, key), "selected", "selected") %>><%=striptags(self.vallist[i])%></option>
-       <%- end %>
+       <select class="cbi-input-select" multiple="multiple" data-update="click change"<%=
+               attr("id", cbid) ..
+               attr("name", cbid) ..
+               ifattr(self.size, "size")
+       %>>
+               <% for i, key in pairs(self.keylist) do -%>
+                       <option<%=
+                               attr("id", cbid.."-"..key) ..
+                               attr("value", key) ..
+                               attr("data-index", i) ..
+                               attr("data-depends", self:deplist2json(section, self.deplist[i])) ..
+                               ifattr(luci.util.contains(v, key), "selected", "selected")
+                       %>><%=pcdata(self.vallist[i])%></option>
+               <%- end %>
        </select>
-<% elseif self.widget == "checkbox" then
-       local c = 0;
-       for i, key in pairs(self.keylist) do
-       c = c + 1
-%>
-       <input class="cbi-input-checkbox" type="checkbox" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%= attr("id", cbid..c) .. attr("name", cbid) .. attr("value", key) .. ifattr(luci.util.contains(v, key), "checked", "checked") %> />
-       <label<%= attr("for", cbid..c) %>><%=self.vallist[i]%></label><% if not self.oneline then %><br /><% else %> <% end %>
-<% if c == self.size then c = 0 %><br />
-<% end end %>
+<% elseif self.widget == "checkbox" then %>
+       <div>
+               <% for i, key in pairs(self.keylist) do %>
+                       <label<%=
+                               attr("data-index", i) ..
+                               attr("data-depends", self:deplist2json(section, self.deplist[i]))
+                       %>>
+                               <input class="cbi-input-checkbox" type="checkbox" data-update="click change"<%=
+                                       attr("id", cbid.."-"..key) ..
+                                       attr("name", cbid) ..
+                                       attr("value", key) ..
+                                       ifattr(luci.util.contains(v, key), "checked", "checked")
+                               %> />
+                               <label<%= attr("for", cbid.."-"..key)%>></label>
+                               <%=pcdata(self.vallist[i])%>
+                       </label>
+                       <% if self.size and (i % self.size) == 0 then write('<br />') end %>
+               <% end %>
+       </div>
 <% end %>
 <%+cbi/valuefooter%>