From e3bc12da6de535628e5f5488333c103be95b802a Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io>
Date: Thu, 31 May 2018 18:56:50 +0200
Subject: themes: unify no-password / no-javascript alert boxes

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
 .../luasrc/view/themes/bootstrap/header.htm        | 24 ++++++++++------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'themes/luci-theme-bootstrap')

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 @@
 			</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 %>
-- 
cgit v1.2.3