Menu
▾
▴
[Hyperic-hq-discuss] hq r11084 - in trunk/web: css images/4.0/icons js
|
From: <ast...@hy...> - 2008-09-10 23:55:15
|
Author: astroganov Date: 2008-09-10 16:55:11 -0700 (Wed, 10 Sep 2008) New Revision: 11084 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=11084 Added: trunk/web/images/4.0/icons/resultset_next.gif Modified: trunk/web/css/HQ_40.css trunk/web/css/ie.css trunk/web/css/ie6.css trunk/web/css/ie7.css trunk/web/js/ADxMenu.js Log: fixes HHQ-2364 reviewed by rpack Modified: trunk/web/css/HQ_40.css =================================================================== --- trunk/web/css/HQ_40.css 2008-09-10 22:40:15 UTC (rev 11083) +++ trunk/web/css/HQ_40.css 2008-09-10 23:55:11 UTC (rev 11084) @@ -325,16 +325,16 @@ min-width: 150px; padding: 0px; _width:175px; - background-color: #FFF + background-color: #FFF; } .mainMenu li li { /* create borders around each item */ /* border: 1px solid #2D6EBE;*/ font: 12px Verdana; - color: #88C7FC + color: #88C7FC; } .mainMenu li li a:hover { - /*background-color: #E2F5FF;*/ + /*background-color: #E2F5FF;*/ color: #C94304; } .mainMenu ul>li + li { /* and remove the top border on all but first item in the list */ @@ -345,8 +345,9 @@ left: 90%; } -.mainMenu .hasSubmenu { - background: #FFFFFF url(/images/4.0/icons/resultset_next.png) no-repeat scroll 98% 1px +/* the links to submenus should have an arrow */ +.mainMenu .hasSubmenu>a { + background: #FFF url('/images/4.0/icons/resultset_next.gif') no-repeat scroll 98% 1px; } /* special colouring for "Main menu:", and for "xx submenu" items in ADxMenu Modified: trunk/web/css/ie.css =================================================================== --- trunk/web/css/ie.css 2008-09-10 22:40:15 UTC (rev 11083) +++ trunk/web/css/ie.css 2008-09-10 23:55:11 UTC (rev 11084) @@ -1,6 +1,6 @@ /* inch the whole tabs up to show at the bottom of header exactly */ .mainMenu { - margin-top: 1px; + margin-top: 6px; } /* tab images */ @@ -43,12 +43,23 @@ color: #FFF; background: url('/images/4.0/tabs/tab_cap_active.gif') no-repeat right top; } -.mainMenu li.activeTab li a { + +.mainMenu li.activeTab li a, .mainMenu li.activeTab li a:visited { color: #3179D4; margin-right: 0px; background: #FFF; } +/* the links to submenus should have an arrow */ +.mainMenu li.hasSubmenu a, .mainMenu li.hasSubmenu a:visited,.mainMenu li.activeTab li.hasSubmenu a, .mainMenu li.activeTab li.hasSubmenu a:visited { + background: #FFF url('/images/4.0/icons/resultset_next.gif') no-repeat scroll 98% 1px; +} + +/* however links within a submenu should not have an arrow */ +.mainMenu li.hasSubmenu ul a,.mainMenu li.hasSubmenu ul a:visited,.mainMenu li.activeTab li.hasSubmenu ul a,.mainMenu li.activeTab li.hasSubmenu ul a:visited { + background: #FFF; +} + .mainMenu li.activeTab a:hover { color: #000; } Modified: trunk/web/css/ie6.css =================================================================== --- trunk/web/css/ie6.css 2008-09-10 22:40:15 UTC (rev 11083) +++ trunk/web/css/ie6.css 2008-09-10 23:55:11 UTC (rev 11084) @@ -4,7 +4,7 @@ of course, that means that it might require different styling then. in which case you can use adxie class - see: aplus.co.yu/adxmenu/examples/ie6-double-style/ */ -.mainMenu ul { +.mainMenu div { visibility: visible; position: static; } @@ -19,7 +19,6 @@ } .mainMenu .adxmhoverUL { /* 1st-level submenu go below their parent item */ top: 100%; - left: 30px; /* 30px to account for sticky div containing the ul */ } .mainMenu .adxmhoverUL .adxmhoverUL { /* 2nd+ levels go on the right side of the parent item */ top: 0; @@ -39,6 +38,6 @@ color: #C94304; } .mainMenu .adxmhoverUL .adxmhoverUL { /* inset 2nd+ submenus, to show off overlapping */ - top: 35px; /* 30px to account for sticky div, 5 px to display it offset */ + top: 4px; /* 4 px to display it offset */ left: 90%; } \ No newline at end of file Modified: trunk/web/css/ie7.css =================================================================== --- trunk/web/css/ie7.css 2008-09-10 22:40:15 UTC (rev 11083) +++ trunk/web/css/ie7.css 2008-09-10 23:55:11 UTC (rev 11084) @@ -14,14 +14,13 @@ } .mainMenu .adxmhoverUL { /* 1st-level submenu go below their parent item */ top: 100%; - left: 30px; /* 30px to account for sticky div containing the ul */ } .mainMenu .adxmhoverUL .adxmhoverUL { /* 2nd+ levels go on the right side of the parent item */ top: 0; left: 100%; } .mainMenu .adxmhoverUL .adxmhoverUL { /* inset 2nd+ submenus, to show off overlapping */ - top: 35px; /* 30px to account for sticky div, 5 px to display it offset */ + top: 4px; /* 4 px to display it offset */ left: 90%; } .mainMenu li li { /* fix white gap problem */ Added: trunk/web/images/4.0/icons/resultset_next.gif =================================================================== (Binary files differ) Property changes on: trunk/web/images/4.0/icons/resultset_next.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/web/js/ADxMenu.js =================================================================== --- trunk/web/js/ADxMenu.js 2008-09-10 22:40:15 UTC (rev 11083) +++ trunk/web/js/ADxMenu.js 2008-09-10 23:55:11 UTC (rev 11084) @@ -11,7 +11,7 @@ if (typeof(WCH) == "undefined") WCH = null; // hide submenus -document.write('<style type="text/css" media="all">.mainMenu ul {visibility:hidden; position:absolute;}</style>'); +document.write('<style type="text/css" media="all">.mainMenu div {visibility:hidden; position:absolute;}</style>'); var ADxMenu = function() { var self = this; @@ -31,24 +31,28 @@ aTmp2 = aTmp[i].getElementsByTagName("li"); for (j=0;j<aTmp2.length;j++) { oLI = aTmp2[j]; + aDIV = oLI.getElementsByTagName("div"); aUL = oLI.getElementsByTagName("ul"); // if item has submenu, then make the item hoverable if (aUL && aUL.length) { oLI.UL = aUL[0]; // direct submenu + oLI.DIV = aDIV[0]; // direct submenu container aA = oLI.getElementsByTagName("a"); if (aA && aA.length) oLI.A = aA[0]; // direct child link // li:hover oLI.onmouseenter = function() { this.className += " adxmhover"; - this.UL.className += " adxmhoverUL"; + // this.UL.className += " adxmhoverUL"; + this.DIV.className += " adxmhoverUL"; if (this.A) this.A.className += " adxmhoverA"; if (WCH) WCH.Apply( this.UL, this, true ); }; // li:blur oLI.onmouseleave = function() { this.className = this.className.replace(/adxmhover/,""); - this.UL.className = this.UL.className.replace(/adxmhoverUL/,""); + // this.UL.className = this.UL.className.replace(/adxmhoverUL/,""); + this.DIV.className = this.DIV.className.replace(/adxmhoverUL/,""); if (this.A) this.A.className = this.A.className.replace(/adxmhoverA/,""); if (WCH) WCH.Discard( this.UL, this ); }; |