X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fluci-base%2Fluasrc%2Fview%2Fcbi%2Fmvalue.htm;h=db17450d27f09409b2a239153aad46dbcaa71fc0;hp=ccdd6fcab397c0641dcd4286b5797876bcdd264c;hb=ae7c6f48df6cfcad7dfc3274e0ead272c8d33cfc;hpb=afdc349ab4ff6bc89b0527f36d5197b7896d86f4

diff --git a/modules/luci-base/luasrc/view/cbi/mvalue.htm b/modules/luci-base/luasrc/view/cbi/mvalue.htm
index ccdd6fcab..db17450d2 100644
--- 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 %>