X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libs%2Fcbi%2Fluasrc%2Fview%2Fcbi%2Fucisection.htm;h=db32c904390734f8f442e75723f5d6aee1e8ba76;hb=7b23839dce0c09953142a5af946ab642027bc3c5;hp=c245940d4bc1551dfa49a9f7737c02779d84d0c4;hpb=4ca6f02af21d968e7da2018515f41cee4e4efd3f;p=oweals%2Fluci.git

diff --git a/libs/cbi/luasrc/view/cbi/ucisection.htm b/libs/cbi/luasrc/view/cbi/ucisection.htm
index c245940d4..db32c9043 100644
--- a/libs/cbi/luasrc/view/cbi/ucisection.htm
+++ b/libs/cbi/luasrc/view/cbi/ucisection.htm
@@ -13,22 +13,59 @@ $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 type(self.hidden) == "table" then
+		for k, v in pairs(self.hidden) do
+-%>
+	<input type="hidden" id="<%=k%>" name="<%=k%>" value="<%=pcdata(v)%>" />
+<%-
+		end
+	end
+%>
+
+<% if self.tabs then %>
+	<%+cbi/tabcontainer%>
+<% else %>
+	<% self:render_children(section, scope or {}) %>
+<% end %>
+
+<% if self.error and self.error[section] then -%>
+	<div class="cbi-section-error">
+		<ul><% for _, e in ipairs(self.error[section]) do -%>
+			<li>
+				<%- if e == "invalid" then -%>
+					<%:One or more fields contain invalid values!%>
+				<%- elseif e == "missing" then -%>
+					<%:One or more required fields have no value!%>
+				<%- else -%>
+					<%=pcdata(e)%>
+				<%- end -%>
+			</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
+				-%>
+				}, '', '<%-: -- custom -- -%>');
+			</script>
+			<% end %>
 		<% else %>
-		<select name="cbi.opt.<%=self.config%>.<%=section%>">
-			<option><%:cbi_addopt%></option>
+		<select id="cbi.opt.<%=self.config%>.<%=section%>" name="cbi.opt.<%=self.config%>.<%=section%>">
+			<option><%: -- Additional Field -- %></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>
 			<%- end %>
@@ -39,7 +76,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
 		-%>
@@ -47,6 +85,6 @@ $Id$
 		<%- end %><% end %>
 		<% end %></script>
 	<% end %>
-		<input type="submit" class="cbi-button cbi-button-fieldadd" value="<%:add%>" />
+		<input type="submit" class="cbi-button cbi-button-fieldadd" value="<%:Add%>" />
 	</div>
 <% end %>