Author: vmolotkov Date: 2007-11-09 13:48:52 -0500 (Fri, 09 Nov 2007) New Revision: 3882 Modified: trunk/sandbox/ui/orderingList/src/main/config/component/orderinglist.xml trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss trunk/sandbox/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx Log: rendering of facet content was added Modified: trunk/sandbox/ui/orderingList/src/main/config/component/orderinglist.xml =================================================================== --- trunk/sandbox/ui/orderingList/src/main/config/component/orderinglist.xml 2007-11-09 18:33:48 UTC (rev 3881) +++ trunk/sandbox/ui/orderingList/src/main/config/component/orderinglist.xml 2007-11-09 18:48:52 UTC (rev 3882) @@ -40,6 +40,13 @@ </property> <property> + <name>captionLabel</name> + <classname>java.lang.String</classname> + <description> + Defines caption representation text + </description> + </property> + <property> <name>listWidth</name> <classname>int</classname> <description> Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-09 18:33:48 UTC (rev 3881) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-09 18:48:52 UTC (rev 3882) @@ -39,6 +39,8 @@ private final static String FACET_DOWN = "downControl"; + private final static String FACET_CAPTION = "caption"; + private final static String CONTROL_TYPE_LINK = "link"; private final static String CONTROL_TYPE_BUTTON = "button"; @@ -59,6 +61,8 @@ private final static String ATTRIBUTE_CE_ONHEADERCLICK = "onheaderclick"; + private final static String ATTRIBUTE_CAPTION_LABEL = "captionLabel"; + private final static String CONTROL_ID_UP = "_up"; private final static String CONTROL_ID_DOWN = "_down"; @@ -179,8 +183,24 @@ }}); } - public void encodeCaption(FacesContext context, UIOrderingList orderingList) { - + public void encodeCaption(FacesContext context, UIOrderingList orderingList) + throws IOException { + ResponseWriter writer = context.getResponseWriter(); + UIComponent facetEl = orderingList.getFacet(FACET_CAPTION); + boolean renderFacet = ((facetEl != null) && facetEl.isRendered()); + String captionAttr = (String) orderingList.getAttributes().get(ATTRIBUTE_CAPTION_LABEL); + + if (renderFacet || (captionAttr != null)) { + writer.startElement(HTML.DIV_ELEM, orderingList); + writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_captionlabel rich-ordering-list-caption", null); + if (renderFacet) { + renderChild(context, facetEl); + } else { + writer.write(captionAttr); + } + writer.endElement(HTML.DIV_ELEM); + } + } public void encodeHeader(FacesContext context, UIOrderingList orderingList) @@ -301,7 +321,7 @@ } UIComponent facet = column.getFacet(facetName); - if (facet != null) { + if (facet != null && facet.isRendered()) { renderChild(context, facet); } Modified: trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss =================================================================== --- trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-09 18:33:48 UTC (rev 3881) +++ trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-09 18:48:52 UTC (rev 3882) @@ -8,7 +8,7 @@ padding : 1px; } -.ol_headerlabel { +.ol_captionlabel { font-family : Arial; font-size :11px; font-weight : bold; Modified: trunk/sandbox/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx =================================================================== --- trunk/sandbox/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-11-09 18:33:48 UTC (rev 3881) +++ trunk/sandbox/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-11-09 18:48:52 UTC (rev 3882) @@ -26,6 +26,11 @@ <table id="#{clientId}table" cellpadding="0" cellspacing="0" class="ol_body"> <tbody> <tr> + <td colspan="2"> + <f:call name="encodeCaption"/> + </td> + </tr> + <tr> <td> <div id="#{clientId}headerBox" class="ol_list"> <div class="ol_list_header" style="width: #{component.attributes['listHeight']}px;">