modules/admin-full: fix arp lookup in wifi overview

[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 0ae45fb..c069b7f 100644 (file)
--- a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
+++ b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
@@ -14,7 +14,7 @@ $Id$
 -%>
 
                <% if self.description and #self.description > 0 then -%>
-                       <% if not luci.util.instanceof( self, luci.cbi.Flag ) then -%>
+                       <% if not luci.util.instanceof( self, luci.cbi.Flag ) or self.orientation == "horizontal" then -%>
                                <br />
                        <%- end %>
                        <div class="cbi-value-description">
@@ -27,19 +27,48 @@ $Id$
        <%- end -%>
 </div>
 
-<% if #self.deps > 0 then -%>
+
+<% 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..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
                -%>
-                       <%-=string.format('"cbid.%s.%s.%s"', self.config, section, k) .. ":" .. string.format("%q", v)-%>
+                       <%-= depk .. ":" .. string.format("%q", v)-%>
                        <%-if next(d.deps, k) then-%>,<%-end-%>
                <%-
                        end
                -%>
-                       }, "cbip-<%=self.config.."-"..section.."-"..self.option%>");
+                       }, "cbip-<%=self.config.."-"..section.."-"..self.option..d.add%>");
                <%- end %>
        </script>
 <%- end %>