$Id$
-%>
- <div class="cbi-value-description"><%=self.description%> </div>
- </div>
- <% if self.tag_invalid[section] then %><div class="cbi-error"><%:cbi_invalid%></div><% end %>
- </div>
- <% if #self.deps > 0 then %><script type="text/javascript">
- <% 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%>");
- <% end %>
- </script><% end %>
\ No newline at end of file
+
+ <% if self.description and #self.description > 0 then -%>
+ <% 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 -%>
+</div>
+
+<% if #self.deps > 0 then -%>
+ <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..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 %>