diff options
Diffstat (limited to 'applications')
25 files changed, 12 insertions, 34 deletions
diff --git a/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm b/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm index 81622e9bc6..93713c92b1 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm @@ -33,7 +33,6 @@ end margin-left:0px; padding-left:2px; line-height:20px; - height:20px; } .table.cbi-section-table .th { @@ -55,6 +54,11 @@ end } </style> +<%- + local anonclass = (not self.anonymous or self.sectiontitle) and "named" or "anonymous" + local titlename = ifattr(not self.anonymous or self.sectiontitle, "data-title", translate("Name")) +-%> + <fieldset class="cbi-section" id="cbi-<%=self.config%>-<%=self.sectiontype%>"> <% if self.title then -%> <legend><%=self.title%></legend> @@ -62,12 +66,7 @@ end <div class="cbi-section-descr"><%=self.description%></div> <div class="cbi-section-node"> <div class="table cbi-section-table"> - <div class="tr cbi-section-table-titles"> - <%- if self.sectionhead then -%> - <div class="th cbi-section-table-cell"><%=self.sectionhead%></div> - <%- else -%> - <div class="th"> </div> - <%- end -%> + <div class="tr cbi-section-table-titles <%=anonclass%>"<%=titlename%>> <%- for i, k in pairs(self.children) do -%> <div class="th cbi-section-table-cell"<%=width(k)%>> <%-=k.title-%> @@ -76,12 +75,14 @@ end </div> <%- local isempty = true for i, k in ipairs(self:cfgsections()) do - section = k + local section = k + local sectionname = striptags((type(self.sectiontitle) == "function") and self:sectiontitle(section) or k) + local sectiontitle = ifattr(sectionname and (not self.anonymous or self.sectiontitle), "data-title", sectionname) + isempty = false scope = { valueheader = "cbi/cell_valueheader", valuefooter = "cbi/cell_valuefooter" } -%> - <div class="tr cbi-section-table-row" id="cbi-<%=self.config%>-<%=section%>"> - <div class="th"><%=k%></div> + <div class="tr cbi-section-table-row" id="cbi-<%=self.config%>-<%=section%>"<%=sectiontitle%>> <%- for k, node in ipairs(self.children) do node:render(section, scope or {}) diff --git a/applications/luci-app-adblock/luasrc/view/adblock/query.htm b/applications/luci-app-adblock/luasrc/view/adblock/query.htm index 8bbed3a53e..72dc16b1d8 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/query.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/query.htm @@ -5,7 +5,6 @@ This is free software, licensed under the Apache License, Version 2.0 <%+header%> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript"> //<![CDATA[ var stxhr = new XHR(); diff --git a/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm b/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm index fb40335f99..1c58b0a02c 100644 --- a/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm +++ b/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm @@ -58,7 +58,6 @@ <form method="post" action="<%=url('admin/asterisk/dialplans')%>" enctype="multipart/form-data"> <div> - <script type="text/javascript" src="/luci-static/resources/cbi.js"></script> <input type="hidden" name="cbi.submit" value="1" /> <input type="submit" value="Save" class="hidden" /> </div> diff --git a/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm b/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm index e48da608a6..66a06b20f7 100644 --- a/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm +++ b/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm @@ -49,7 +49,6 @@ <form method="post" action="<%=url('admin/asterisk/dialplans/zones')%>" enctype="multipart/form-data"> <div> - <script type="text/javascript" src="/luci-static/resources/cbi.js"></script> <input type="hidden" name="cbi.submit" value="1" /> <input type="submit" value="Save" class="hidden" /> </div> diff --git a/applications/luci-app-commands/luasrc/view/commands.htm b/applications/luci-app-commands/luasrc/view/commands.htm index 4285f25cb2..d60a97c5b7 100644 --- a/applications/luci-app-commands/luasrc/view/commands.htm +++ b/applications/luci-app-commands/luasrc/view/commands.htm @@ -34,7 +34,6 @@ <%+header%> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript">//<![CDATA[ var stxhr = new XHR(); diff --git a/applications/luci-app-cshark/luasrc/view/cshark.htm b/applications/luci-app-cshark/luasrc/view/cshark.htm index bc67f806c4..b71c7fb6ce 100644 --- a/applications/luci-app-cshark/luasrc/view/cshark.htm +++ b/applications/luci-app-cshark/luasrc/view/cshark.htm @@ -82,7 +82,6 @@ $Id$ <hr/> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript">//<![CDATA[ var capture_running = 0; diff --git a/applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm b/applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm index eac1ecdcf5..e4cd969d2e 100644 --- a/applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm +++ b/applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm @@ -11,7 +11,6 @@ local has_ping6 = fs.access("/bin/ping6") or fs.access("/usr/bin/ping6") local has_traceroute6 = fs.access("/usr/bin/traceroute6") %> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript">//<![CDATA[ var stxhr = new XHR(); diff --git a/applications/luci-app-lxc/luasrc/view/lxc.htm b/applications/luci-app-lxc/luasrc/view/lxc.htm index 47cc1a5f3f..55cb23fbd6 100644 --- a/applications/luci-app-lxc/luasrc/view/lxc.htm +++ b/applications/luci-app-lxc/luasrc/view/lxc.htm @@ -64,7 +64,6 @@ local target = nx.uname().machine <hr /> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript"> //<![CDATA[ window.img = { "red" : "<%=resource%>/cbi/red.gif", "green" : "<%=resource%>/cbi/green.gif", "purple" : "<%=resource%>/cbi/purple.gif" }; diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm index bcc23beb31..12700c4a36 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm @@ -13,7 +13,6 @@ <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/troubleshooting")%>"><%:Troubleshooting%></a></li> </ul> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript">//<![CDATA[ XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "detailed_status")%>', null, function(x) diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm index 22f4734ddd..454adcc1cd 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm @@ -25,7 +25,6 @@ ) %> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript">//<![CDATA[ var stxhr = new XHR(); diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm index 4518bd6588..962cde521d 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm @@ -13,7 +13,6 @@ <li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/troubleshooting")%>"><%:Troubleshooting%></a></li> </ul> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <div class="cbi-map"> <%+mwan/overview_status_interface%> diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm index f60e0da0aa..a20516bd2a 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm @@ -13,7 +13,6 @@ <li class="cbi-tab"><a href="<%=luci.dispatcher.build_url("admin/status/mwan/troubleshooting")%>"><%:Troubleshooting%></a></li> </ul> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript">//<![CDATA[ XHR.poll(15, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "troubleshooting_display")%>', null, function(x) diff --git a/applications/luci-app-nlbwmon/luasrc/view/nlbw/backup.htm b/applications/luci-app-nlbwmon/luasrc/view/nlbw/backup.htm index ea2e0f05cf..8a35f97ac9 100644 --- a/applications/luci-app-nlbwmon/luasrc/view/nlbw/backup.htm +++ b/applications/luci-app-nlbwmon/luasrc/view/nlbw/backup.htm @@ -5,7 +5,6 @@ <%+header%> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <h2 name="content"><%:Netlink Bandwidth Monitor - Backup / Restore %></h2> diff --git a/applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm b/applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm index 932c8849a7..616bcc52a1 100644 --- a/applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm +++ b/applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm @@ -195,7 +195,6 @@ <%+header%> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript" src="<%=resource%>/nlbw.chart.min.js"></script> <script type="text/javascript">//<![CDATA[ diff --git a/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm b/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm index 150ed87dad..94f01cb51c 100644 --- a/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm +++ b/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm @@ -118,7 +118,6 @@ end <%+header%> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript">//<![CDATA[ XHR.poll(10 , '<%=REQUEST_URI%>', { status: 1 }, diff --git a/applications/luci-app-olsr-viz/htdocs/cgi-bin/vizdata.sh b/applications/luci-app-olsr-viz/htdocs/cgi-bin/vizdata.sh index 5a74f2be94..7d3214242a 100755 --- a/applications/luci-app-olsr-viz/htdocs/cgi-bin/vizdata.sh +++ b/applications/luci-app-olsr-viz/htdocs/cgi-bin/vizdata.sh @@ -11,7 +11,7 @@ cat<<EOF </HEAD> <BODY> -<script langauge='JavaScript1.2' type='text/javascript'> +<script language='JavaScript1.2' type='text/javascript'> EOF # sed + txtinfo plugin diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm index 2dc4ce1730..1c178f1810 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm @@ -28,7 +28,6 @@ end <%+header%> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript">//<![CDATA[ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 }, function(x, info) diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm index ab09865865..29ea95694c 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm @@ -48,7 +48,6 @@ end <%+header%> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript">//<![CDATA[ XHR.poll(10 , '<%=REQUEST_URI%>', { status: 1 }, diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm index 832a27aed7..f205edc16d 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm @@ -45,7 +45,6 @@ end <%+header%> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript">//<![CDATA[ XHR.poll(10, '<%=REQUEST_URI%>/json', { }, diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm index c75b94fcef..4b733524a5 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm @@ -34,7 +34,6 @@ end <%+header%> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript">//<![CDATA[ XHR.poll(20, '<%=REQUEST_URI%>', { status: 1 }, diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm index 7ca66816ae..9afd367d1f 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm @@ -44,7 +44,6 @@ end <%+header%> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript">//<![CDATA[ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 }, function(x, info) diff --git a/applications/luci-app-splash/luasrc/view/admin_status/splash.htm b/applications/luci-app-splash/luasrc/view/admin_status/splash.htm index aad330791d..cbb7f235fa 100644 --- a/applications/luci-app-splash/luasrc/view/admin_status/splash.htm +++ b/applications/luci-app-splash/luasrc/view/admin_status/splash.htm @@ -134,7 +134,6 @@ end <%+header%> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript">//<![CDATA[ XHR.poll(10 , '<%=REQUEST_URI%>', { status: 1 }, diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm index ffacc2f6df..74542a9ca5 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm @@ -11,7 +11,6 @@ This is free software, licensed under the Apache License, Version 2.0 <%+header%> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <div class="cbi-map"> <div class="cbi-map-descr"> diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm index 57efd97376..8a417d69c2 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm @@ -39,7 +39,6 @@ This is free software, licensed under the Apache License, Version 2.0 <%+header%> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <div class="cbi-map"> <h2 name="content"><%:Wireless Scan%></h2> diff --git a/applications/luci-app-wireguard/luasrc/view/wireguard.htm b/applications/luci-app-wireguard/luasrc/view/wireguard.htm index 64d9955296..cd08e9ed51 100644 --- a/applications/luci-app-wireguard/luasrc/view/wireguard.htm +++ b/applications/luci-app-wireguard/luasrc/view/wireguard.htm @@ -52,7 +52,6 @@ <%+header%> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript">//<![CDATA[ function bytes_to_str(bytes) { |