X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=themes%2Fluci-theme-freifunk-generic%2Fluasrc%2Fview%2Fthemes%2Ffreifunk-generic%2Fheader.htm;h=81856552858e3108c442222a127bca1a69451dcd;hp=3eacf0a1e431aca5af3bbedd99641b30614b6386;hb=731ed77c0bbee7004a6b5645d9a8592a76748a1c;hpb=bfbc7f4bdf6b60edf9d52d995c14d156d8349757

diff --git a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
index 3eacf0a1e..818565528 100644
--- a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
+++ b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
@@ -1,21 +1,16 @@
 <%#
-LuCI - Lua Configuration Interface
-Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-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
+ Copyright 2008 Steven Barth <steven@midlink.org>
+ Copyright 2008-2011 Jo-Philipp Wich <jow@openwrt.org>
+ Licensed to the public under the Apache License 2.0.
 -%>
 
 <%
-	local fs   = require "luci.fs"
+	local fs   = require "nixio.fs"
 	local sys  = require "luci.sys"
 	local util = require "luci.util"
 	local http = require "luci.http"
 	local disp = require "luci.dispatcher"
+	local version = require "luci.version"
 
 	local sysinfo = util.ubus("system", "info") or { }
 	local loadinfo = sysinfo.load or { 0, 0, 0 }
@@ -50,20 +45,20 @@ You may obtain a copy of the License at
 	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", "")
+	local file
+	for file in fs.glob("/www/luci-static/resources/custom_logo.*") do
+		logo = string.gsub(file, "/www", "")
+		break
 	end
 
-	local lon = fs.glob("/www/luci-static/resources/custom_logo_only.*")
-	if lon[1] then
-		logo = string.gsub(lon[1], "/www", "")
+	for file in fs.glob("/www/luci-static/resources/custom_logo_only.*") do
+		logo = string.gsub(file, "/www", "")
 		show_comm = false
+		break
 	end
 
-	local hea = fs.glob("/www/luci-static/resources/custom_header.*")
-	if hea[1] then
-		logo = string.gsub(hea[1], "/www", "")
+	for file in fs.glob("/www/luci-static/resources/custom_header.*") do
+		logo = string.gsub(file, "/www", "")
 		show_comm = false
 		banner = true
 	end
@@ -110,8 +105,8 @@ You may obtain a copy of the License at
 <%- end -%>
 
 <p class="skiplink">
-<span id="skiplink1"><a href="#navigation"><%:skiplink1 Skip to navigation%></a></span>
-<span id="skiplink2"><a href="#content"><%:skiplink2 Skip to content%></a></span>
+<span id="skiplink1"><a href="#navigation"><%:Skip to navigation%></a></span>
+<span id="skiplink2"><a href="#content"><%:Skip to content%></a></span>
 </p>
 
 <div id="header">
@@ -128,8 +123,8 @@ You may obtain a copy of the License at
 			<%end%>
 		</div>
 		<div class="header_right">
-			<%=luci.version.distversion%><br />
-			<%:Load%>: <%="%.2f" % loadinfo[1] / 65535.0%> <%="%.2f" % loadinfo[2] / 65535.0%> <%="%.2f" % loadinfo[3] / 65535.0%><br />
+			<%=version.distversion%><br />
+			<%:Load%>: <%="%.2f" % (loadinfo[1] / 65535.0)%> <%="%.2f" % (loadinfo[2] / 65535.0)%> <%="%.2f" % (loadinfo[3] / 65535.0)%><br />
 			<%:Hostname%>: <%=boardinfo.hostname or "?"%><br />
 			<span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
 				<%:Auto Refresh%>:
@@ -168,7 +163,7 @@ You may obtain a copy of the License at
 %>
 
 <div id="menubar">
-<h2 class="navigation"><a id="navigation" name="navigation"><%:navigation Navigation%></a></h2>
+<h2 class="navigation"><a id="navigation" name="navigation"><%:Navigation%></a></h2>
 <ul id="mainmenu" class="dropdowns">
 	<%
 		local childs = disp.node_childs(cattree)
@@ -210,7 +205,7 @@ if tree.nodes[category] and tree.nodes[category].ucidata then
 -%>
 	<div id="savemenu">
 		<% if ucic > 0 then %>
-			<a class="warning" href="<%=controller%>/<%=category%>/uci/changes/?redir=<%=http.urlencode(http.formvalue("redir") or REQUEST_URI)%>"><%:Unsaved Changes%>: <%=ucic%></a>
+			<a class="warning" href="<%=controller%>/<%=category%>/uci/changes/?redir=<%=http.urlencode(http.formvalue('redir') or table.concat(disp.context.request, "/"))%>"><%:Unsaved Changes%>: <%=ucic%></a>
 		<% end -%>
 	</div>
 <% end %>
@@ -221,8 +216,8 @@ if tree.nodes[category] and tree.nodes[category].ucidata then
 <% 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.%>
+		<strong><%:JavaScript required!%></strong><br />
+		<%:You must enable JavaScript in your browser or LuCI will not work properly.%>
 	</div>
 </noscript>
 <% end %>