projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: improve handling of page redirections in uci change views
[project/luci.git]
/
themes
/
luci-theme-freifunk-generic
/
luasrc
/
view
/
themes
/
freifunk-generic
/
header.htm
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
f6d40ed
..
8185655
100644
(file)
--- 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
@@
-10,6
+10,7
@@
local util = require "luci.util"
local http = require "luci.http"
local disp = require "luci.dispatcher"
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 }
local sysinfo = util.ubus("system", "info") or { }
local loadinfo = sysinfo.load or { 0, 0, 0 }
@@
-104,8
+105,8
@@
<%- end -%>
<p class="skiplink">
<%- 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">
</p>
<div id="header">
@@
-122,8
+123,8
@@
<%end%>
</div>
<div class="header_right">
<%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%>:
<%:Hostname%>: <%=boardinfo.hostname or "?"%><br />
<span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
<%:Auto Refresh%>:
@@
-162,7
+163,7
@@
%>
<div id="menubar">
%>
<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)
<ul id="mainmenu" class="dropdowns">
<%
local childs = disp.node_childs(cattree)
@@
-204,7
+205,7
@@
if tree.nodes[category] and tree.nodes[category].ucidata then
-%>
<div id="savemenu">
<% if ucic > 0 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 %>
<% end -%>
</div>
<% end %>
@@
-215,8
+216,8
@@
if tree.nodes[category] and tree.nodes[category].ucidata then
<% if category ~= "freifunk" and category ~= "splash" then %>
<noscript>
<div class="errorbox">
<% 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 %>
</div>
</noscript>
<% end %>