Changeset 2805

Timestamp:

11/13/08 07:05:25 (8 weeks ago)

Author:

MattRead

Message:

Fix the carrots in the menu. Add some potatoes and green beans. This soup is getting tasty.

Location:

trunk/htdocs/system/admin

Files:

• css/admin.css (modified) (2 diffs)
• js/admin.js (modified) (1 diff)

trunk/htdocs/system/admin/css/admin.css

@@ -106 +106 @@
 #menubutton a:first-letter {
     text-transform: uppercase;
+}
+
+#menulist {
+    display:none;
 }
 
@@ -128 +132 @@
 }
 
-#menu.hovering #menulist, #menu:hover #menulist > ul, #menu:hover #menulist > ul li.submenu:hover ul.submenu {
+#menu.hovering #menulist, #menu.hovering #menulist > ul, #menu:hover #menulist > ul, #menu:hover #menulist > ul li.submenu:hover ul.submenu, #menu.hovering #menulist > ul li.submenu.carrot ul.submenu {
     display: block;
 }

trunk/htdocs/system/admin/js/admin.js

@@ -1033 +1033 @@
         $.hotkeys.add('return', { propagate:true, disableInInput: true }, function() {
             if ($('#menu').hasClass('hovering') == true && $('.carrot')) {
-                location = $('.carrot a').attr('href')
-                theMenu.blinkCarrot($('.carrot a').parent())
+                if ($('.carrot').hasClass('submenu') == true) {
+                    location = $('.carrot ul li.carrot a').attr('href')
+                    theMenu.blinkCarrot($('.carrot ul li.carrot a').parent())
+                }
+                else {
+                    location = $('.carrot a').attr('href')
+                    theMenu.blinkCarrot($('.carrot a').parent())
+                }
             } else {
                 return false;