CBI: Fix subdependencies

[project/luci.git] / libs / cbi / luasrc / view / cbi / full_valuefooter.htm

diff --git a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
index a5a6046a5a896dd4594240cb91b3464e0886fe42..9130a99f96f38a7b699a4a267bd2bae3b08c6e4d 100644 (file)
--- a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
+++ b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
@@ -13,26 +13,46 @@ $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 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>
        <%- end -%>
-
-       <% 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 %>
 </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
+               -%>
+                       <%-=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..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
+               -%>
+                       <%-=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..d.add%>");
                <%- end %>
        </script>
 <%- end %>