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

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

@ -190,22 +190,20 @@
</div> </div>
</header> </header>
<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 -%> <%- 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 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;

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

@ -239,15 +239,16 @@
<%- 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 -%>