themes: unify no-password / no-javascript alert boxes

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

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 39a55551ff3b0c91c7305fe268b06e96a90984e7..aaacf56b844967807850090fcc509cd68b0fdfb4 100644 (file)
--- 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 @@
                        </div>
                </header>
 
-               <%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>
-                       <div class="container">
+               <div id="maincontent" class="container">
+                       <%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>
                                <div class="alert-message warning">
                                        <h4><%:No password set!%></h4>
-                                       <%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%><br>
-                                       <a href="<%=pcdata(luci.dispatcher.build_url("admin/system/admin"))%>"><%:Go to password configuration...%></a>
+                                       <p><%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%></p>
+                                       <div class="right"><a class="btn" href="<%=url("admin/system/admin")%>"><%:Go to password configuration...%></a></div>
                                </div>
-                       </div>
-               <%- end -%>
+                       <%- end -%>
 
-               <noscript>
-                       <div class="alert-message warning">
-                               <strong><%:JavaScript required!%></strong><br />
-                               <%:You must enable JavaScript in your browser or LuCI will not work properly.%>
-                       </div>
-               </noscript>
+                       <noscript>
+                               <div class="alert-message warning">
+                                       <h4><%:JavaScript required!%></h4>
+                                       <p><%:You must enable JavaScript in your browser or LuCI will not work properly.%></p>
+                               </div>
+                       </noscript>
 
-               <div id="maincontent" class="container">
                        <% 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 0e2ebd5c76a2ceae28857a4d84b900387c75035e..1b08e4894abedacc4f0fd4ec8fec3f670d307e68 100755 (executable)
--- 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 0aca882c05397207eaf4febe6e651836f443c487..b6341a2c35ae26ab0092f7ea9f6b1ca28faa74b9 100644 (file)
--- 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 @@
 <!DOCTYPE html>
 <html lang="<%=luci.i18n.context.lang%>">
 <head>
-    <meta charset="utf-8">
-    <title><%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
-    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport"/>
-    <meta name="format-detection" content="telephone=no, email=no"/>
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="mobile-web-app-capable" content="yes">
-    <meta name="x5-fullscreen" content="true">
-    <meta name="full-screen" content="yes">
-    <meta name="x5-page-mode" content="app">
-    <meta name="browsermode" content="application">
-    <meta name="theme-color" content="#0099CC">
-    <meta name="msapplication-tap-highlight" content="no">
-    <meta name="msapplication-TileColor" content="#0099CC">
-
-    <meta name="application-name" content="<%=striptags( (boardinfo.hostname or "?") ) %> - LuCI">
-    <meta name="apple-mobile-web-app-title" content="<%=striptags( (boardinfo.hostname or "?") ) %> - LuCI">
-    <meta name="msapplication-TileImage" content="<%=media%>/logo.png"/>
-    <link rel="icon" href="<%=media%>/logo.png" sizes="144x144">
-    <link rel="apple-touch-icon-precomposed" href="<%=media%>/logo.png" sizes="144x144">
-
-    <link rel="stylesheet" href="<%=media%>/css/style.css">
-    <link rel="shortcut icon" href="<%=media%>/favicon.ico">
-    <% if node and node.css then %>
-        <link rel="stylesheet" href="<%=resource%>/<%=node.css%>">
-    <% end -%>
-    <% if css then %>
-        <style title="text/css"><%= css %></style>
-    <% end -%>
-    <script src="<%=resource%>/xhr.js"></script>
+       <meta charset="utf-8">
+       <title><%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
+       <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport"/>
+       <meta name="format-detection" content="telephone=no, email=no"/>
+       <meta name="apple-mobile-web-app-capable" content="yes">
+       <meta name="mobile-web-app-capable" content="yes">
+       <meta name="x5-fullscreen" content="true">
+       <meta name="full-screen" content="yes">
+       <meta name="x5-page-mode" content="app">
+       <meta name="browsermode" content="application">
+       <meta name="theme-color" content="#0099CC">
+       <meta name="msapplication-tap-highlight" content="no">
+       <meta name="msapplication-TileColor" content="#0099CC">
+
+       <meta name="application-name" content="<%=striptags( (boardinfo.hostname or "?") ) %> - LuCI">
+       <meta name="apple-mobile-web-app-title" content="<%=striptags( (boardinfo.hostname or "?") ) %> - LuCI">
+       <meta name="msapplication-TileImage" content="<%=media%>/logo.png"/>
+       <link rel="icon" href="<%=media%>/logo.png" sizes="144x144">
+       <link rel="apple-touch-icon-precomposed" href="<%=media%>/logo.png" sizes="144x144">
+
+       <link rel="stylesheet" href="<%=media%>/css/style.css">
+       <link rel="shortcut icon" href="<%=media%>/favicon.ico">
+       <% if node and node.css then %>
+               <link rel="stylesheet" href="<%=resource%>/<%=node.css%>">
+       <% end -%>
+       <% if css then %>
+               <style title="text/css"><%= css %></style>
+       <% end -%>
+       <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 %>">
 <header>
@@ -228,26 +228,27 @@
        </div>
 </header>
 <div class="main">
-        <div style="" class="loading"><span><div class="loading-img"></div>Loading...</span></div>
-        <div class="main-left">
+       <div style="" class="loading"><span><div class="loading-img"></div>Loading...</span></div>
+       <div class="main-left">
                <% render_topmenu() %>
-        </div>
+       </div>
        <div class="main-right">
-                <div class="darkMask"></div>
-                <div id="maincontent">
-                        <div class="container">
-                                <%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>
-                                        <div class="alert-message warning">
-                                                <h4><%:No password set!%></h4>
-                                                <%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%><br>
-                                                <a href="<%=pcdata(luci.dispatcher.build_url("admin/system/admin"))%>"><%:Go to password configuration...%></a>
-                                        </div>
-                                <%- end -%>
-                                <% if category then render_tabmenu(category, cattree) end %>
+               <div class="darkMask"></div>
+               <div id="maincontent">
+                       <div class="container">
+                               <%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>
+                                       <div class="alert-message warning">
+                                               <h4><%:No password set!%></h4>
+                                               <p><%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%></p>
+                                               <div class="right"><a class="btn" href="<%=url("admin/system/admin")%>"><%:Go to password configuration...%></a></div>
+                                       </div>
+                               <%- end -%>
 
                                <noscript>
                                        <div class="alert-message warning">
-                                               <strong><%:JavaScript required!%></strong><br />
-                                               <%:You must enable JavaScript in your browser or LuCI will not work properly.%>
+                                               <h4><%:JavaScript required!%></h4>
+                                               <p><%:You must enable JavaScript in your browser or LuCI will not work properly.%></p>
                                        </div>
-                               </noscript>                     
+                               </noscript>
+
+                               <% 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 d5d2686e7566a1402593ec7d2a979172a07eaff4..1c32e58dd66eabe2d3972855696d3bf7863eb1cd 100644 (file)
--- 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 5b39f05af789d000413be95e0465b3100e0e4e42..cbf02a76cd5cf5f210b8dfcea64acd73e136941c 100644 (file)
--- 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 @@
 
        <div id="maincontent">
                <noscript>
-                       <div class="errorbox">
-                               <strong><%:JavaScript required!%></strong><br />
-                               <%:You must enable JavaScript in your browser or LuCI will not work properly.%>
+                       <div class="alert-message warning">
+                               <h4><%:JavaScript required!%></h4>
+                               <p><%:You must enable JavaScript in your browser or LuCI will not work properly.%></p>
                        </div>
                </noscript>
 
                <%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") and category ~= "failsafe" then -%>
-               <div class="errorbox">
-                       <strong><%:No password set!%></strong><br />
-                       <%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%><br />
-                       <a href="<%=pcdata(luci.dispatcher.build_url("admin/system/admin"))%>"><%:Go to password configuration...%></a>
+               <div class="alert-message warning">
+                       <h4><%:No password set!%></h4>
+                       <p><%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%></p>
+                       <div class="right"><a class="btn" href="<%=url("admin/system/admin")%>"><%:Go to password configuration...%></a></div>
                </div>
                <%- end -%>