You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/11/28 15:03:25 UTC
svn commit: r721499 - in /myfaces/trinidad/trunk: src/site/xdoc/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/
trinidad-impl/src/main/resources/META-INF/adf/styles/
Author: matzew
Date: Fri Nov 28 06:03:25 2008
New Revision: 721499
URL: http://svn.apache.org/viewvc?rev=721499&view=rev
Log:
TRINIDAD-1269 - PanelPopup does not render icon
thx to Vimal Kumar Gupta for the patch
Modified:
myfaces/trinidad/trunk/src/site/xdoc/skin-selectors.xml
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPopupRenderer.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
Modified: myfaces/trinidad/trunk/src/site/xdoc/skin-selectors.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/src/site/xdoc/skin-selectors.xml?rev=721499&r1=721498&r2=721499&view=diff
==============================================================================
--- myfaces/trinidad/trunk/src/site/xdoc/skin-selectors.xml (original)
+++ myfaces/trinidad/trunk/src/site/xdoc/skin-selectors.xml Fri Nov 28 06:03:25 2008
@@ -2252,6 +2252,10 @@
<td>Styles the text within the title-bar.</td>
</tr>
<tr>
+ <td>af|panelPopup::icon-style</td>
+ <td>Styles the trigger icon that is rendered alongwith trigger-text.</td>
+ </tr>
+ <tr>
<td>af|panelPopup::close-icon</td>
<td>Styles the clickable icon that closes the popup.</td>
</tr>
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPopupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPopupRenderer.java?rev=721499&r1=721498&r2=721499&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPopupRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPopupRenderer.java Fri Nov 28 06:03:25 2008
@@ -51,6 +51,7 @@
{
super.findTypeConstants(type);
_textKey = type.findKey("text");
+ _iconKey = type.findKey("icon");
_titleKey = type.findKey("title");
_triggerTypeKey = type.findKey("triggerType");
_positionKey = type.findKey("position");
@@ -68,6 +69,11 @@
return toString(resolveProperty(bean, _textKey));
}
+ protected String getIcon(FacesBean bean)
+ {
+ return toResourceUri(FacesContext.getCurrentInstance(), resolveProperty(bean, _iconKey));
+ }
+
protected String getTitle(FacesBean bean)
{
return toString(resolveProperty(bean, _titleKey));
@@ -203,7 +209,11 @@
CorePanelPopup.TRIGGER_FACET);
if (triggerFacet != null)
encodeChild(context, triggerFacet);
-
+
+ //render trigger icon
+ OutputUtils.renderImage(context, arc, getIcon(bean), null, null, null, "",
+ component, null, SkinSelectors.AF_PANEL_POPUP_ICON_STYLE_CLASS);
+
delegateRendererEnd(context, arc, component, bean, _triggerRenderer);
}
@@ -385,6 +395,7 @@
private PropertyKey _vertOffsetKey;
private XhtmlRenderer _triggerRenderer;
+ private PropertyKey _iconKey;
private static final String _POPUP_CONTAINER_ID_SUFFIX = "_popupContainer";
private static final String _POPUP_TRIGGER_ID_SUFFIX = "_popupTrigger";
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java?rev=721499&r1=721498&r2=721499&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java Fri Nov 28 06:03:25 2008
@@ -1008,6 +1008,8 @@
public static final String AF_PANEL_POPUP_LINK_STYLE_CLASS =
AF_PANEL_POPUP_ROOT_STYLE_CLASS + "::link";
+ public static final String AF_PANEL_POPUP_ICON_STYLE_CLASS =
+ AF_PANEL_POPUP_ROOT_STYLE_CLASS + "::icon-style";
public static final String AF_PANEL_POPUP_TRIGGER_STYLE_CLASS =
AF_PANEL_POPUP_ROOT_STYLE_CLASS + "::trigger";
public static final String AF_PANEL_POPUP_CONTAINER_STYLE_CLASS =
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss?rev=721499&r1=721498&r2=721499&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss Fri Nov 28 06:03:25 2008
@@ -1969,6 +1969,11 @@
<property name="border">0px</property>
</style>
+ <style selector="af|panelPopup::icon-style">
+ <property name="border">0px</property>
+ <property name="vertical-align">bottom</property>
+ </style>
+
<!--
tr:menuButtons Styles
-->