Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

treewide: always include cbi.js

Browse source 
Include cbi.js in the main header template like it is done for xhr.js and
remove the page specific includes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2018-07-07 15:12:47 +02:00
parent 069c0c93e1
commit c0de036b31
42 changed files with 11 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
applications/luci-app-adblock/luasrc/view/adblock/query.htm
View file

@ -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();

1
applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm
View file

@ -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>

1
applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm
View file

@ -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>

1
applications/luci-app-commands/luasrc/view/commands.htm
View file

@ -34,7 +34,6 @@
<%+header%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<script type="text/javascript">//<![CDATA[
var stxhr = new XHR();

1
applications/luci-app-cshark/luasrc/view/cshark.htm
View file

@ -82,7 +82,6 @@ $Id$
<hr/>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<script type="text/javascript">//<![CDATA[
var capture_running = 0;

1
applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm
View file

@ -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();

1
applications/luci-app-lxc/luasrc/view/lxc.htm
View file

@ -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" };

1
applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm
View file

@ -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)

1
applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm
View file

@ -25,7 +25,6 @@
)
%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<script type="text/javascript">//<![CDATA[
var stxhr = new XHR();

1
applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm
View file

@ -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%>

1
applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm
View file

@ -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)

1
applications/luci-app-nlbwmon/luasrc/view/nlbw/backup.htm
View file

@ -5,7 +5,6 @@
<%+header%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<h2 name="content"><%:Netlink Bandwidth Monitor - Backup / Restore %></h2>

1
applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm
View file

@ -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[

1
applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm
View file

@ -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 },

1
applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm
View file

@ -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)

1
applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm
View file

@ -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 },

1
applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm
View file

@ -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', { },

1
applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm
View file

@ -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 },

1
applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
View file

@ -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)

1
applications/luci-app-splash/luasrc/view/admin_status/splash.htm
View file

@ -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 },

1
applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
View file

@ -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">

1
applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
View file

@ -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>

1
applications/luci-app-wireguard/luasrc/view/wireguard.htm
View file

@ -52,7 +52,6 @@
<%+header%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<script type="text/javascript">//<![CDATA[
function bytes_to_str(bytes) {

1
modules/luci-base/luasrc/view/cbi/apply_widget.htm
View file

@ -47,7 +47,6 @@
}
</style>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<script type="text/javascript">//<![CDATA[
var xhr = new XHR(),
uci_apply_auth = { sid: '<%=luci.dispatcher.context.authsession%>', token: '<%=token%>' },

1
modules/luci-base/luasrc/view/cbi/header.htm
View file

@ -1,7 +1,6 @@
<%+header%>
<form method="post" name="cbi" action="<%=REQUEST_URI%>" enctype="multipart/form-data" onreset="return cbi_validate_reset(this)" onsubmit="return cbi_validate_form(this, '<%:Some fields are invalid, cannot save values!%>')">
<div>
<script type="text/javascript" src="<%=resource%>/cbi.js"<%=
attr("data-strings", luci.util.serialize_json({
label = {
choose = translate('-- Please choose --'),

1
modules/luci-base/luasrc/view/cbi/simpleform.htm
View file

@ -1,7 +1,6 @@
<% if not self.embedded then %>
<form method="post" enctype="multipart/form-data" action="<%=REQUEST_URI%>">
<div>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<input type="hidden" name="token" value="<%=token%>" />
<input type="hidden" name="cbi.submit" value="1" />
</div>

1
modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm
View file

@ -15,7 +15,6 @@ local ping_host = luci.config.diag and luci.config.diag.ping or "dev.openwrt.org
local route_host = luci.config.diag and luci.config.diag.route or "dev.openwrt.org"
%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<script type="text/javascript">//<![CDATA[
var stxhr = new XHR();

1
modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview.htm
View file

@ -30,7 +30,6 @@
end)
-%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<script type="text/javascript">//<![CDATA[
function iface_shutdown(id, reconnect) {
if (!reconnect && !confirm(<%=luci.http.write_json(translate('Really shutdown interface "%s"? You might lose access to this device if you are connected via this interface.'))%>.format(id)))

1
modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm
View file

@ -107,7 +107,6 @@
</div>
<% end %>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<script type="text/javascript">//<![CDATA[
var wifidevs = <%=luci.http.write_json(netdevs)%>;

1
modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
View file

@ -19,7 +19,6 @@
<%+header%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<script type="text/javascript">//<![CDATA[
var bwxhr = new XHR();

1
modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm
View file

@ -5,7 +5,6 @@
<%+header%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<script type="text/javascript">//<![CDATA[
var bwxhr = new XHR();

1
modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
View file

@ -114,7 +114,6 @@
<%+header%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<script type="text/javascript">//<![CDATA[
function progressbar(v, m)
{

1
modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm
View file

@ -62,7 +62,6 @@
<%+header%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<style type="text/css">
span:target {
color: blue;

1
modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm
View file

@ -5,7 +5,6 @@
<%+header%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<script type="text/javascript">//<![CDATA[
var bwxhr = new XHR();

1
modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm
View file

@ -32,7 +32,6 @@
<%+header%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<div class="cbi-map" id="cbi-network">
<h2 name="content"><%:Routes%></h2>

1
modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm
View file

@ -19,7 +19,6 @@
<%+header%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<script type="text/javascript">//<![CDATA[
var bwxhr = new XHR();

1
modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm
View file

@ -44,7 +44,6 @@ end
<%+header%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<h2 name="content"><%:Software%></h2>

1
modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm
View file

@ -110,7 +110,6 @@ end
<%+header%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<script type="text/javascript">//<![CDATA[
XHR.poll(<%=interval%> , '<%=REQUEST_URI%>', { status: 1 },

1
themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
View file

@ -170,6 +170,7 @@
<% if css then %>
<style title="text/css"><%= css %></style>
<% end -%>
<script src="<%=resource%>/cbi.js"></script>
<script src="<%=resource%>/xhr.js"></script>
</head>

1
themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
View file

@ -81,6 +81,7 @@
</style>
<% end -%>
<meta name="viewport" content="initial-scale=1.0" />
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
<title><%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(tostring(node.title)) or '')) %> - LuCI</title>

1
themes/luci-theme-material/luasrc/view/themes/material/header.htm
View file

@ -211,6 +211,7 @@
<% if css then %>
<style title="text/css"><%= css %></style>
<% end -%>
<script src="<%=resource%>/cbi.js"></script>
<script src="<%=resource%>/xhr.js"></script>
</head>
<body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>">

11
themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
View file

@ -87,6 +87,9 @@
local childs = disp.node_childs(node)
if #childs > 0 then
if level > 2 then
if level == 3 then
write('<div id="tabmenu">')
end
write('<ul class="cbi-tabmenu">')
end
@ -112,6 +115,9 @@
if level > 2 then
write('</ul>')
if level == 3 then
write('</div>')
end
end
if selected_node then
@ -157,6 +163,7 @@
<%= css %>
</style>
<% end -%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
<script type="text/javascript">//<![CDATA[
document.addEventListener('DOMContentLoaded', function() {
@ -240,9 +247,7 @@
</div>
<div id="maincontent">
<div id="tabmenu">
<% if category then render_tabmenu(category, cattree) end %>
</div>
<% if category then render_tabmenu(category, cattree) end %>
<noscript>
<div class="alert-message warning">