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

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

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2018-05-31 18:56:50 +02:00
parent 298d164dd7
commit e3bc12da6d
5 changed files with 75 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -190,22 +190,20 @@
</div> </div>
</header> </header>
<%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%> <div id="maincontent" class="container">
<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"> <div class="alert-message warning">
<h4><%:No password set!%></h4> <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> <p><%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%></p>
<a href="<%=pcdata(luci.dispatcher.build_url("admin/system/admin"))%>"><%:Go to password configuration...%></a> <div class="right"><a class="btn" href="<%=url("admin/system/admin")%>"><%:Go to password configuration...%></a></div>
</div> </div>
</div> <%- end -%>
<%- end -%>
<noscript> <noscript>
<div class="alert-message warning"> <div class="alert-message warning">
<strong><%:JavaScript required!%></strong><br /> <h4><%:JavaScript required!%></h4>
<%:You must enable JavaScript in your browser or LuCI will not work properly.%> <p><%:You must enable JavaScript in your browser or LuCI will not work properly.%></p>
</div> </div>
</noscript> </noscript>
<div id="maincontent" class="container">
<% if category then render_tabmenu(category, cattree) end %> <% if category then render_tabmenu(category, cattree) end %>

12
themes/luci-theme-material/htdocs/luci-static/material/css/style.css
View file

@ -290,7 +290,7 @@ header > .container > .brand {
.errorbox, .errorbox,
.alert-message { .alert-message {
margin: 2rem 0 0 0; margin: 2rem 0 0 0;
padding: 2rem; padding: 1rem;
border: 0; border: 0;
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
@ -313,10 +313,13 @@ header > .container > .brand {
color: red; color: red;
} }
.alert-message h4 { .alert-message > h4 {
font-weight: bold; font-weight: bold;
font-size: 110%; font-size: 110%;
padding-bottom: 1em; }
.alert-message > * {
margin: .5rem 0;
} }
#maincontent > .container > div:nth-child(1).alert-message.warning > a { #maincontent > .container > div:nth-child(1).alert-message.warning > a {
@ -594,6 +597,8 @@ td > table > tbody > tr > td,
user-select: none; user-select: none;
font-size: 0.8rem; font-size: 0.8rem;
width: auto !important; width: auto !important;
display: inline-block;
text-decoration: none;
} }
.btn:hover, .btn:hover,
@ -1349,6 +1354,7 @@ body.lang_pl.node-main-login .cbi-value-title {
width: calc(100% - 13rem); width: calc(100% - 13rem);
} }
.btn,
.cbi-button { .cbi-button {
padding: 0.3rem 0.6rem; padding: 0.3rem 0.6rem;
font-size: 0.8rem; font-size: 0.8rem;

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

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

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

@ -479,6 +479,9 @@ img.cbi-image-button {
border-radius: 3px; border-radius: 3px;
border: 1px solid #aaa; border: 1px solid #aaa;
background: #eee 1px center no-repeat; background: #eee 1px center no-repeat;
text-decoration: none;
color: #000;
display: inline-block;
} }
.btn:hover, .cbi-button:hover { .btn:hover, .cbi-button:hover {

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

@ -167,16 +167,16 @@
<div id="maincontent"> <div id="maincontent">
<noscript> <noscript>
<div class="errorbox"> <div class="alert-message warning">
<strong><%:JavaScript required!%></strong><br /> <h4><%:JavaScript required!%></h4>
<%:You must enable JavaScript in your browser or LuCI will not work properly.%> <p><%:You must enable JavaScript in your browser or LuCI will not work properly.%></p>
</div> </div>
</noscript> </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 -%> <%- 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"> <div class="alert-message warning">
<strong><%:No password set!%></strong><br /> <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 /> <p><%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%></p>
<a href="<%=pcdata(luci.dispatcher.build_url("admin/system/admin"))%>"><%:Go to password configuration...%></a> <div class="right"><a class="btn" href="<%=url("admin/system/admin")%>"><%:Go to password configuration...%></a></div>
</div> </div>
<%- end -%> <%- end -%>