LuCI - Lua Configuration Interface - <%=(node and node.title)%>

From 40fbc2d7c25b3994e33567e5983f76ed7a615d2e Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 13 Jul 2008 01:04:37 +0000 Subject: [PATCH] * luci/themes: IE6 fixes for openwrt.org theme --- .../htdocs/luci-static/openwrt.org/cascade.css | 46 +++++++++++++ .../luasrc/view/themes/openwrt.org/header.htm | 75 ++++++++++++++-------- 2 files changed, 96 insertions(+), 25 deletions(-) diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css index 42b4d0972..ef1b57a1b 100644 --- a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css +++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css @@ -357,3 +357,49 @@ td.cbi-section-table-optionals { text-decoration: none; font-size: 70%; } + + +/* obligatory IE6 Voodoo Code */ +* html body { + behavior:url(/luci/csshover_htc/void.htc); + padding-left: 50% !important; +} + +* html div#header { + margin-left: -100% !important; +} + +* html div.menubar { + margin-left: -100% !important; + width: 200% !important; +} + +* html div#content { + margin-left: -60% !important; + width: 120% !important; +} + +* html div.mainmenu div.hover ul, +* html div.mainmenu div li.hover ul, +* html div.mainmenu div li li.hover ul, +* html div.mainmenu div li li li.hover ul, +* html div.mainmenu div li li li li.hover ul { + display: block !important; + margin-left: 3em; +} + +* html div.mainmenu div.hover ul { + margin-left: 0; +} + +* html div.mainmenu .hover ul ul, +* html div.mainmenu .hover ul ul ul, +* html div.mainmenu .hover ul ul ul ul, +* html div.mainmenu .hover ul ul ul ul ul { + display: none !important; +} + +* html div.mainmenu li { + height: 1em !important; + width: 10em !important; +} diff --git a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm index df31c010f..1ae5df922 100644 --- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm +++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm @@ -32,7 +32,9 @@ end require("luci.i18n").loadc("default") require("luci.http").prepare_content("text/html") -%> +-%> + + @@ -41,8 +43,25 @@ require("luci.http").prepare_content("text/html") LuCI - Lua Configuration Interface - <%=(node and node.title)%> + + - +

<%=luci.config.brand.firmware%>
@@ -71,20 +90,24 @@ end

-

+

<% local function submenu(prefix, node) if not node.nodes then return false end local index = {} + local count = 0 for k, n in pairs(node.nodes) do if n.title and n.target then table.insert(index, {name=k, order=n.order or 100}) + count = count + 1 end end table.sort(index, function(a, b) return a.order < b.order end) + + if count > 0 then %>

<% for j, v in pairs(index) do @@ -99,6 +122,7 @@ local function submenu(prefix, node) <% end %> <% + end end if cattree and cattree.nodes then @@ -130,33 +154,34 @@ end <% end end%> +

- <% - if "admin" == request[1] then - local ucic = 0 - for i, j in pairs(require("luci.model.uci").changes()) do - for k, l in pairs(j) do - for m, n in pairs(l) do - ucic = ucic + 1; - end + <% + if "admin" == request[1] then + local ucic = 0 + for i, j in pairs(require("luci.model.uci").changes()) do + for k, l in pairs(j) do + for m, n in pairs(l) do + ucic = ucic + 1; end end - %> -

-

- <% if ucic > 0 then %> - <%:changes%>: <%=ucic%> -

<%:apply%>
<%:revert%>

- <% else %> - <%:changes%>: 0 - <% end %> -

+ end + %> +

+

+ <% if ucic > 0 then %> + <%:changes%>: <%=ucic%> +

<%:apply%>
<%:revert%>

+ <% else %> + <%:changes%>: 0 + <% end %>

- <% end %>

+ <% end %> +

-- 2.11.0