X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=libs%2Fcbi%2Fluasrc%2Fview%2Fcbi%2Ffull_valuefooter.htm;h=c069b7f92c33207d57107186b42ba7ff12e80296;hb=7b23839dce0c09953142a5af946ab642027bc3c5;hp=a7b56e29445784573a042e7e361315abf8f9962e;hpb=bdb4bbde130ba4cfb86746dde2905fc12b94175f;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 a7b56e294..c069b7f92 100644
--- a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
+++ b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
@@ -13,23 +13,62 @@ $Id$
 
 -%>
 
-		<% if #self.description > 0 then -%>
-			<div class="cbi-value-description"><%=self.description%></div>
+		<% if self.description and #self.description > 0 then -%>
+			<% if not luci.util.instanceof( self, luci.cbi.Flag ) or self.orientation == "horizontal" 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>
-
-	<% if self.tag_invalid[section] then -%>
-		<div class="cbi-error"><%:cbi_invalid%></div>
-	<%- end %>
-	<% if self.tag_missing[section] then -%>
-		<div class="cbi-error"><%:cbi_missing%></div>
-	<%- end %>
+	<%- end -%>
 </div>
 
-<% if #self.deps > 0 then -%>
-	<script type="text/javascript">
+
+<% if #self.deps > 0 or #self.subdeps > 0 then -%>
+	<script type="text/javascript" id="cbip-<%=self.config.."-"..section.."-"..self.option%>">
+		<% for j, d in ipairs(self.subdeps) do -%>
+			cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option..d.add%>", {
+		<%-
+			for k,v in pairs(d.deps) do
+				local depk
+				if k:find("!", 1, true) then
+					depk = string.format('"%s"', k)
+				elseif k:find(".", 1, true) then
+					depk = string.format('"cbid.%s"', k)
+				else
+					depk = string.format('"cbid.%s.%s.%s"', self.config, section, k)
+				end
+		-%>
+			<%-= depk .. ":" .. string.format("%q", v)-%>
+			<%-if next(d.deps, k) then-%>,<%-end-%>
+		<%-
+			end
+		-%>
+			}, "cbip-<%=self.config.."-"..section.."-"..self.option..d.add%>");
+		<%- end %>
 		<% 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
+				local depk
+				if k:find("!", 1, true) then
+					depk = string.format('"%s"', k)
+				elseif k:find(".", 1, true) then
+					depk = string.format('"cbid.%s"', k)
+				else
+					depk = string.format('"cbid.%s.%s.%s"', self.config, section, k)
+				end
+		-%>
+			<%-= depk .. ":" .. string.format("%q", v)-%>
+			<%-if next(d.deps, k) then-%>,<%-end-%>
+		<%-
+			end
+		-%>
+			}, "cbip-<%=self.config.."-"..section.."-"..self.option..d.add%>");
 		<%- end %>
 	</script>
 <%- end %>