Author: amarkhel Date: 2010-12-03 12:34:09 -0500 (Fri, 03 Dec 2010) New Revision: 20376 Modified: sandbox/trunk/examples/dropdownmenu-demo/src/main/webapp/index.xhtml sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/menugroup.template.xml sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/menuitem.template.xml Log: RF-9676 :Dropdown menu component. Resource url changes added. Modified: sandbox/trunk/examples/dropdownmenu-demo/src/main/webapp/index.xhtml =================================================================== --- sandbox/trunk/examples/dropdownmenu-demo/src/main/webapp/index.xhtml 2010-12-03 17:30:21 UTC (rev 20375) +++ sandbox/trunk/examples/dropdownmenu-demo/src/main/webapp/index.xhtml 2010-12-03 17:34:09 UTC (rev 20376) @@ -21,17 +21,17 @@ <ddm:dropDownMenu id="ddmenu" disabled="#{menuBean.disabled}" mode="#{menuBean.mode}"> <f:facet name="label"> <h:panelGroup> - <h:graphicImage value="images/copy.gif" styleClass="pic"/> + <h:graphicImage value="/images/copy.gif" styleClass="pic"/> <h:outputText value="File"/> </h:panelGroup> </f:facet> <f:facet name="labelDisabled"> <h:panelGroup> - <h:graphicImage value="images/copy.gif" styleClass="pic"/> + <h:graphicImage value="/images/copy.gif" styleClass="pic"/> <h:outputText value="(disabled)File"/> </h:panelGroup> </f:facet> - <ddm:menuItem id="menuNew" label="New" icon="images/create_doc.gif" + <ddm:menuItem id="menuNew" label="New" icon="/images/create_doc.gif" action="#{menuBean.doNew}" execute="@form"> <f:facet name="icon"> <h:selectBooleanCheckbox id="checkbox" value="#{menuBean.checkbox}"/> @@ -39,28 +39,28 @@ </ddm:menuItem> <ddm:menuItem label="Open" action="#{menuBean.doOpen}"> <f:facet name="icon"> - <h:graphicImage value="images/open.gif" /> + <h:graphicImage value="/images/open.gif" /> </f:facet> </ddm:menuItem> <ddm:menuGroup label="Save As..." disabled="true"> - <ddm:menuItem label="Save" icon="images/save.gif" > + <ddm:menuItem label="Save" icon="/images/save.gif" > <f:facet name="icon"> - <h:graphicImage value="images/save.gif" /> + <h:graphicImage value="/images/save.gif" /> </f:facet> </ddm:menuItem> - <ddm:menuItem label="Save All" icon="images/save_all.gif" > + <ddm:menuItem label="Save All" icon="/images/save_all.gif" > <f:setPropertyActionListener target="#{menuBean.value}" value="Save All" /> </ddm:menuItem> </ddm:menuGroup> <ddm:menuGroup label="Save As..."> - <ddm:menuItem label="Save" icon="images/save.gif" > + <ddm:menuItem label="Save" icon="/images/save.gif" > <f:setPropertyActionListener target="#{menuBean.value}" value="Save" /> </ddm:menuItem> - <ddm:menuGroup label="Save All" icon="images/save_all.gif" > - <ddm:menuItem label="Save All 1" icon="images/save_all.gif"> + <ddm:menuGroup label="Save All" icon="/images/save_all.gif" > + <ddm:menuItem label="Save All 1" icon="/images/save_all.gif"> <f:setPropertyActionListener target="#{menuBean.value}" value="Save All 1" /> </ddm:menuItem> - <ddm:menuItem label="Save All 2" icon="images/save_all.gif" > + <ddm:menuItem label="Save All 2" icon="/images/save_all.gif" > <f:setPropertyActionListener target="#{menuBean.value}" value="Save All 2" /> </ddm:menuItem> </ddm:menuGroup> Modified: sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/menugroup.template.xml =================================================================== --- sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/menugroup.template.xml 2010-12-03 17:30:21 UTC (rev 20375) +++ sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/menugroup.template.xml 2010-12-03 17:34:09 UTC (rev 20376) @@ -41,7 +41,7 @@ <cdk:call expression="iconFacet.encodeAll(facesContext)" /> </c:when> <c:when test="#{not empty iconAttribute}"> - <img width="16" height="16" src="#{iconAttribute}" alt="" /> + <img width="16" height="16" src="#{RenderKitUtils.getResourceURL(iconAttribute, facesContext)}" alt="" /> </c:when> <c:otherwise> <div class="rf-ddm-emptyIcon"></div> Modified: sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/menuitem.template.xml =================================================================== --- sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/menuitem.template.xml 2010-12-03 17:30:21 UTC (rev 20375) +++ sandbox/trunk/ui/dropdown-menu/ui/src/main/templates/menuitem.template.xml 2010-12-03 17:34:09 UTC (rev 20376) @@ -44,7 +44,7 @@ <cdk:call expression="iconFacet.encodeAll(facesContext)" /> </c:when> <c:when test="#{not empty iconAttribute}"> - <img width="16" height="16" src="#{iconAttribute}" alt="" /> + <img width="16" height="16" src="#{RenderKitUtils.getResourceURL(iconAttribute, facesContext)}" alt="" /> </c:when> <c:otherwise> <div class="rf-ddm-emptyIcon"></div>