X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fluci-base%2Fluasrc%2Fview%2Fcbi%2Flvalue.htm;h=61759fdd41ff588c7687e9e46a1e635a4083bedc;hp=ac63e9efd43068de9350f3b14d4287c8f7101b46;hb=afdc349ab4ff6bc89b0527f36d5197b7896d86f4;hpb=8f409a45abb8cc4fda068c6a24085c467f3e37d8;ds=sidebyside

diff --git a/modules/luci-base/luasrc/view/cbi/lvalue.htm b/modules/luci-base/luasrc/view/cbi/lvalue.htm
index ac63e9efd..61759fdd4 100644
--- a/modules/luci-base/luasrc/view/cbi/lvalue.htm
+++ b/modules/luci-base/luasrc/view/cbi/lvalue.htm
@@ -1,18 +1,42 @@
+<%
+	local i, key
+	local br = self.orientation == "horizontal" and '&#160;' or '<br />'
+%>
+
 <%+cbi/valueheader%>
 <% if self.widget == "select" then %>
-	<select class="cbi-input-select" data-update="change"<%= attr("id", cbid) .. attr("name", cbid) .. ifattr(self.size, "size") %>>
-	<% for i, key in pairs(self.keylist) do -%>
-		<option id="cbi-<%=self.config.."-"..section.."-"..self.option.."-"..key%>"<%= attr("value", key) .. ifattr(tostring(self:cfgvalue(section) or self.default) == key, "selected", "selected") .. attr("data-index", i) .. attr("data-depends", self:deplist2json(section, self.deplist[i])) %>><%=striptags(self.vallist[i])%></option>
-	<%- end %>
+	<select class="cbi-input-select" data-update="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(tostring(self:cfgvalue(section) or self.default) == key, "selected", "selected")
+			%>><%=pcdata(self.vallist[i])%></option>
+		<%- end %>
 	</select>
-<% elseif self.widget == "radio" then
-	local c = 0
-	for i, key in pairs(self.keylist) do
-	c = c + 1
-%>
-	<input class="cbi-input-radio" data-update="click change" type="radio"<%= attr("id", cbid.."-"..key) .. attr("name", cbid) .. attr("value", key) .. ifattr((self:cfgvalue(section) or self.default) == key, "checked", "checked") .. attr("data-index", i) .. attr("data-depends", self:deplist2json(section, self.deplist[i])) %> />
-	<label<%= attr("for", cbid.."-"..key) %>><%=self.vallist[i]%></label>
-<% if c == self.size then c = 0 %><% if self.orientation == "horizontal" then %>&#160;<% else %><br /><% end %>
-<% end end %>
+<% elseif self.widget == "radio" then %>
+	<div<%= attr("id", cbid) %>>
+		<% 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-radio" data-update="click change" type="radio"<%=
+					attr("name", cbid) ..
+					attr("value", key) ..
+					ifattr((self:cfgvalue(section) or self.default) == key, "checked", "checked")
+				%> />
+				<%=pcdata(self.vallist[i])%>
+			</label>
+			<% if i == self.size then write(br) end %>
+		<% end %>
+	</div>
 <% end %>
 <%+cbi/valuefooter%>