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)}">