projects / project / luci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9548b52)
* luci/themes: IE6 fixes for openwrt.org theme
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 13 Jul 2008 01:04:37 +0000 (01:04 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 13 Jul 2008 01:04:37 +0000 (01:04 +0000)
themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css patch | blob | history
themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm patch | blob | history

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 42b4d09..ef1b57a 100644 (file)
--- 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 df31c01..1ae5df9 100644 (file)
--- 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")
-%><?xml version="1.0" encoding="utf-8"?>
+-%>
+
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -41,8 +43,25 @@ require("luci.http").prepare_content("text/html")
        <meta http-equiv="content-type" content="text/xhtml+xml; charset=utf-8" />
        <meta http-equiv="content-script-type" content="text/javascript" />
        <title>LuCI - Lua Configuration Interface - <%=(node and node.title)%></title>
+
+       <!--[if lt IE 7]>
+               <script type="text/javascript">
+                       function setup_hover() {
+                               function ie_hover(e) {
+                                       e.onmouseover = function() { this.className = "hover" }
+                                       e.onmouseout  = function() { this.className = null    }
+                               }
+
+                               var lis  = document.getElementById("mainmenu").getElementsByTagName("LI");
+                               var divs = document.getElementById("mainmenu").getElementsByTagName("DIV");
+                               
+                               for( var i = 0; i < lis.length;  i++ ) ie_hover( lis[i]  );
+                               for( var i = 0; i < divs.length; i++ ) ie_hover( divs[i] );
+                       }
+               </script>
+       <![endif]-->
 </head>
-<body>
+<body onload="window.setup_hover && setup_hover()">
 <div id="header">
        <div class="info whitetext smalltext bold right">
        <%=luci.config.brand.firmware%><br />
@@ -71,20 +90,24 @@ end
 </div>
 
 <div class="menubar">
-       <div class="mainmenu">
+       <div id="mainmenu" class="mainmenu">
 <%
 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
 %>
        <ul>
        <% for j, v in pairs(index) do
@@ -99,6 +122,7 @@ local function submenu(prefix, node)
        <% end %>
        </ul>
 <%
+       end
 end
 
 if cattree and cattree.nodes then
@@ -130,33 +154,34 @@ end
 <%                             end
                        end%>
                </ul>
+       </div>
 
-               <%
-                       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
-               %>
-               <div class="mainmenu" style="float:right; margin-right:2em">
-                       <div>
-                               <% if ucic > 0 then %>
-                               <a href="<%=controller%>/admin/uci/changes"><%:changes%>: <%=ucic%></a>
-                               <ul>
-                                       <li><a href="<%=controller%>/admin/uci/apply"><%:apply%></a></li>
-                                       <li><a href="<%=controller%>/admin/uci/revert"><%:revert%></a></li>
-                               </ul>
-                               <% else %>
-                               <a href="#"><%:changes%>: 0</a>
-                               <% end %>
-                       </div>
+                       end
+       %>
+       <div class="mainmenu" style="float:right; margin-right:2em">
+               <div>
+                       <% if ucic > 0 then %>
+                       <a href="<%=controller%>/admin/uci/changes"><%:changes%>: <%=ucic%></a>
+                       <ul>
+                               <li><a href="<%=controller%>/admin/uci/apply"><%:apply%></a></li>
+                               <li><a href="<%=controller%>/admin/uci/revert"><%:revert%></a></li>
+                       </ul>
+                       <% else %>
+                       <a href="#"><%:changes%>: 0</a>
+                       <% end %>
                </div>
-               <% end %>
        </div>
+       <% end %>
+
        <br class="clear" />
 </div>
 <div id="content">
Lua Configuration Interface (mirror)