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 ccdd6fc..db17450 100644 (file)
--- a/modules/luci-base/luasrc/view/cbi/mvalue.htm
+++ b/modules/luci-base/luasrc/view/cbi/mvalue.htm
@@ -21,21 +21,22 @@
                <%- end %>
        </select>
 <% elseif self.widget == "checkbox" then %>
-       <div<%= attr("id", cbid) %>>
+       <div>
                <% for i, key in pairs(self.keylist) do %>
                        <label<%=
-                               attr("id", cbid.."-"..key) ..
                                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 i == self.size then write('<br />') end %>
+                       <% if self.size and (i % self.size) == 0 then write('<br />') end %>
                <% end %>
        </div>
 <% end %>