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

luci-mod-admin-full: fix broken applyreboot page

Browse source 
This improve applyreboot page and fix problem with luci-nginx that doesn't refresh the page when the router reboot.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
(cherry picked from commit 327e284b74)
This commit is contained in:
Ansuel Smith 2018-08-07 17:37:48 +02:00 committed by Jo-Philipp Wich
parent f9121fd86c
commit e0599d5064
5 changed files with 53 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm
View file

@ -6,36 +6,47 @@
<html>
<head>
<title><%=luci.sys.hostname()%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></title>
<title><%=luci.sys.hostname()%> - <%= title or translate("Rebooting...") %></title>
<link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
<script type="text/javascript">//<![CDATA[
var interval = window.setInterval(function() {
var img = new Image();
var target = ('https:' == document.location.protocol ? 'https://' : 'http://') + <%=addr and "'%s'" % addr or "window.location.host"%>;
img.onload = function() {
window.clearInterval(interval);
location.href = ('https:' == document.location.protocol ? 'https://' : 'http://') + '<%=addr or luci.http.getenv("SERVER_NAME")%>/';
};
img.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + '<%=addr or luci.http.getenv("SERVER_NAME")%><%=resource%>/icons/loading.gif?' + Math.random();
img.src = target + '<%=resource%>/icons/loading.gif?' + Math.random();
}, 5000);
//]]></script>
</head>
<body>
<div id="maincontainer">
<div id="maincontent">
<h2 name="content"><%:System%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></h2>
<fieldset class="cbi-section">
<p>
<% if msg then %><%=msg%><% else %><%:Changes applied.%><% end %>
</p>
<p>
<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
<%:Waiting for changes to be applied...%>
</p>
</fieldset>
<header>
<div class="fill">
<div class="container">
<p class="brand"><%=luci.sys.hostname() or "?"%></p>
</div>
</div>
</header>
&#160;
<div class="main">
<div id="maincontainer">
<div id="maincontent" class="container">
<h2 name="content" id="applyreboot-container" ><%:System%> - <%= title or translate("Rebooting...") %></h2>
<div class="cbi-section" id="applyreboot-section">
<div>
<%= msg or translate("Changes applied.") %>
</div>
<div>
<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
<%:Waiting for changes to be applied...%>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
</html>

4
themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
View file

@ -2027,3 +2027,7 @@ div.cbi-value var,
html body.apply-overlay-active {
height: calc(100vh - 63px);
}
#applyreboot-section {
line-height: 300%;
}

4
themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
View file

@ -586,6 +586,10 @@ html #menubar a:visited.warning {
margin-right: 2em;
}
#applyreboot-section {
line-height: 300%;
}
.lang_de #submenu_admin_uci {
width: 12em;
}

11
themes/luci-theme-material/htdocs/luci-static/material/cascade.css
View file

@ -1732,6 +1732,17 @@ body.lang_pl.node-main-login .cbi-value-title {
width: 12rem;
}
/* applyreboot fix */
#applyreboot-container {
margin: 2rem;
}
#applyreboot-section {
margin: 2rem;
line-height: 300%;
}
@media screen and (max-width: 1600px) {
.main-left {
width: calc(0% + 13rem);

5
themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
View file

@ -379,6 +379,11 @@ textarea#syslog {
border-color: #444444;
}
#applyreboot-section {
margin: 2rem;
line-height: 300%;
}
.lang_he #maincontent {
direction: rtl;
}