From 3a12f82014cbac58080ef19673e0ff86fcae1112 Mon Sep 17 00:00:00 2001
From: Manuel Munz <freifunk@somakoma.de>
Date: Wed, 13 Apr 2011 19:29:30 +0000
Subject: themes: Update fledermaus, freifunk-bno, freifunk-hannover and
 freifunk

---
 .../htdocs/luci-static/freifunk/cascade.css        | 51 ++++++++++++++++++++++
 .../luasrc/view/themes/freifunk/header.htm         | 17 +++++++-
 2 files changed, 66 insertions(+), 2 deletions(-)

(limited to 'themes/freifunk')

diff --git a/themes/freifunk/htdocs/luci-static/freifunk/cascade.css b/themes/freifunk/htdocs/luci-static/freifunk/cascade.css
index 2d8311d49d..8ce8ff4aa5 100644
--- a/themes/freifunk/htdocs/luci-static/freifunk/cascade.css
+++ b/themes/freifunk/htdocs/luci-static/freifunk/cascade.css
@@ -632,6 +632,57 @@ ul.cbi-apply {
 	font-size: 90%;
 }
 
+ul.cbi-tabmenu {
+	padding: 3px 0;
+	margin-left: 0 !important;
+	margin-bottom: -1px;
+	list-style-type: none;
+}
+
+ul.cbi-tabmenu li.cbi-tab,
+ul.cbi-tabmenu li.cbi-tab-disabled {
+	display: inline;
+	margin: 0;
+}
+
+ul.cbi-tabmenu li.cbi-tab a,
+ul.cbi-tabmenu li.cbi-tab-disabled a {
+	text-decoration: none;
+	padding: 3px 7px;
+	margin-right: 3px;
+	border: 1px outset #000;
+	border-bottom: none;
+	background-color: #eee;
+	color: #bbb;
+}
+
+ul.cbi-tabmenu li.cbi-tab-highlighted a {
+	color: #000;
+	background-color: #FFEEAA;
+}
+
+ul.cbi-tabmenu li a:hover {
+	color: #000;
+}
+
+ul.cbi-tabmenu li.cbi-tab a {
+	position: relative;
+	top: 1px;
+	padding-top: 4px;
+	color: #000;
+	background-color: #fff;
+}
+
+div.cbi-tab-descr {
+	background-image: url(/luci-static/resources/cbi/help.gif);
+	background-position: 0.25em 50%;
+	background-repeat: no-repeat;
+	border-bottom: 1px solid #ccc;
+	margin: 0.25em 0.25em 2em;
+	padding: 0.5em 0.5em 0.5em 2em;
+}
+
+
 .right {
 	text-align: right;
 }
diff --git a/themes/freifunk/luasrc/view/themes/freifunk/header.htm b/themes/freifunk/luasrc/view/themes/freifunk/header.htm
index f2d9285bca..845c4af83b 100644
--- a/themes/freifunk/luasrc/view/themes/freifunk/header.htm
+++ b/themes/freifunk/luasrc/view/themes/freifunk/header.htm
@@ -9,8 +9,6 @@ You may obtain a copy of the License at
 
 	http://www.apache.org/licenses/LICENSE-2.0
 
-$Id$
-
 -%>
 <%
 require("luci.sys")
@@ -44,6 +42,7 @@ require("luci.http").prepare_content("text/html")
 	<link rel="shortcut icon" href="<%=media%>/images/favicon.ico" />
 	<meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
 	<meta http-equiv="content-script-type" content="text/javascript" />
+	<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
 	<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title>
 
 	<!--[if lt IE 7]>
@@ -68,6 +67,12 @@ require("luci.http").prepare_content("text/html")
 <center>
 
 <div id="wrapper">
+<%- if luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>
+	<div class="warning">
+		<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.%>
+	</div>
+<%- end -%>
 <div id="main">
 
 
@@ -194,3 +199,11 @@ end
 	<br class="clear" />
 </div>
 <div id="maincontent">
+<% if category ~= "freifunk" and category ~= "splash" then %>
+<noscript>
+	<div class="warning">
+		<strong><%:Java Script required!%></strong><br />
+		<%:You must enable Java Script in your browser or LuCI will not work properly.%>
+	</div>
+</noscript>
+<%end%>
-- 
cgit v1.2.3