X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fcbi%2Fluasrc%2Fview%2Fcbi%2Fucisection.htm;h=5504a7476c562db0cd9ed2ca580d11212a20a9d6;hp=eb581cab78082e9e6301493bac1c9445edd5b2a6;hb=b618361bf1c7ea160f3e0ef18aa8f409f7a21eff;hpb=05d3bf06b4ae6f07ed1c55fd1f7b4e97cb0e2d3d

diff --git a/libs/cbi/luasrc/view/cbi/ucisection.htm b/libs/cbi/luasrc/view/cbi/ucisection.htm
index eb581cab7..5504a7476 100644
--- a/libs/cbi/luasrc/view/cbi/ucisection.htm
+++ b/libs/cbi/luasrc/view/cbi/ucisection.htm
@@ -15,22 +15,52 @@ $Id$
 
 <% self:render_children(section, scope or {}) %>
 
-<% if #self.optionals[section] > 0 or self.dynamic then %>
+<% if self.error and self.error[section] then -%>
+	<div class="cbi-section-error">
+		<ul><% for _, e in ipairs(self.error[section]) do %><li><%=luci.util.pcdata(e):gsub("\n","<br />")%></li><% end %></ul>
+	</div>
+<%- end %>
+
+<% if self.optionals[section] and #self.optionals[section] > 0 or self.dynamic then %>
 	<div class="cbi-optionals">
 		<% if self.dynamic then %>
-			<input type="text" name="cbi.opt.<%=self.config%>.<%=section%>" />
+			<input type="text" id="cbi.opt.<%=self.config%>.<%=section%>" name="cbi.opt.<%=self.config%>.<%=section%>" />
+			<% if self.optionals[section] and #self.optionals[section] > 0 then %>
+			<script type="text/javascript">
+				cbi_combobox_init('cbi.opt.<%=self.config%>.<%=section%>', {
+				<%-
+					for i, val in pairs(self.optionals[section]) do
+				-%>
+					<%-=string.format("%q", val.option) .. ":" .. string.format("%q", striptags(val.title))-%>
+					<%-if next(self.optionals[section], i) then-%>,<%-end-%>
+				<%-
+					end
+				-%>
+				}, '', '<%-:cbi_manual-%>');
+			</script>
+			<% end %>
 		<% else %>
-		<select name="cbi.opt.<%=self.config%>.<%=section%>">
+		<select id="cbi.opt.<%=self.config%>.<%=section%>" name="cbi.opt.<%=self.config%>.<%=section%>">
 			<option><%:cbi_addopt%></option>
-			<% for key, val in pairs(self.optionals[section]) do %>
-				<option id="cbi-<%=self.config.."-"..section.."-"..val.option%>" value="<%=val.option%>"><%=val.title%></option>
-			<% end %>
+			<% for key, val in pairs(self.optionals[section]) do -%>
+				<option id="cbi-<%=self.config.."-"..section.."-"..val.option%>" value="<%=val.option%>"><%=striptags(val.title)%></option>
+			<%- end %>
 		</select>
 		<script type="text/javascript"><% for key, val in pairs(self.optionals[section]) do %>
-			<% if #val.deps > 0 then %><% for j, d in ipairs(val.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..section.."-"..val.option%>", "cbid.<%=self.config.."."..section.."."..d.field%>", "<%=d.value%>");
-		<% end %><% end %>
+			<% if #val.deps > 0 then %><% for j, d in ipairs(val.deps) do -%>
+			cbi_d_add("cbi-<%=self.config.."-"..section.."-"..val.option..d.add%>", {
+		<%-
+			for k,v in pairs(d.deps) do
+		-%>
+			<%-=string.format('"cbid.%s.%s.%s"', self.config, section, k) .. ":" .. string.format("%q", v)-%>
+			<%-if next(d.deps, k) then-%>,<%-end-%>
+		<%-
+			end
+		-%>
+			});
+		<%- end %><% end %>
 		<% end %></script>
 	<% end %>
-		<input type="submit" value="<%:add%>" />
+		<input type="submit" class="cbi-button cbi-button-fieldadd" value="<%:add%>" />
 	</div>
 <% end %>