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

diff --git a/libs/cbi/luasrc/view/cbi/ucisection.htm b/libs/cbi/luasrc/view/cbi/ucisection.htm
index c245940d4..5504a7476 100644
--- a/libs/cbi/luasrc/view/cbi/ucisection.htm
+++ b/libs/cbi/luasrc/view/cbi/ucisection.htm
@@ -15,19 +15,32 @@ $Id$
 
 <% self:render_children(section, scope or {}) %>
 
-<% if #self.optionals[section] > 0 or self.dynamic then %>
-	<% if self.tag_deperror[section] then -%>
-		<div class="cbi-error"><%:cbi_deperror%></div>
-	<% elseif self.tag_invalid[section] then -%>
-		<div class="cbi-error"><%:cbi_invalid_section%></div>
-	<%- elseif self.tag_error[section] then -%>
-		<div class="cbi-error"><%=self.tag_error[section]%></div>
-	<%- end %>
+<% 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%>"><%=striptags(val.title)%></option>
@@ -39,7 +52,8 @@ $Id$
 		<%-
 			for k,v in pairs(d.deps) do
 		-%>
-			<%-=string.format('"cbid.%s.%s.%s"', self.config, section, k) .. ":" .. string.format("%q", v)-%>,
+			<%-=string.format('"cbid.%s.%s.%s"', self.config, section, k) .. ":" .. string.format("%q", v)-%>
+			<%-if next(d.deps, k) then-%>,<%-end-%>
 		<%-
 			end
 		-%>