From richfaces-svn-commits at lists.jboss.org Fri Mar 30 11:00:25 2007
Content-Type: multipart/mixed; boundary="===============7475268935540176050=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r227 -
 trunk/richfaces/menu-components/src/main/templates/org/richfaces.
Date: Fri, 30 Mar 2007 11:00:25 -0400
Message-ID: <E1HXIaX-0006NH-43@committer01.frg.pub.inap.atl.jboss.com>

--===============7475268935540176050==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: a.izobov
Date: 2007-03-30 11:00:24 -0400 (Fri, 30 Mar 2007)
New Revision: 227

Modified:
   trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMen=
uGroup.jspx
Log:
menuGroup development

Modified: trunk/richfaces/menu-components/src/main/templates/org/richfaces/=
htmlMenuGroup.jspx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMe=
nuGroup.jspx	2007-03-30 14:55:53 UTC (rev 226)
+++ trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMe=
nuGroup.jspx	2007-03-30 15:00:24 UTC (rev 227)
@@ -32,7 +32,9 @@
 				onmouseout=3D"this.className=3D'dr-menu-item dr-menu-item-enabled rich=
-menu-group'; #{component.attributes['onmouseout']}" =

 				onmouseover=3D"this.className=3D'dr-menu-item dr-menu-item-hover rich-=
menu-group rich-menu-group-hover'; #{component.attributes['onmouseover']}"
 				onmousemove=3D"#{component.attributes['onmousemove']}">
-
+				=

+				<span id=3D"ref#{clientId}:icon" =

+					class=3D"dr-menu-icon rich-menu-item-icon #{component.attributes['ico=
nClass']}">
 				<jsp:scriptlet>
 					<![CDATA[if(component.getFacet("icon")!=3Dnull && component.getFacet(=
"icon").isRendered()) {]]>
 				</jsp:scriptlet>
@@ -40,48 +42,30 @@
 				<jsp:scriptlet>	=

 					<![CDATA[} else if (component.getAttributes().get("icon")!=3Dnull) {]=
]> =

 				</jsp:scriptlet>
-					<img class=3D"dr-menu-icon rich-menu-item-icon #{component.attributes=
['iconClass']}" =

-						width=3D"16" height=3D"16" =

+					<img width=3D"16" height=3D"16" =

 						style=3D"#{component.attributes['iconStyle']}"
 						src=3D"#{component.attributes['icon']}"/>
 				<jsp:scriptlet>	=

 					<![CDATA[} else {]]> =

 				</jsp:scriptlet>
-					<img class=3D"dr-menu-icon rich-menu-item-icon #{component.attributes=
['iconClass']}" =

-						width=3D"16" height=3D"16" =

+					<img  width=3D"16" height=3D"16" =

 						style=3D"#{component.attributes['iconStyle']}"
 						src=3D"#{spacer}"/>
 				<jsp:scriptlet><![CDATA[}]]></jsp:scriptlet>
+				</span>
 		=

 				<a id=3D"ref#{clientId}:anchor" class=3D"dr-menu-label rich-menu-item-=
label" href=3D"#">#{component.attributes['value']}</a>
+				<div id=3D"#{clientId}" class=3D"dr-menu-node rich-menu-item-folder"/>
 =

-				<div id=3D"#{clientId}" class=3D"dr-menu-node rich-menu-item-folder">
-		            <div id=3D"ref#{clientId}_menu" =

-                        style=3D"z-index:100;"
-						class=3D"dr-menu-list-border dr-menu-sublist rich-menu-list-border r=
ich-menu-sublist">           =

-						<div class=3D"dr-menu-list-bg rich-menu-list-bg">				    =

-							<f:call name=3D"renderChildren"/>
-						</div>
-					</div>
-					<iframe class=3D"underneath_iframe" =

-						id=3D"ref#{clientId}_menu_iframe" =

-						style=3D"position:absolute;">
-					</iframe>
-					<iframe class=3D"underneath_iframe" =

-						id=3D"ref#{clientId}_menu_iframe1" =

-						style=3D"position:absolute;">
-					</iframe>
-					<script type=3D"text/javascript" id=3D"ref#{clientId}_script">
-						<f:call name=3D"getScript"/>
-					</script>
-				</div>
 			</div>
 			=

 		<jsp:scriptlet><![CDATA[} else {]]></jsp:scriptlet>
-			<div id=3D"#{clientId}" =

+			<div id=3D"ref#{clientId}" =

 			class=3D"dr-menu-item dr-menu-item-disabled rich-menu-group rich-menu-g=
roup-disabled #{component.attributes['styleClass']}" =

 			style=3D"#{component.attributes['style']}">
 			=

+				<span id=3D"ref#{clientId}:icon" =

+					class=3D"dr-menu-icon rich-menu-item-icon-disabled #{component.attrib=
utes['iconClass']}">
 				<jsp:scriptlet>
 					<![CDATA[if(component.getFacet("iconDisabled")!=3Dnull && component.g=
etFacet("iconDisabled").isRendered()) {]]>
 				</jsp:scriptlet>
@@ -89,18 +73,17 @@
 				<jsp:scriptlet>	=

 					<![CDATA[} else if (component.getAttributes().get("iconDisabled")!=3D=
null) {]]> =

 				</jsp:scriptlet>
-					<img class=3D"dr-menu-icon rich-menu-item-icon-disabled #{component.a=
ttributes['iconClass']}" =

-						width=3D"16" height=3D"16" =

+					<img width=3D"16" height=3D"16" =

 						style=3D"#{component.attributes['iconStyle']}"
 						src=3D"#{component.attributes['iconDisabled']}"/>
 				<jsp:scriptlet>	=

 					<![CDATA[} else {]]> =

 				</jsp:scriptlet>
-					<img class=3D"dr-menu-icon rich-menu-item-icon-disabled #{component.a=
ttributes['iconClass']}" =

-						width=3D"16" height=3D"16" =

+					<img width=3D"16" height=3D"16" =

 						style=3D"#{component.attributes['iconStyle']}"
 						src=3D"#{spacer}"/>
 				<jsp:scriptlet><![CDATA[}]]></jsp:scriptlet>
+				</span>
 				=

 				<span class=3D"rich-menu-item-label-disabled">#{component.attributes['=
value']}</span>
 =



--===============7475268935540176050==--