March 2011 - richfaces-svn-commits

JBoss Rich Faces SVN: r22129 - modules/tests/metamer/trunk/ftest/src/test/resources.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2011-03-10 04:36:12 -0500 (Thu, 10 Mar 2011) New Revision: 22129 Modified: modules/tests/metamer/trunk/ftest/src/test/resources/testng-output.xml Log: testng-output.xml - needs to express richPanel/TestRichPanel as class instead of whole package, because otherwise all richPanel** packages are expanded incl. richPanelMenu** Modified: modules/tests/metamer/trunk/ftest/src/test/resources/testng-output.xml =================================================================== --- modules/tests/metamer/trunk/ftest/src/test/resources/testng-output.xml 2011-03-10 04:47:28 UTC (rev 22128) +++ modules/tests/metamer/trunk/ftest/src/test/resources/testng-output.xml 2011-03-10 09:36:12 UTC (rev 22129) @@ -8,8 +8,11 @@ </run> </groups> + <classes> + <class name="org.richfaces.tests.metamer.ftest.richPanel.TestRichPanel" /> + </classes> + <packages> - <package name="org.richfaces.tests.metamer.ftest.richPanel" /> <package name="org.richfaces.tests.metamer.ftest.richPopupPanel" /> <package name="org.richfaces.tests.metamer.ftest.richProgressBar" /> <package name="org.richfaces.tests.metamer.ftest.richToolbar" />

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r22128 - modules/docs/trunk/Component_Reference/src/main/docbook/en-US/skinning.

by richfaces-svn-commits＠lists.jboss.org

Author: SeanRogers Date: 2011-03-09 23:47:28 -0500 (Wed, 09 Mar 2011) New Revision: 22128 Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/skinning/tabl-richdataGrid.xml Log: Added missing tag Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/skinning/tabl-richdataGrid.xml =================================================================== --- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/skinning/tabl-richdataGrid.xml 2011-03-10 04:42:08 UTC (rev 22127) +++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/skinning/tabl-richdataGrid.xml 2011-03-10 04:47:28 UTC (rev 22128) @@ -87,6 +87,7 @@ </listitem> </varlistentry> </variablelist> + </entry> <entry><literal>tableBorderWidth</literal></entry> <entry><literal>border-bottom-width</literal>, <literal>border-right-width</literal></entry> </row>

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r22127 - modules/docs/trunk/Developer_Guide/src/main/docbook/en-US.

by richfaces-svn-commits＠lists.jboss.org

Author: SeanRogers Date: 2011-03-09 23:42:08 -0500 (Wed, 09 Mar 2011) New Revision: 22127 Modified: modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/Developer_Guide.xml modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/appe-Developer_Guide-Style_classes_and_skin_parameters.xml Log: Updated skinning appendix Modified: modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/Developer_Guide.xml =================================================================== --- modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/Developer_Guide.xml 2011-03-09 18:20:11 UTC (rev 22126) +++ modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/Developer_Guide.xml 2011-03-10 04:42:08 UTC (rev 22127) @@ -12,7 +12,7 @@ <xi:include href="chap-Developer_Guide-Skinning_and_theming.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />  -  + <xi:include href="appe-Developer_Guide-Style_classes_and_skin_parameters.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />  </book> Modified: modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/appe-Developer_Guide-Style_classes_and_skin_parameters.xml =================================================================== --- modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/appe-Developer_Guide-Style_classes_and_skin_parameters.xml 2011-03-09 18:20:11 UTC (rev 22126) +++ modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/appe-Developer_Guide-Style_classes_and_skin_parameters.xml 2011-03-10 04:42:08 UTC (rev 22127) @@ -7,22 +7,38 @@ Each of the <productname>RichFaces</productname> components are listed below, along with their style classes and skin parameters. For further details on each component, refer to the relevant section in the <citetitle>RichFaces Component Reference</citetitle>. </para>  - <section id="sect-Component_Reference-richlist-Style_classes_and_skin_parameters"> - <title><sgmltag><rich:list></sgmltag></title> - <xi:include href="skinning/tabl-richlist.xml" xmlns:xi="http://www.w3.org/2001/XInclude"> + <section id="sect-Component_Reference-richcalendar-Style_classes_and_skin_parameters"> + <title><sgmltag><rich:calendar></sgmltag></title> + <xi:include href="skinning/tabl-richcalendar.xml" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Component_Ref..." xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Component_Ref..." xmlns:xi="http://www.w3.org/2001/XInclude" /> </xi:fallback> </xi:include> </section> <section id="sect-Component_Reference-richdataTable-Style_classes_and_skin_parameters"> - <title><sgmltag><rich:dataTable></sgmltag>, <sgmltag><rich:column></sgmltag>, <sgmltag><rich:columnGroup></sgmltag>, <sgmltag><rich:dataGrid></sgmltag></title> + <title><sgmltag><rich:dataTable></sgmltag></title> <xi:include href="skinning/tabl-richdataTable.xml" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Component_Ref..." xmlns:xi="http://www.w3.org/2001/XInclude" /> </xi:fallback> </xi:include> </section> + <section id="sect-Component_Reference-richcollapsibleSubTable-Style_classes_and_skin_parameters"> + <title><sgmltag><rich:collapsibleSubTable></sgmltag></title> + <xi:include href="skinning/tabl-richcollapsibleSubTable.xml" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Component_Ref..." xmlns:xi="http://www.w3.org/2001/XInclude" /> + </xi:fallback> + </xi:include> + </section> + <section id="sect-Component_Reference-richcollapsibleSubTableToggler-Style_classes_and_skin_parameters"> + <title><sgmltag><rich:collapsibleSubTableToggler></sgmltag></title> + <xi:include href="skinning/tabl-richcollapsibleSubTableToggler.xml" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Component_Ref..." xmlns:xi="http://www.w3.org/2001/XInclude" /> + </xi:fallback> + </xi:include> + </section> <section id="sect-Component_Reference-richextendedDataTable-Style_classes_and_skin_parameters"> <title><sgmltag><rich:extendedDataTable></sgmltag></title> <xi:include href="skinning/tabl-richextendedDataTable.xml" xmlns:xi="http://www.w3.org/2001/XInclude"> @@ -31,13 +47,45 @@ </xi:fallback> </xi:include> </section> - <section id="sect-Component_Reference-richcalendar-Style_classes_and_skin_parameters"> - <title><sgmltag><rich:calendar></sgmltag></title> - <xi:include href="skinning/tabl-richcalendar.xml" xmlns:xi="http://www.w3.org/2001/XInclude"> + <section id="sect-Component_Reference-richdataGrid-Style_classes_and_skin_parameters"> + <title><sgmltag><rich:dataGrid></sgmltag></title> + <xi:include href="skinning/tabl-richdataGrid.xml" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Component_Ref..." xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Component_Ref..." xmlns:xi="http://www.w3.org/2001/XInclude" /> </xi:fallback> </xi:include> </section> + <section id="sect-Component_Reference-richlist-Style_classes_and_skin_parameters"> + <title><sgmltag><rich:list></sgmltag></title> + <xi:include href="skinning/tabl-richlist.xml" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Component_Ref..." xmlns:xi="http://www.w3.org/2001/XInclude" /> + </xi:fallback> + </xi:include> + </section> + <section id="sect-Component_Reference-richdataScroller-Style_classes_and_skin_parameters"> + <title><sgmltag><rich:dataScroller></sgmltag></title> + <xi:include href="skinning/tabl-richdataScroller.xml" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Component_Ref..." xmlns:xi="http://www.w3.org/2001/XInclude" /> + </xi:fallback> + </xi:include> + </section> + <section id="sect-Component_Reference-richtree-Style_classes_and_skin_parameters"> + <title><sgmltag><rich:tree></sgmltag></title> + <xi:include href="skinning/tabl-richtree.xml" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Component_Ref..." xmlns:xi="http://www.w3.org/2001/XInclude" /> + </xi:fallback> + </xi:include> + </section> + <section id="sect-Component_Reference-richtreeNode-Style_classes_and_skin_parameters"> + <title><sgmltag><rich:treeNode></sgmltag></title> + <xi:include href="skinning/tabl-richtreeNode.xml" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Component_Ref..." xmlns:xi="http://www.w3.org/2001/XInclude" /> + </xi:fallback> + </xi:include> + </section> </appendix>

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r22126 - branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2011-03-09 13:20:11 -0500 (Wed, 09 Mar 2011) New Revision: 22126 Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java Log: RF-10685 Reviewer: Nick Belaevski Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java =================================================================== --- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java 2011-03-09 18:17:53 UTC (rev 22125) +++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java 2011-03-09 18:20:11 UTC (rev 22126) @@ -59,7 +59,6 @@ columnNumber++; } } - encodeRowEnd(writer); } public RowHolderBase createRowHolder(FacesContext context, UIComponent component, Object[] options) { Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java =================================================================== --- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2011-03-09 18:17:53 UTC (rev 22125) +++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2011-03-09 18:20:11 UTC (rev 22126) @@ -181,8 +181,26 @@ partialStart(facesContext, id); } + if (!isSubtable && !parentTbodyStart && !tbodyStart) { + encodeTableBodyStart(writer, facesContext, dataTable); + rowHolder.setRowStart(true); + tbodyStart = true; + } + child.encodeAll(facesContext); + if (!isSubtable) { + encodeRowEnd(writer); + if (!components.hasNext()) { + if (!parentTbodyStart && tbodyStart) { + encodeTableBodyEnd(writer); + tbodyStart = false; + } + } + rowHolder.setRowStart(true); + rowHolder.resetProcessCell(); + } + if (isSubtable && partialUpdate) { partialEnd(facesContext); }

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r22125 - in branches/4.0.X/ui/validator/ui/src/main: resources/META-INF/resources/org.richfaces and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2011-03-09 13:17:53 -0500 (Wed, 09 Mar 2011) New Revision: 22125 Modified: branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/renderkit/MessageRendererBase.java branches/4.0.X/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/message.js branches/4.0.X/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/msg.ecss branches/4.0.X/ui/validator/ui/src/main/templates/messages.template.xml Log: https://issues.jboss.org/browse/RF-10720 Verified by Gleb Modified: branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/renderkit/MessageRendererBase.java =================================================================== --- branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/renderkit/MessageRendererBase.java 2011-03-09 17:48:46 UTC (rev 22124) +++ branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/renderkit/MessageRendererBase.java 2011-03-09 18:17:53 UTC (rev 22125) @@ -60,9 +60,9 @@ public class MessageRendererBase extends Renderer { private static final ImmutableMap<Severity, SeverityAttributes> SEVERITY_MAP = ImmutableMap.of( - FacesMessage.SEVERITY_INFO, attrs("info", "inf", null), FacesMessage.SEVERITY_WARN, attrs("warn", "wrn", null), - FacesMessage.SEVERITY_ERROR, attrs("error", "err", null), FacesMessage.SEVERITY_FATAL, - attrs("fatal", "ftl", null)); + FacesMessage.SEVERITY_INFO, attrs("info", "inf"), FacesMessage.SEVERITY_WARN, attrs("warn", "wrn"), + FacesMessage.SEVERITY_ERROR, attrs("error", "err"), FacesMessage.SEVERITY_FATAL, + attrs("fatal", "ftl")); protected Iterator<MessageForRender> getMessages(FacesContext context, String forClientId, UIComponent component) { @@ -172,6 +172,7 @@ String detail = message.getDetail(); boolean showSummary = true; boolean showDetail = false; + boolean isMessages = false; if (component instanceof UIMessage) { UIMessage uiMessage = (UIMessage) component; showSummary = uiMessage.isShowSummary(); @@ -180,6 +181,7 @@ UIMessages uiMessages = (UIMessages) component; showSummary = uiMessages.isShowSummary(); showDetail = uiMessages.isShowDetail(); + isMessages = true; } ResponseWriter responseWriter = facesContext.getResponseWriter(); // Message id @@ -190,10 +192,10 @@ responseWriter.writeAttribute("title", summary,null); } if (!wroteTooltip && showSummary) { - writeMessageLabel(responseWriter, summary, "rf-msg-sum"); + writeMessageLabel(responseWriter, summary, isMessages ? "rf-msgs-sum" : "rf-msg-sum"); } if (showDetail) { - writeMessageLabel(responseWriter, detail, "rf-msg-det"); + writeMessageLabel(responseWriter, detail, isMessages ? "rf-msgs-det" : "rf-msg-det"); } message.rendered(); } @@ -233,6 +235,9 @@ if(Boolean.TRUE.equals(attributes.get("tooltip"))){ parametersBuilder.put("tooltip", true); } + if (component instanceof UIMessages) { + parametersBuilder.put("isMessages", true); + } messageObject.addParameter(parametersBuilder.build()); // RendererUtils.getInstance().writeScript(facesContext, component, messageObject); javaScriptService.addPageReadyScript(facesContext, messageObject); @@ -241,8 +246,12 @@ protected String getMsgClass(FacesContext facesContext, UIComponent component, Object msg) throws IOException { MessageForRender message = (MessageForRender) msg; SeverityAttributes severityAttributes = SEVERITY_MAP.get(message.getSeverity()); + + boolean isMessages = (component instanceof UIMessages); + String styleClass = - buildSeverityAttribute(component, severityAttributes.skinClass, severityAttributes.classAttribute, ' '); + buildSeverityAttribute(component, (isMessages ? severityAttributes.messagesSkinClass : severityAttributes.messageSkinClass), + severityAttributes.classAttribute, ' '); return styleClass; } @@ -250,7 +259,7 @@ MessageForRender message = (MessageForRender) msg; SeverityAttributes severityAttributes = SEVERITY_MAP.get(message.getSeverity()); String style = - buildSeverityAttribute(component, severityAttributes.skinStyle, severityAttributes.styleAttribute, ';'); + buildSeverityAttribute(component, null, severityAttributes.styleAttribute, ';'); return style; } @@ -269,29 +278,22 @@ return style.toString(); } - static SeverityAttributes attrs(String attPrefix, String skinSuffix, String skinStyle) { - SeverityAttributes attrs = - new SeverityAttributes(attPrefix + "Style", attPrefix + "Class", skinStyle, "rf-msg-" + skinSuffix, null, - null); + static SeverityAttributes attrs(String attPrefix, String skinSuffix) { + SeverityAttributes attrs = new SeverityAttributes(attPrefix, skinSuffix); return attrs; } private static final class SeverityAttributes { private final String styleAttribute; private final String classAttribute; - private final String skinStyle; - private final String skinClass; - private final String labelStyleAttribute; - private final String labelClassAttribute; + private final String messageSkinClass; + private final String messagesSkinClass; - private SeverityAttributes(String styleAttribute2, String classAttribute2, String markerStyleAttribute2, - String markerClassAttribute2, String labelStyleAttribute2, String labelClassAttribute2) { - this.styleAttribute = styleAttribute2; - this.classAttribute = classAttribute2; - this.skinStyle = markerStyleAttribute2; - this.skinClass = markerClassAttribute2; - this.labelStyleAttribute = labelStyleAttribute2; - this.labelClassAttribute = labelClassAttribute2; + private SeverityAttributes(String attPrefix, String skinSuffix) { + this.styleAttribute = attPrefix + "Style"; + this.classAttribute = attPrefix + "Class"; + this.messageSkinClass = "rf-msg-" + skinSuffix; + this.messagesSkinClass = "rf-msgs-" + skinSuffix; } } } Modified: branches/4.0.X/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/message.js =================================================================== --- branches/4.0.X/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/message.js 2011-03-09 17:48:46 UTC (rev 22124) +++ branches/4.0.X/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/message.js 2011-03-09 18:17:53 UTC (rev 22125) @@ -13,12 +13,23 @@ var $super = rf.ui.Message.$super; var defaultOptions = { - showSummary:true, - level:0 + showSummary:true, + level:0, + isMessages: false }; - var severetyClasses=["rf-msg-inf","rf-msg-wrn","rf-msg-err","rf-msg-ftl"]; + var messageSeverityClasses = ["rf-msg-inf", "rf-msg-wrn", "rf-msg-err", "rf-msg-ftl"]; + var messagesSeverityClasses = ["rf-msgs-inf", "rf-msgs-wrn", "rf-msgs-err", "rf-msgs-ftl"]; + + var messageSummaryClass = "rf-msg-sum"; + + var messagesSummaryClass = "rf-msgs-sum"; + + var messageDetailClass = "rf-msg-dtl"; + + var messagesDetailClass = "rf-msgs-dtl"; + var onMessage = function (event, element, data) { var content = $(rf.getDomElement(this.id)); var sourceId = data.sourceId; @@ -38,13 +49,15 @@ var renderMessage = function(index,message){ if(message && message.severity >= this.options.level){ + var isMessages = this.options.isMessages; + var content = $(rf.getDomElement(this.id)); - var msgContent = "<span class='"+severetyClasses[message.severity]+"' id='"+this.id+':'+index+"'"; + var msgContent = "<span class='"+(isMessages ? messagesSeverityClasses : messageSeverityClasses)[message.severity]+"' id='"+this.id+':'+index+"'"; if(message.summary){ if(this.options.tooltip){ msgContent = msgContent+" title='"+message.summary+"'>"; } else if(this.options.showSummary ){ - msgContent = msgContent + "><span class='rf-msg-sum'>"+message.summary+"</span>"; + msgContent = msgContent + "><span class='"+(isMessages ? messagesSummaryClass : messageSummaryClass)+"'>"+message.summary+"</span>"; } else { msgContent = msgContent+">"; } @@ -52,7 +65,7 @@ msgContent = msgContent+">"; } if(this.options.showDetail && message.detail){ - msgContent = msgContent + "<span class='rf-msg-dtl'>"+message.detail+"</span>"; + msgContent = msgContent + "<span class='"+(isMessages ? messagesDetailClass : messageDetailClass)+"'>"+message.detail+"</span>"; } msgContent = msgContent+"</span>" content.append(msgContent); Modified: branches/4.0.X/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/msg.ecss =================================================================== --- branches/4.0.X/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/msg.ecss 2011-03-09 17:48:46 UTC (rev 22124) +++ branches/4.0.X/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/msg.ecss 2011-03-09 18:17:53 UTC (rev 22125) @@ -1,11 +1,14 @@ /*--- RF Message styles ---*/ -.rf-msg { +.rf-msg, .rf-msgs { font-family:'#{richSkin.generalFamilyFont}';/*generalFamilyFont*/ font-size:'#{richSkin.generalSizeFont}';/*generalSizeFont*/ height:18ex; } /* all messages */ -.rf-msg-err, .rf-msg-ftl, .rf-msg-inf, .rf-msg-wrn { +.rf-msg-err, .rf-msgs-err, +.rf-msg-ftl, .rf-msgs-ftl, +.rf-msg-inf, .rf-msgs-inf, +.rf-msg-wrn, .rf-msgs-wrn { display:inline-block; padding-right:2px; padding-left:20px; @@ -14,23 +17,23 @@ background-position:left center ; } -.rf-msg-err { +.rf-msg-err, .rf-msgs-err { background-image: "url(#{resource['org.richfaces:error.png']})"; color:'#{richSkin.errorColor}'; } -.rf-msg-ftl { +.rf-msg-ftl, .rf-msgs-ftl { background-image: "url(#{resource['org.richfaces:fatal.png']})"; color:'#{richSkin.errorColor}'; } -.rf-msg-inf { +.rf-msg-inf, .rf-msgs-inf { background-image: "url(#{resource['org.richfaces:info.png']})"; color:'#{richSkin.generalTextColor}'; } -.rf-msg-wrn { +.rf-msg-wrn, .rf-msgs-wrn { background-image: "url(#{resource['org.richfaces:warning.png']})"; color:'#{richSkin.warningColor}'; } -.rf-msg-ok { +.rf-msg-ok, .rf-msgs-ok { background-image: "url(#{resource['org.richfaces:ok.png']})"; color:'#{richSkin.generalTextColor}'; width:20px; @@ -40,7 +43,8 @@ background-position:left center ; } -.rf-msg-sum{ /*Summary*/ +.rf-msg-sum, .rf-msgs-sum { /*Summary*/ } -.rf-msg-det{ /*Description*/ + +.rf-msg-det, .rf-msgs-det { /*Description*/ } Modified: branches/4.0.X/ui/validator/ui/src/main/templates/messages.template.xml =================================================================== --- branches/4.0.X/ui/validator/ui/src/main/templates/messages.template.xml 2011-03-09 17:48:46 UTC (rev 22124) +++ branches/4.0.X/ui/validator/ui/src/main/templates/messages.template.xml 2011-03-09 18:17:53 UTC (rev 22125) @@ -26,7 +26,7 @@ name="message.reslib" /> </cc:interface> <cc:implementation> - <span id="#{clientId}" class="rf-msg #{component.attributes['styleClass']}" + <span id="#{clientId}" class="rf-msgs #{component.attributes['styleClass']}" cdk:passThroughWithExclusions="id class"> <c:forEach var="msg" items="#{getVisibleMessages(facesContext,component)}">

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r22124 - in branches/4.0.X/ui/input/ui/src/main: templates and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2011-03-09 12:48:46 -0500 (Wed, 09 Mar 2011) New Revision: 22124 Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java branches/4.0.X/ui/input/ui/src/main/templates/calendar.template.xml Log: RF-10703: @styleClass of calendar is fixed. Reviewed by Pavel Yaschenko. Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java =================================================================== --- branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2011-03-09 17:11:15 UTC (rev 22123) +++ branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2011-03-09 17:48:46 UTC (rev 22124) @@ -170,6 +170,9 @@ public abstract String getStyle(); @Attribute + public abstract String getStyleClass(); + + @Attribute public abstract Object getMonthLabels(); @Attribute Modified: branches/4.0.X/ui/input/ui/src/main/templates/calendar.template.xml =================================================================== --- branches/4.0.X/ui/input/ui/src/main/templates/calendar.template.xml 2011-03-09 17:11:15 UTC (rev 22123) +++ branches/4.0.X/ui/input/ui/src/main/templates/calendar.template.xml 2011-03-09 17:48:46 UTC (rev 22124) @@ -23,7 +23,7 @@ <cdk:import package="org.richfaces.component" names="Positioning" /> </cc:interface> <cc:implementation> - <span id="#{clientId}"> + <span id="#{clientId}" class="#{component.attributes['styleClass']}"> <span id="#{clientId}Popup" style="#{component.attributes['popup'] ? 'white-space: nowrap;' : 'display: none;'}"> <c:choose>

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r22123 - modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/validator.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-03-09 12:11:15 -0500 (Wed, 09 Mar 2011) New Revision: 22123 Added: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/validator/StringHawaiiValidator.java Log: added a validator for selects Added: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/validator/StringHawaiiValidator.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/validator/StringHawaiiValidator.java (rev 0) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/validator/StringHawaiiValidator.java 2011-03-09 17:11:15 UTC (rev 22123) @@ -0,0 +1,46 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010-2011, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + *******************************************************************************/ +package org.richfaces.tests.metamer.validator; + +import javax.faces.application.FacesMessage; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.validator.FacesValidator; +import javax.faces.validator.Validator; +import javax.faces.validator.ValidatorException; + +/** + * Custom string validator that accepts only string "Hawaii". + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +@FacesValidator("org.richfaces.StringHawaiiValidator") +public class StringHawaiiValidator implements Validator { + + @Override + public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException { + if (value == null || !value.toString().equals("Hawaii")) { + throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "string is not \"Hawaii\"", "string is not \"Hawaii\"")); + } + } +}

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r22122 - in modules/tests/metamer/trunk/application/src/main: webapp/components/richInplaceInput and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-03-09 12:10:46 -0500 (Wed, 09 Mar 2011) New Revision: 22122 Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/csv.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/jsr303.xhtml Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/list.xhtml Log: added validation to rich:inplaceInput Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java 2011-03-09 17:10:11 UTC (rev 22121) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java 2011-03-09 17:10:46 UTC (rev 22122) @@ -26,6 +26,9 @@ import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; +import org.hibernate.validator.constraints.NotEmpty; import org.richfaces.component.UIInplaceInput; import org.richfaces.tests.metamer.Attributes; @@ -45,6 +48,10 @@ private static final long serialVersionUID = -1L; private static Logger logger; private Attributes attributes; + private String value1; + private String value2; + private String value3; + private String value4; /** * Initializes the managed bean. @@ -82,4 +89,39 @@ public void setAttributes(Attributes attributes) { this.attributes = attributes; } + + @NotEmpty + public String getValue1() { + return value1; + } + + public void setValue1(String value1) { + this.value1 = value1; + } + + @Pattern(regexp = "[a-z].*") + public String getValue2() { + return value2; + } + + public void setValue2(String value2) { + this.value2 = value2; + } + + @Size(min = 3, max = 6) + public String getValue3() { + return value3; + } + + public void setValue3(String value3) { + this.value3 = value3; + } + + public String getValue4() { + return value4; + } + + public void setValue4(String value4) { + this.value4 = value4; + } } Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/csv.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/csv.xhtml (rev 0) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/csv.xhtml 2011-03-09 17:10:46 UTC (rev 22122) @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> + +  + + <ui:composition template="/templates/template.xhtml"> + + <ui:define name="view"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + </ui:define> + + <ui:define name="component"> + <h:panelGrid columns="3"> + not empty + <rich:inplaceInput id="input1" + defaultLabel="#{richInplaceInputBean.attributes['defaultLabel'].value}" + value="#{richInplaceInputBean.value1}" + > + <a4j:ajax event="change" render="output1"/> + <rich:validator event="change"/> + </rich:inplaceInput> + <rich:message id="inputMsg1" for="input1"/> + + pattern [a-z].* + <rich:inplaceInput id="input2" + defaultLabel="#{richInplaceInputBean.attributes['defaultLabel'].value}" + value="#{richInplaceInputBean.value2}" + > + <a4j:ajax event="change" render="output2"/> + <rich:validator event="change"/> + </rich:inplaceInput> + <rich:message id="inputMsg2" for="input2"/> + + size 3-6 + <rich:inplaceInput id="input3" + defaultLabel="#{richInplaceInputBean.attributes['defaultLabel'].value}" + value="#{richInplaceInputBean.value3}" + > + <a4j:ajax event="change" render="output3"/> + <rich:validator event="change"/> + </rich:inplaceInput> + <rich:message id="inputMsg3" for="input3"/> + + custom (RichFaces) + <rich:inplaceInput id="input4" + defaultLabel="#{richInplaceInputBean.attributes['defaultLabel'].value}" + value="#{richInplaceInputBean.value4}" + > + <f:validator validatorId="org.richfaces.StringRichFacesValidator"/> + <a4j:ajax event="change" render="output4"/> + <rich:validator event="change"/> + </rich:inplaceInput> + <rich:message id="inputMsg4" for="input4"/> + + </h:panelGrid> + <br/><br/> + + <h:panelGrid columns="2"> + output1 + <h:outputText id="output1" value="#{richInplaceInputBean.value1}"/> + output2 + <h:outputText id="output2" value="#{richInplaceInputBean.value2}"/> + output3 + <h:outputText id="output3" value="#{richInplaceInputBean.value3}"/> + output4 + <h:outputText id="output4" value="#{richInplaceInputBean.value4}"/> + </h:panelGrid> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + </ui:define> + + </ui:composition> +</html> \ No newline at end of file Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/jsr303.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/jsr303.xhtml (rev 0) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/jsr303.xhtml 2011-03-09 17:10:46 UTC (rev 22122) @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> + +  + + <ui:composition template="/templates/template.xhtml"> + + <ui:define name="view"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + </ui:define> + + <ui:define name="component"> + <h:commandButton id="hButton" value="h:commandButton" style="margin-right: 10px;"/> + <a4j:commandButton id="a4jButton" value="a4j:commandButton"/> + <br/><br/> + + <h:panelGrid columns="3"> + not empty + <rich:inplaceInput id="input1" + defaultLabel="#{richInplaceInputBean.attributes['defaultLabel'].value}" + value="#{richInplaceInputBean.value1}" + > + <a4j:ajax event="change" render="output1"/> + </rich:inplaceInput> + <rich:message id="inputMsg1" for="input1"/> + + pattern [a-z].* + <rich:inplaceInput id="input2" + defaultLabel="#{richInplaceInputBean.attributes['defaultLabel'].value}" + value="#{richInplaceInputBean.value2}" + > + <a4j:ajax event="change" render="output2"/> + </rich:inplaceInput> + <rich:message id="inputMsg2" for="input2"/> + + size 3-6 + <rich:inplaceInput id="input3" + defaultLabel="#{richInplaceInputBean.attributes['defaultLabel'].value}" + value="#{richInplaceInputBean.value3}" + > + <a4j:ajax event="change" render="output3"/> + </rich:inplaceInput> + <rich:message id="inputMsg3" for="input3"/> + + custom (RichFaces) + <rich:inplaceInput id="input4" + defaultLabel="#{richInplaceInputBean.attributes['defaultLabel'].value}" + value="#{richInplaceInputBean.value4}" + > + <f:validator validatorId="org.richfaces.StringRichFacesValidator"/> + <a4j:ajax event="change" render="output4"/> + </rich:inplaceInput> + <rich:message id="inputMsg4" for="input4"/> + + </h:panelGrid> + <br/><br/> + + <h:panelGrid columns="2"> + output1 + <h:outputText id="output1" value="#{richInplaceInputBean.value1}"/> + output2 + <h:outputText id="output2" value="#{richInplaceInputBean.value2}"/> + output3 + <h:outputText id="output3" value="#{richInplaceInputBean.value3}"/> + output4 + <h:outputText id="output4" value="#{richInplaceInputBean.value4}"/> + </h:panelGrid> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + </ui:define> + + </ui:composition> +</html> \ No newline at end of file Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/list.xhtml 2011-03-09 17:10:11 UTC (rev 22121) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/list.xhtml 2011-03-09 17:10:46 UTC (rev 22122) @@ -39,6 +39,14 @@ Simple page that contains <b>rich:inplaceInput</b> with f:ajax and input boxes for all its attributes. </metamer:testPageLink> + <metamer:testPageLink id="csv" outcome="csv" value="Client Side Validation"> + Simple page that contains 4 <b>rich:inplaceInput</b>s testing client-side validation. + </metamer:testPageLink> + + <metamer:testPageLink id="jsr303" outcome="jsr303" value="JSR-303 Bean Validation"> + Page containing 4 <b>rich:inplaceInput</b>s with various JSR-303 validators. + </metamer:testPageLink> + </ui:define> </ui:composition>

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r22121 - in modules/tests/metamer/trunk/application/src/main/webapp/components: richValidator and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-03-09 12:10:11 -0500 (Wed, 09 Mar 2011) New Revision: 22121 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richValidator/csv.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richValidator/jsr303.xhtml Log: small fixes Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/list.xhtml 2011-03-09 17:09:46 UTC (rev 22120) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/list.xhtml 2011-03-09 17:10:11 UTC (rev 22121) @@ -43,7 +43,7 @@ Page containing <b>rich:calendar</b> with data model and inputs for all its attributes. </metamer:testPageLink> - <metamer:testPageLink id="csv" outcome="csv" value="Client Side Validation"> + <metamer:testPageLink id="csv" outcome="csv" value="Client Side Validation"> Simple page that contains 3 <b>rich:calendar</b>s testing client-side validation. </metamer:testPageLink> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richValidator/csv.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richValidator/csv.xhtml 2011-03-09 17:09:46 UTC (rev 22120) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richValidator/csv.xhtml 2011-03-09 17:10:11 UTC (rev 22121) @@ -37,7 +37,12 @@ </ui:define> <ui:define name="head"> - + <style type="text/css"> + .rf-msg-err { + display: block !important; + margin-bottom: 6px; + } + </style> </ui:define> <ui:define name="component"> @@ -329,7 +334,7 @@ <a4j:commandButton id="a4jButton" value="a4j:commandButton"/> <br/> - <rich:messages/> + <rich:messages id="msgs"/> </ui:define> <ui:define name="outOfTemplateAfter"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richValidator/jsr303.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richValidator/jsr303.xhtml 2011-03-09 17:09:46 UTC (rev 22120) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richValidator/jsr303.xhtml 2011-03-09 17:10:11 UTC (rev 22121) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich" - xmlns:metamer="http://java.sun.com/jsf/composite/metamer"> + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> <!-- JBoss, Home of Professional Open Source @@ -37,7 +36,12 @@ </ui:define> <ui:define name="head"> - + <style type="text/css"> + .rf-msg-err { + display: block !important; + margin-bottom: 6px; + } + </style> </ui:define> <ui:define name="component"> @@ -176,7 +180,7 @@ <a4j:commandButton id="a4jButton" value="a4j:commandButton"/> <br/> - <rich:messages/> + <rich:messages id="msgs"/> </ui:define> <ui:define name="outOfTemplateAfter">

15 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r22120 - modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-03-09 12:09:46 -0500 (Wed, 09 Mar 2011) New Revision: 22120 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/list.xhtml Log: list of pages for rich:calendar fixed Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/list.xhtml 2011-03-09 17:09:25 UTC (rev 22119) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/list.xhtml 2011-03-09 17:09:46 UTC (rev 22120) @@ -43,6 +43,14 @@ Page containing <b>rich:calendar</b> with data model and inputs for all its attributes. </metamer:testPageLink> + <metamer:testPageLink id="csv" outcome="csv" value="Client Side Validation"> + Simple page that contains 3 <b>rich:calendar</b>s testing client-side validation. + </metamer:testPageLink> + + <metamer:testPageLink id="jsr303" outcome="jsr303" value="JSR-303 Bean Validation"> + Page containing 3 <b>rich:calendar</b>s with various JSR-303 validators. + </metamer:testPageLink> + </ui:define> </ui:composition>

15 years, 1 month

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits March 2011