| [vhffs-dev] [430] JScript code was duplicated in vhffs-ng/js/menu.js |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 430
Author: beuss
Date: 2007-02-02 13:35:25 +0000 (Fri, 02 Feb 2007)
Log Message:
-----------
JScript code was duplicated in vhffs-ng/js/menu.js
vhffs theme's JS contained some debug statements
Updated css for vhffs-ng menu
Modified Paths:
--------------
branches/vhffs_4.1/vhffs-api/src/Vhffs/Constants.pm
branches/vhffs_4.1/vhffs-panel/themes/vhffs/js/menu.js
branches/vhffs_4.1/vhffs-panel/themes/vhffs-ng/js/menu.js
branches/vhffs_4.1/vhffs-panel/themes/vhffs-ng/main.css
Modified: branches/vhffs_4.1/vhffs-api/src/Vhffs/Constants.pm
===================================================================
--- branches/vhffs_4.1/vhffs-api/src/Vhffs/Constants.pm 2007-02-02 13:24:32 UTC (rev 429)
+++ branches/vhffs_4.1/vhffs-api/src/Vhffs/Constants.pm 2007-02-02 13:35:25 UTC (rev 430)
@@ -7,7 +7,7 @@
use constant
{
- VHFFS_VERSION => '4.1-alpha (Revision: 426)',
+ VHFFS_VERSION => '4.1-alpha (Revision: 429)',
VHFFS_RELEASE_NAME => "hippocampus",
WAITING_FOR_VALIDATION => 1,
Modified: branches/vhffs_4.1/vhffs-panel/themes/vhffs/js/menu.js
===================================================================
--- branches/vhffs_4.1/vhffs-panel/themes/vhffs/js/menu.js 2007-02-02 13:24:32 UTC (rev 429)
+++ branches/vhffs_4.1/vhffs-panel/themes/vhffs/js/menu.js 2007-02-02 13:35:25 UTC (rev 430)
@@ -30,9 +30,7 @@
el = document.getElementById(menu + 'Title');
if(el) {
el.onclick = eval("function () {ToggleMenuItem('" + menu + "');}");
- } else {
- alert(menu + 'Title introuvable');
- }
+ }
}
}
Modified: branches/vhffs_4.1/vhffs-panel/themes/vhffs-ng/js/menu.js
===================================================================
--- branches/vhffs_4.1/vhffs-panel/themes/vhffs-ng/js/menu.js 2007-02-02 13:24:32 UTC (rev 429)
+++ branches/vhffs_4.1/vhffs-panel/themes/vhffs-ng/js/menu.js 2007-02-02 13:35:25 UTC (rev 430)
@@ -102,162 +102,14 @@
// hide the ul elements under the element identified by id
function hideUlUnder( id )
{
- document.getElementById(id).getElementsByTagName('ul')[0].style['visibility'] = 'hidden';
-}
-
-// show the first ul element found under this element
-function show()
-{
- // show the sub menu
- this.getElementsByTagName('ul')[0].style['visibility'] = 'visible';
- var currentNode=this;
- while(currentNode)
- {
- if( currentNode.nodeName=='LI')
- {
- currentNode.getElementsByTagName('a')[0].className = 'linkOver';
- }
- currentNode=currentNode.parentNode;
- }
- // clear the timeout
- eval ( "clearTimeout( timeout"+ this.id +");" );
- hideAllOthersUls( this );
-}
-
-// hide all ul on the same level of this list item
-function hideAllOthersUls( currentLi )
-{
- var lis = currentLi.parentNode;
- for ( var i=0; i<lis.childNodes.length; i++ )
- {
- if ( lis.childNodes[i].nodeName=='LI' && lis.childNodes[i].id != currentLi.id )
- {
- hideUlUnderLi( lis.childNodes[i] );
- }
- }
-}
-
-// hide all the ul wich are in the li element
-function hideUlUnderLi( li )
-{
+ var li = document.getElementById(id);
+ li.getElementsByTagName('ul')[0].style['visibility'] = 'hidden';
var as = li.getElementsByTagName('a');
- for ( var i=0; i<as.length; i++ )
- {
- as.item(i).className="";
+ for(var i = 0 ; i < as.length ; ++i) {
+ as[i].className = '';
}
- var uls = li.getElementsByTagName('ul');
- for ( var i=0; i<uls.length; i++ )
- {
- uls.item(i).style['visibility'] = 'hidden';
- }
-}
-/*
-Author : bieler batiste
-Company : doSimple : http://www.dosimple.ch
-send me a mail for more informations : faden@xxxxxxxxxxxxxxxxxxxxxxx - remove ( PASDEPOURRIEL )
-
-Short javascript function to create and handle a CSS navigation menu
-
-Copyright (C) 2004 Bieler Batiste
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-// the timeout for the menu
-var timeout = 1000;
-
-// not very clean but simple
-// the function can be run in the HTML for faster display
-// window.onload=initMenu;
-
-// creat timeout variables for list item
-// it's for avoid some warning with IE
-for( var i = 0; i < 100; i++ )
-{
- eval("var timeoutli" + i + " = false;");
}
-// this fonction apply the CSS style and the event
-function initMenu()
-{
- // a test to avoid some browser like IE4, Opera 6, and IE Mac
- if ( browser.isDOM1
- && !( browser.isMac && browser.isIE )
- && !( browser.isOpera && browser.versionMajor < 7 )
- && !( browser.isIE && browser.versionMajor < 5 ) )
- {
- // get some element
- var menu = document.getElementById('menu'); // the root element
- var lis = menu.getElementsByTagName('li'); // all the li
-
- // change the class name of the menu,
- // it's usefull for compatibility with old browser
- menu.className='menu';
-
- // i am searching for ul element in li element
- for ( var i=0; i<lis.length; i++ )
- {
- // is there a ul element ?
- if ( lis.item(i).getElementsByTagName('ul').length > 0 )
- {
- // improve IE key navigation
- if ( browser.isIE )
- {
- addAnEvent(lis.item(i),'keyup',show);
- }
- // link events to list item
- addAnEvent(lis.item(i),'mouseover',show);
- addAnEvent(lis.item(i),'mouseout',timeoutHide);
- addAnEvent(lis.item(i),'blur',timeoutHide);
- addAnEvent(lis.item(i),'focus',show);
-
- // add an id to list item
- lis.item(i).setAttribute( 'id', "li"+i );
- }
- }
- }
-}
-
-function addAnEvent( target, eventName, functionName )
-{
- // apply the method to IE
- if ( browser.isIE )
- {
- //attachEvent dont work properly with this
- eval('target.on'+eventName+'=functionName');
- }
- // apply the method to DOM compliant browsers
- else
- {
- target.addEventListener( eventName , functionName , true ); // true is important for Opera7
- }
-}
-
-// hide the first ul element of the current element
-function timeoutHide()
-{
- // start the timeout
- eval( "timeout" + this.id + " = window.setTimeout('hideUlUnder( \"" + this.id + "\" )', " + timeout + " );");
-}
-
-// hide the ul elements under the element identified by id
-function hideUlUnder( id )
-{
- document.getElementById(id).getElementsByTagName('ul')[0].style['visibility'] = 'hidden';
-}
-
// show the first ul element found under this element
function show()
{
@@ -304,4 +156,3 @@
uls.item(i).style['visibility'] = 'hidden';
}
}
-
Modified: branches/vhffs_4.1/vhffs-panel/themes/vhffs-ng/main.css
===================================================================
--- branches/vhffs_4.1/vhffs-panel/themes/vhffs-ng/main.css 2007-02-02 13:24:32 UTC (rev 429)
+++ branches/vhffs_4.1/vhffs-panel/themes/vhffs-ng/main.css 2007-02-02 13:35:25 UTC (rev 430)
@@ -96,27 +96,35 @@
#logo
{
position:absolute;
- top:20px;
- left:5px;
+ top:3em;
+ left:0.2em;
}
/* CSS du menu horizontal, bieler batiste */
#menu{
- position:absolute;
+ position:fixed;
display:block;
margin:0;
padding:0;
- top:20px;
- width:600px;
- }
+ top:1.5em;
+ width:100%;
+ height:1.5em;
+ background-color:#dcdad5;
+ border-bottom:2px ridge black;
+ border-top:2px ridge black;
+}
#menu ul{
position:absolute;
display:block;
- width:200px;
+ width:14.5em;
/*margin:0;*/
padding:0;
+ background-color:#dcdad5;
+ border-color: black #dcdad5 #dcdad5 black;
+ border-style: solid ridge ridge solid;
+ border-width: 1px 3px 3px 1px;
}
#menu li ul{
@@ -125,10 +133,14 @@
#menu li li ul{
position:absolute;
- margin-left:190px;
+ margin-left:14.5em;
margin-top:-23px;
}
-
+
+#menu li li li ul {
+ margin-left:-14.5em;
+}
+
#menu li{
list-style:none;
width:200px;
@@ -152,43 +164,46 @@
}
#menu a{
- text-align:center;
- background-color: #9cf;
- border:1px #666 solid;
+ text-align:left;
color:#000;
display:block;
- width:190px;
+ width:14.5em;
text-decoration:none;
padding:2px 0;
margin:1px;
}
+#menu>li>a {
+ text-align:center;
+}
+
#menu a[href="#"]
{
cursor:default;
}
-#menu a:hover{
- background-color: #eee;
- border:1px #aaa solid;
+#menu a:hover {
+ background-color: #4b6983;
+ color: white;
}
/* for a mozilla better display with key nav */
-#menu a:focus{
- background-color: #aaf;
+#menu a:focus {
+ background-color:#4b6983;
+ color:white;
}
-a.linkOver{
- background-color: #eee;
- }
+#menu a.linkOver{
+ background-color:#4b6983;
+ color:white;
+}
+
body a
{
color: black;
}
-
-
.listengine_header
{
margin: 0px;
@@ -208,10 +223,6 @@
font-size: small;
}
-
-
-
-
a:link, a:visited, a:hover {
color: black;
}
@@ -276,7 +287,7 @@
#main
{
padding:0px;
-
+ padding-top:3em;
padding-left:280px;
margin-top :0px;
}