X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=libs%2Fcbi%2Fluasrc%2Fview%2Fcbi%2Ffull_valuefooter.htm;h=a9596441b5e4c5f7b493c19a2c9ed35c6d7d8573;hb=b618361bf1c7ea160f3e0ef18aa8f409f7a21eff;hp=5a52898d1779d394fdb93c42b5a79b61960da1ea;hpb=d7b95a555baac0a815bfb8975648f7435c4a0754;p=project%2Fluci.git

diff --git a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
index 5a52898d1..a9596441b 100644
--- a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
+++ b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
@@ -14,27 +14,32 @@ $Id$
 -%>
 
 		<% if #self.description > 0 then -%>
-			<span class="cbi-value-helpicon"><img src="<%=resource%>/cbi/help.gif" alt="<%:help%>" /></span>
-			<div class="cbi-value-description"><%=self.description%></div>
+			<% if not luci.util.instanceof( self, luci.cbi.Flag ) then -%>
+				<br />
+			<%- end %>
+			<div class="cbi-value-description">
+				<span class="cbi-value-helpicon"><img src="<%=resource%>/cbi/help.gif" alt="<%:help%>" /></span>
+				<%=self.description%>
+			</div>
 		<%- end %>
 	<%- if self.title and #self.title > 0 then -%>
 	</div>
 	<%- end -%>
-
-	<% if self.tag_error[section] then -%>
-		<div class="cbi-error"><%=self.tag_error[section]%></div>
-	<%- elseif self.tag_invalid[section] then -%>
-		<div class="cbi-error"><%:cbi_invalid%></div>
-	<%- elseif self.tag_missing[section] then -%>
-		<div class="cbi-error"><%:cbi_missing%></div>
-	<%- end %>
-
 </div>
 
 <% if #self.deps > 0 then -%>
-	<script type="text/javascript">
+	<script type="text/javascript" id="cbip-<%=self.config.."-"..section.."-"..self.option%>">
 		<% for j, d in ipairs(self.deps) do -%>
-			cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option%>", "cbid.<%=self.config.."."..section.."."..d.field%>", "<%=d.value%>");
+			cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.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
+		-%>
+			}, "cbip-<%=self.config.."-"..section.."-"..self.option%>");
 		<%- end %>
 	</script>
-<%- end %>
+<%- end %>
\ No newline at end of file