From 327e284b74bd272aa1afaa8b9728c36276440057 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Tue, 7 Aug 2018 17:37:48 +0200 Subject: [PATCH] luci-mod-admin-full: fix broken applyreboot page 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 --- .../luasrc/view/admin_system/applyreboot.htm | 47 ++++++++++++------- .../htdocs/luci-static/bootstrap/cascade.css | 4 ++ .../luci-static/freifunk-generic/cascade.css | 4 ++ .../htdocs/luci-static/material/cascade.css | 11 +++++ .../luci-static/openwrt.org/cascade.css | 5 ++ 5 files changed, 53 insertions(+), 18 deletions(-) diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm index e722a48096..66b80896e8 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm @@ -6,36 +6,47 @@ - <%=luci.sys.hostname()%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %> + <%=luci.sys.hostname()%> - <%= title or translate("Rebooting...") %> -
-
-

<%:System%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %>

-
-

- <% if msg then %><%=msg%><% else %><%:Changes applied.%><% end %> -

-

- <%:Loading%> - <%:Waiting for changes to be applied...%> -

-
+
+
+
+

<%=luci.sys.hostname() or "?"%>

+
+
+
+   +
+
+
+

<%:System%> - <%= title or translate("Rebooting...") %>

+
+
+ <%= msg or translate("Changes applied.") %> +
+
+ <%:Loading%> + <%:Waiting for changes to be applied...%> +
+
+
- + \ No newline at end of file diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css index e34b0b594a..644a47fee1 100644 --- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css +++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css @@ -2027,3 +2027,7 @@ div.cbi-value var, html body.apply-overlay-active { height: calc(100vh - 63px); } + +#applyreboot-section { + line-height: 300%; +} diff --git a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css index d5e87ebef0..3e1b1cd2f1 100644 --- a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css +++ b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css @@ -586,6 +586,10 @@ html #menubar a:visited.warning { margin-right: 2em; } +#applyreboot-section { + line-height: 300%; +} + .lang_de #submenu_admin_uci { width: 12em; } diff --git a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css index 2d8bd10cc9..4875c33f8d 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css @@ -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); diff --git a/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css index 197166b73a..e7952338ef 100644 --- a/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css +++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css @@ -379,6 +379,11 @@ textarea#syslog { border-color: #444444; } +#applyreboot-section { + margin: 2rem; + line-height: 300%; +} + .lang_he #maincontent { direction: rtl; } -- 2.30.2