5 p.m.
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/htmlMenuGroup.jspx
Log:
menuGroup development
Modified:
trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx
===================================================================
---
trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2007-03-30
14:55:53 UTC (rev 226)
+++
trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2007-03-30
15:00:24 UTC (rev 227)
@@ -32,7 +32,9 @@
onmouseout="this.className='dr-menu-item dr-menu-item-enabled
rich-menu-group'; #{component.attributes['onmouseout']}"
onmouseover="this.className='dr-menu-item dr-menu-item-hover rich-menu-group
rich-menu-group-hover'; #{component.attributes['onmouseover']}"
onmousemove="#{component.attributes['onmousemove']}">
-
+
+ <span id="ref#{clientId}:icon"
+ class="dr-menu-icon rich-menu-item-icon
#{component.attributes['iconClass']}">
<jsp:scriptlet>
<![CDATA[if(component.getFacet("icon")!=null &&
component.getFacet("icon").isRendered()) {]]>
</jsp:scriptlet>
@@ -40,48 +42,30 @@
<jsp:scriptlet>
<![CDATA[} else if (component.getAttributes().get("icon")!=null)
{]]>
</jsp:scriptlet>
- <img class="dr-menu-icon rich-menu-item-icon
#{component.attributes['iconClass']}"
- width="16" height="16"
+ <img width="16" height="16"
style="#{component.attributes['iconStyle']}"
src="#{component.attributes['icon']}"/>
<jsp:scriptlet>
<![CDATA[} else {]]>
</jsp:scriptlet>
- <img class="dr-menu-icon rich-menu-item-icon
#{component.attributes['iconClass']}"
- width="16" height="16"
+ <img width="16" height="16"
style="#{component.attributes['iconStyle']}"
src="#{spacer}"/>
<jsp:scriptlet><![CDATA[}]]></jsp:scriptlet>
+ </span>
<a id="ref#{clientId}:anchor" class="dr-menu-label
rich-menu-item-label"
href="#">#{component.attributes['value']}</a>
+ <div id="#{clientId}" class="dr-menu-node
rich-menu-item-folder"/>
- <div id="#{clientId}" class="dr-menu-node
rich-menu-item-folder">
- <div id="ref#{clientId}_menu"
- style="z-index:100;"
- class="dr-menu-list-border dr-menu-sublist rich-menu-list-border
rich-menu-sublist">
- <div class="dr-menu-list-bg rich-menu-list-bg">
- <f:call name="renderChildren"/>
- </div>
- </div>
- <iframe class="underneath_iframe"
- id="ref#{clientId}_menu_iframe"
- style="position:absolute;">
- </iframe>
- <iframe class="underneath_iframe"
- id="ref#{clientId}_menu_iframe1"
- style="position:absolute;">
- </iframe>
- <script type="text/javascript"
id="ref#{clientId}_script">
- <f:call name="getScript"/>
- </script>
- </div>
</div>
<jsp:scriptlet><![CDATA[} else {]]></jsp:scriptlet>
- <div id="#{clientId}"
+ <div id="ref#{clientId}"
class="dr-menu-item dr-menu-item-disabled rich-menu-group
rich-menu-group-disabled #{component.attributes['styleClass']}"
style="#{component.attributes['style']}">
+ <span id="ref#{clientId}:icon"
+ class="dr-menu-icon rich-menu-item-icon-disabled
#{component.attributes['iconClass']}">
<jsp:scriptlet>
<![CDATA[if(component.getFacet("iconDisabled")!=null &&
component.getFacet("iconDisabled").isRendered()) {]]>
</jsp:scriptlet>
@@ -89,18 +73,17 @@
<jsp:scriptlet>
<![CDATA[} else if
(component.getAttributes().get("iconDisabled")!=null) {]]>
</jsp:scriptlet>
- <img class="dr-menu-icon rich-menu-item-icon-disabled
#{component.attributes['iconClass']}"
- width="16" height="16"
+ <img width="16" height="16"
style="#{component.attributes['iconStyle']}"
src="#{component.attributes['iconDisabled']}"/>
<jsp:scriptlet>
<![CDATA[} else {]]>
</jsp:scriptlet>
- <img class="dr-menu-icon rich-menu-item-icon-disabled
#{component.attributes['iconClass']}"
- width="16" height="16"
+ <img width="16" height="16"
style="#{component.attributes['iconStyle']}"
src="#{spacer}"/>
<jsp:scriptlet><![CDATA[}]]></jsp:scriptlet>
+ </span>
<span
class="rich-menu-item-label-disabled">#{component.attributes['value']}</span>