Author: alexsmirnov Date: 2011-03-10 15:49:40 -0500 (Thu, 10 Mar 2011) New Revision: 22149 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/msg.ecss Log: CODING IN PROGRESS - issue RF-10370: messages: encoded as single line https://issues.jboss.org/browse/RF-10370 sent to review by Ilya Shaikovsky 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-10 17:42:31 UTC (rev 22148) +++ branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/renderkit/MessageRendererBase.java 2011-03-10 20:49:40 UTC (rev 22149) @@ -187,7 +187,7 @@ // Message id responseWriter.writeAttribute("id", component.getClientId()+':'+message.getSourceId(),null); // tooltip - boolean wroteTooltip = Boolean.TRUE.equals(component.getAttributes().get("tooltip")); + boolean wroteTooltip = RendererUtils.getInstance().isBooleanAttribute(component, "tooltip"); if(wroteTooltip && !Strings.isNullOrEmpty(summary)){ responseWriter.writeAttribute("title", summary,null); } @@ -215,8 +215,9 @@ Map<String, Object> attributes = component.getAttributes(); Builder<String, Object> parametersBuilder = ImmutableMap.builder(); String forId = (String) attributes.get("for"); + RendererUtils rendererUtils = RendererUtils.getInstance(); if (!Strings.isNullOrEmpty(forId)) { - UIComponent target = RendererUtils.getInstance().findComponentFor(component, forId); + UIComponent target = rendererUtils.findComponentFor(component, forId); if (null != target) { parametersBuilder.put("forComponentId", target.getClientId(facesContext)); @@ -226,13 +227,13 @@ if(FacesMessage.SEVERITY_INFO != level){ parametersBuilder.put("level", level.getOrdinal()); } - if(!Boolean.TRUE.equals(attributes.get("showSummary"))){ + if(!rendererUtils.isBooleanAttribute(component, "showSummary")){ parametersBuilder.put("showSummary", false); } - if(Boolean.TRUE.equals(attributes.get("showDetail"))){ + if(rendererUtils.isBooleanAttribute(component, "showDetail")){ parametersBuilder.put("showDetail", true); } - if(Boolean.TRUE.equals(attributes.get("tooltip"))){ + if(rendererUtils.isBooleanAttribute(component, "tooltip")){ parametersBuilder.put("tooltip", true); } if (component instanceof UIMessages) { 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-10 17:42:31 UTC (rev 22148) +++ branches/4.0.X/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/msg.ecss 2011-03-10 20:49:40 UTC (rev 22149) @@ -8,8 +8,9 @@ .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; +.rf-msg-wrn, .rf-msgs-wrn, +.rf-msg-ok, .rf-msgs-ok { + display:block; padding-right:2px; padding-left:20px; vertical-align:middle; @@ -36,15 +37,12 @@ .rf-msg-ok, .rf-msgs-ok { background-image: "url(#{resource['org.richfaces:ok.png']})"; color:'#{richSkin.generalTextColor}'; - width:20px; - display:inline-block; - vertical-align:middle; - background-repeat:no-repeat; - background-position:left center ; } .rf-msg-sum, .rf-msgs-sum { /*Summary*/ + display:inline; } .rf-msg-det, .rf-msgs-det { /*Description*/ + display:inline; }