From: Jo-Philipp Wich Date: Thu, 31 May 2018 16:56:50 +0000 (+0200) Subject: themes: unify no-password / no-javascript alert boxes X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e3bc12da6de535628e5f5488333c103be95b802a;p=project%2Fluci.git themes: unify no-password / no-javascript alert boxes Signed-off-by: Jo-Philipp Wich --- diff --git a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm index 39a55551ff..aaacf56b84 100644 --- a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm +++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm @@ -190,22 +190,20 @@ - <%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%> -
+
+ <%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>

<%:No password set!%>

- <%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%>
- "><%:Go to password configuration...%> +

<%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%>

+
"><%:Go to password configuration...%>
-
- <%- end -%> + <%- end -%> - + -
<% if category then render_tabmenu(category, cattree) end %> diff --git a/themes/luci-theme-material/htdocs/luci-static/material/css/style.css b/themes/luci-theme-material/htdocs/luci-static/material/css/style.css index 0e2ebd5c76..1b08e4894a 100755 --- a/themes/luci-theme-material/htdocs/luci-static/material/css/style.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/css/style.css @@ -290,7 +290,7 @@ header > .container > .brand { .errorbox, .alert-message { margin: 2rem 0 0 0; - padding: 2rem; + padding: 1rem; border: 0; font-weight: normal; font-style: normal; @@ -313,10 +313,13 @@ header > .container > .brand { color: red; } -.alert-message h4 { +.alert-message > h4 { font-weight: bold; font-size: 110%; - padding-bottom: 1em; +} + +.alert-message > * { + margin: .5rem 0; } #maincontent > .container > div:nth-child(1).alert-message.warning > a { @@ -594,6 +597,8 @@ td > table > tbody > tr > td, user-select: none; font-size: 0.8rem; width: auto !important; + display: inline-block; + text-decoration: none; } .btn:hover, @@ -1349,6 +1354,7 @@ body.lang_pl.node-main-login .cbi-value-title { width: calc(100% - 13rem); } + .btn, .cbi-button { padding: 0.3rem 0.6rem; font-size: 0.8rem; diff --git a/themes/luci-theme-material/luasrc/view/themes/material/header.htm b/themes/luci-theme-material/luasrc/view/themes/material/header.htm index 0aca882c05..b6341a2c35 100644 --- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm +++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm @@ -183,35 +183,35 @@ - - <%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI - - - - - - - - - - - - - - LuCI"> - - LuCI"> - - - - - - - <% if node and node.css then %> - - <% end -%> - <% if css then %> - - <% end -%> - + + <%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI + + + + + + + + + + + + + - LuCI"> + - LuCI"> + + + + + + + <% if node and node.css then %> + + <% end -%> + <% if css then %> + + <% end -%> +
@@ -228,26 +228,27 @@
-
Loading...
-
+
Loading...
+
<% render_topmenu() %> -
+
-
-
-
- <%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%> -
-

<%:No password set!%>

- <%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%>
- "><%:Go to password configuration...%> -
- <%- end -%> - <% if category then render_tabmenu(category, cattree) end %> +
+
+
+ <%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%> +
+

<%:No password set!%>

+

<%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%>

+
"><%:Go to password configuration...%>
+
+ <%- end -%> + + + <% if category then render_tabmenu(category, cattree) end %> 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 d5d2686e75..1c32e58dd6 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 @@ -479,6 +479,9 @@ img.cbi-image-button { border-radius: 3px; border: 1px solid #aaa; background: #eee 1px center no-repeat; + text-decoration: none; + color: #000; + display: inline-block; } .btn:hover, .cbi-button:hover { diff --git a/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm index 5b39f05af7..cbf02a76cd 100644 --- a/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm +++ b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm @@ -167,16 +167,16 @@