Bug 628724, tweaks to django-moz-header

jbalogh · Jan 28, 2011 · 1bc5736 · 1bc5736
1 parent 1d14f05
commit 1bc5736
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/media/css/global b/media/css/global
diff --git a/media/css/zamboni/headerfooter.css → media/css/zamboni/amo_headerfooter.css b/media/css/zamboni/headerfooter.css → media/css/zamboni/amo_headerfooter.css
@@ -54,21 +54,20 @@ body {
 }
 
 .html-rtl #nav-main li ul {
-    position: absolute;
     left: auto;
     right: -999em;
-    opacity: 0;
 }
 
 #nav-main li:hover ul,
 #nav-main li.sfhover ul {
     margin-top: 40px;
 }
 
-.html-rtl #nav-main li:hover ul,
+.html-rtl.no-js #nav-main li:hover ul,
 .html-rtl #nav-main li.sfhover ul {
     left: auto;
     right: 0;
+    opacity: 1;
 }
 
 #header a.mozilla {

diff --git a/media/js/global b/media/js/global
diff --git a/settings.py b/settings.py
@@ -367,7 +367,7 @@ def JINJA_CONFIG():
             'css/legacy/autocomplete.css',
             'css/zamboni/zamboni.css',
             'css/global/headerfooter.css',
-            'css/zamboni/headerfooter.css',
+            'css/zamboni/amo_headerfooter.css',
             'css/zamboni/tags.css',
             'css/zamboni/tabs.css',
         ),
@@ -425,6 +425,9 @@ def JINJA_CONFIG():
 
             # Fix-up outgoing links
             'js/zamboni/outgoing_links.js',
+
+            # Hover delay for global header
+            'js/global/menu.js',
         ),
         'zamboni/discovery-pane': (
             'js/zamboni/jquery-1.4.2.min.js',

diff --git a/templates/base.html b/templates/base.html
@@ -23,7 +23,7 @@
     {% block extrahead %}{% endblock %}
     <noscript><link rel="stylesheet" href="{{ MEDIA_URL }}css/legacy/nojs.css"></noscript>
   </head>
-  <body class="html-{{ DIR }} {{ request.APP.short }} {% block bodyclass %}{% endblock %}"
+  <body class="html-{{ DIR }} {{ request.APP.short }} moz-header-slim {% block bodyclass %}{% endblock %}"
         data-app="{{ request.APP.short }}"
         data-appname="{{ request.APP.pretty }}"
         data-appid="{{ request.APP.id }}"

diff --git a/templates/global b/templates/global
diff --git a/templates/menu_links.html b/templates/menu_links.html
@@ -1,7 +1,7 @@
 {% extends "global/menu_links.html" %}
 
 {% block amo_links %}
-  <li class=""><a href="https://addons.mozilla.org/">{{ _('Add-ons') }}</a>
+  <li class="current"><a href="https://addons.mozilla.org/">{{ _('Add-ons') }}</a>
     <ul>
       <li class="first"><a href="https://addons.mozilla.org/firefox/">{{ _('Firefox Add-ons') }}</a></li>
       <li><a href="https://addons.mozilla.org/firefox/featured/">{{ _('Featured Add-ons') }}</a></li>