From ca0de5ffb349d4a9b54719d6818fbf38331a52cf Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 21 Oct 2008 01:38:26 +0000 Subject: * luci/themes/openwrt-light: sync layout and code to openwrt.org theme --- .../luasrc/view/themes/openwrt-light/footer.htm | 7 +- .../luasrc/view/themes/openwrt-light/header.htm | 189 +++++++++------------ 2 files changed, 86 insertions(+), 110 deletions(-) (limited to 'themes/openwrt-light/luasrc/view') diff --git a/themes/openwrt-light/luasrc/view/themes/openwrt-light/footer.htm b/themes/openwrt-light/luasrc/view/themes/openwrt-light/footer.htm index d1a8d43fee..f8ea5ad577 100644 --- a/themes/openwrt-light/luasrc/view/themes/openwrt-light/footer.htm +++ b/themes/openwrt-light/luasrc/view/themes/openwrt-light/footer.htm @@ -12,11 +12,10 @@ You may obtain a copy of the License at $Id$ -%> -
- - +
-
Powered by <%= luci.__appname__ .. " " .. luci.__version__%>
+

Powered by <%= luci.__appname__ .. " " .. luci.__version__%>

+ diff --git a/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm b/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm index cbfdba14e0..7972c93f97 100644 --- a/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm +++ b/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm @@ -31,69 +31,48 @@ for i,r in ipairs(request) do end require("luci.i18n").loadc("default") -require("luci.http").prepare_content("text/html") +require("luci.http").prepare_content("application/xhtml+xml") -%> - + - - <% if node and node.css then %><% end %> - - - <%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI - - + + + + + +<% if node and node.css then %> +<% end -%> + + + +<%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI - - + -
-<%:path%>: <% -local c = tree -local url = controller -for k,v in pairs(request) do - if c.nodes and c.nodes[v] then - c = c.nodes[v] - url = url .. "/" .. v - %><%=c.title or v%> <% if k ~= #request then %>» <% end - end -end -%> +

+<%:skiplink1 Skip to navigation%> +<%:skiplink2 Skip to content%> +

+ + -
- -
-
    <% - for k,node in pairs(tree.nodes) do - if node.title and not node.hidden then %> - class="active"<%end%>><%=node.title%> -<% end - end%> -
-
- - <% - if tree.nodes[category] and tree.nodes[category].ucidata then - local ucic = 0 - for i, j in pairs(require("luci.model.uci").cursor():changes()) do - for k, l in pairs(j) do - for m, n in pairs(l) do - ucic = ucic + 1; - end - end + + +<% +if tree.nodes[category] and tree.nodes[category].ucidata then + local ucic = 0 + for i, j in pairs(require("luci.model.uci").cursor():changes()) do + for k, l in pairs(j) do + for m, n in pairs(l) do + ucic = ucic + 1; end - %> -
-
- <% if ucic > 0 then %> - <%:unsavedchanges%>: <%=ucic%> - <% submenu("/" .. category .. "/uci/", tree.nodes[category].nodes["uci"]) -%> - <% else %> - <%:changes%>: 0 - <% end %> -
-
- <% end %> - -
+ end + end +-%> +<% end %> + +
-- cgit v1.2.3