X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=themes%2Ffreifunk-generic%2Fluasrc%2Fview%2Fthemes%2Ffreifunk-generic%2Fheader.htm;h=11c7de50eb722b448a48c6614517fbd63d20d5a1;hp=a6d82d9060097cc935106c8588fb46f0d745a125;hb=2acd1d6dae839a46f0f0db587a579833c3e92e32;hpb=617aa2f91cbec692fc3f74566677b7b265f1f8f8

diff --git a/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm b/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
index a6d82d9060..11c7de50eb 100644
--- a/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
+++ b/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
@@ -8,12 +8,13 @@ you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
 	http://www.apache.org/licenses/LICENSE-2.0
-
-$Id: header.htm 4079 2009-01-17 17:59:11Z Cyrus $
-
 -%>
+
 <%
 require("luci.sys")
+local uci = require "luci.model.uci".cursor()
+local fs = require "luci.fs"
+
 local load1, load5, load15 = luci.sys.loadavg()
 local request  = require("luci.dispatcher").context.path
 local category = request[1]
@@ -21,21 +22,32 @@ local tree     = luci.dispatcher.node()
 local cattree  = category and luci.dispatcher.node(category)
 local node     = luci.dispatcher.context.dispatched
 local hostname = luci.sys.hostname()
-
-local c = luci.model.uci.cursor():get_all("freifunk", "community")
-
-if c and c.name then
-	community = c.name
-else
-	community = "Freifunk"
+local ff = uci:get("freifunk", "community", "name") or ""
+local co = "profile_" .. ff
+local community = uci:get_first(co, "community", "name") or "Freifunk"
+local hp = uci:get_first(co, "community", "homepage") or "http://www.freifunk.net"
+local logo = "/luci-static/freifunk-generic/logo.jpg"
+local banner = false
+local show_comm = true
+
+local lo = fs.glob("/www/luci-static/resources/custom_logo.*")
+if lo[1] then
+	logo = string.gsub(lo[1], "/www", "")
 end
 
-if c and c.homepage then
-	homepage = c.homepage
-else
-	homepage = "http://freifunk.net"
+local lon = fs.glob("/www/luci-static/resources/custom_logo_only.*")
+if lon[1] then
+	logo = string.gsub(lon[1], "/www", "")
+	show_comm = false
 end
 
+local hea = fs.glob("/www/luci-static/resources/custom_header.*")
+if hea[1] then
+	logo = string.gsub(hea[1], "/www", "")
+	show_comm = false
+	banner = true
+end 
+
 local c = tree
 for i,r in ipairs(request) do
 	if c.nodes and c.nodes[r] then
@@ -56,6 +68,8 @@ require("luci.http").prepare_content("application/xhtml+xml")
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv="Content-Script-Type" content="text/javascript" />
 <link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
+<link rel="stylesheet" media="only screen and (max-device-width: 480px)" href="<%=media%>/mobile.css" type="text/css" />
+<link rel="stylesheet" media="handheld" href="<%=media%>/mobile.css" type="text/css" /> 
 <!--[if IE 7]><link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/ie7.css" /><![endif]-->
 <% if node and node.css then %><link rel="stylesheet" type="text/css" media="screen" href="<%=resource%>/<%=node.css%>" />
 <% end -%>
@@ -74,6 +88,12 @@ require("luci.http").prepare_content("application/xhtml+xml")
 </div></div>
 <![endif]-->
 
+<%- 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 -%>
 
 <p class="skiplink">
 <span id="skiplink1"><a href="#navigation"><%:skiplink1 Skip to navigation%></a></span>
@@ -81,15 +101,25 @@ require("luci.http").prepare_content("application/xhtml+xml")
 </p>
 
 <div id="header">
-	<span id="header_left">
-		<a href="<%=homepage%>"><img src="/luci-static/freifunk-generic/logo.jpg" alt="FF Logo" /></a>
-		<a href="<%=homepage%>"><%=community%></a>
-	</span>
-	<p>
-		<%=luci.version.distversion%><br />
-		<%:Load%>: <%="%.2f" % load1%> <%="%.2f" % load5%> <%="%.2f" % load15%><br />
-		<%:Hostname%>: <%=hostname%><br />
-	</p>
+	<%if banner then%>
+		<div class="header_banner">
+			<a href="<%=hp%>"><img src="<%=logo%>" alt="Header" /></a>
+		</div>
+	<%else%>
+		<div class="header_left">
+			<a href="<%=hp%>"><img src="<%=logo%>" alt="Logo" /></a>
+			<%if show_comm then%>
+				<a href="<%=hp%>"><%=community%></a>
+				<br/>
+			<%end%>
+		<div class = "spacer"></div>
+		</div>
+		<div class="header_right">
+			<%=luci.version.distversion%><br />
+			<%:Load%>: <%="%.2f" % load1%> <%="%.2f" % load5%> <%="%.2f" % load15%><br />
+			<%:Hostname%>: <%=hostname%><br />
+		</div>
+	<%end%>
 </div>
 
 <div id="menubar">
@@ -153,7 +183,7 @@ submenu("/" .. category .. "/" .. k.name .. "/", node)
 	end
 end
 %>
-</ul>
+<li></li></ul>
 
 <ul id="modemenu"><%
 for k,node in pairs(tree.nodes) do
@@ -185,10 +215,11 @@ if tree.nodes[category] and tree.nodes[category].ucidata then
 <div class="clear"></div>
 </div>
 <div id="maincontent">
+<% if category ~= "freifunk" and category ~= "splash" then %>
 <noscript>
 	<div class="errorbox">
 		<strong><%:Java Script required!%></strong><br />
 		<%:You must enable Java Script in your browser or LuCI will not work properly.%>
 	</div>
 </noscript>
-
+<% end %>