Author: abelevich Date: 2007-09-04 07:29:23 -0400 (Tue, 04 Sep 2007) New Revision: 2729 Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java trunk/ui/message/src/main/resources/org/richfaces/renderkit/html/css/msg.css trunk/ui/message/src/main/resources/org/richfaces/renderkit/html/css/msgs.css Log: fix RF-790 Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java =================================================================== --- trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-09-04 08:16:09 UTC (rev 2728) +++ trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-09-04 11:29:23 UTC (rev 2729) @@ -178,12 +178,8 @@ labelClass = labelClass == null ? "rich-messages-label" : "rich-messages-label " + labelClass; - if(isWroteTable){ - writer.startElement(HTML.td_ELEM,uiMessages); - }else{ - writer.startElement(HTML.SPAN_ELEM, uiMessages); - } - + writer.startElement(HTML.SPAN_ELEM, uiMessages); + getUtils().writeAttribute(writer, HTML.class_ATTRIBUTE,labelClass); getUtils().writeAttribute(writer, HTML.style_ATTRIBUTE, labelStyle); @@ -219,11 +215,8 @@ } - if(isWroteTable){ - writer.endElement(HTML.td_ELEM); - }else{ - writer.endElement(HTML.SPAN_ELEM); - } + writer.endElement(HTML.SPAN_ELEM); + } public void renderMarkerHtml(UIComponent component, UIComponent markerFacet, FacesContext context, @@ -237,24 +230,16 @@ uiMessages = (UIRichMessages)component; - if(isWroteTable){ - writer.startElement(HTML.td_ELEM, uiMessages); - }else{ - writer.startElement(HTML.SPAN_ELEM, uiMessages); - } - + writer.startElement(HTML.SPAN_ELEM, uiMessages); + String classes = markerClass == null ? "rich-messages-marker" : "rich-messages-marker " + markerClass; getUtils().writeAttribute(writer, HTML.class_ATTRIBUTE, classes); getUtils().writeAttribute(writer, HTML.style_ATTRIBUTE, markerStyle); renderChild(context, markerFacet); - if(isWroteTable){ - writer.endElement(HTML.td_ELEM); - }else{ - writer.endElement(HTML.SPAN_ELEM); - } - + writer.endElement(HTML.SPAN_ELEM); + } public void renderComponentOuterStyles(UIComponent component, FacesContext context, ResponseWriter writer) throws IOException { @@ -296,6 +281,7 @@ if(isWroteTable){ writer.startElement(HTML.TR_ELEMENT, uiMessages); + writer.startElement(HTML.td_ELEM, uiMessages); }else{ writer.startElement("dt", uiMessages); } @@ -305,6 +291,7 @@ renderLabel(uiMessages, context, writer, facesMsg); if(isWroteTable){ + writer.endElement(HTML.td_ELEM); writer.endElement(HTML.TR_ELEMENT); }else{ writer.endElement("dt"); Modified: trunk/ui/message/src/main/resources/org/richfaces/renderkit/html/css/msg.css =================================================================== --- trunk/ui/message/src/main/resources/org/richfaces/renderkit/html/css/msg.css 2007-09-04 08:16:09 UTC (rev 2728) +++ trunk/ui/message/src/main/resources/org/richfaces/renderkit/html/css/msg.css 2007-09-04 11:29:23 UTC (rev 2729) @@ -7,8 +7,11 @@ .rich-message-label{ } -.rich-message-marker *{ - vertical-align: middle; +SPAN.rich-message-marker, SPAN.rich-message-marker * { + vertical-align: text-bottom; } +span.rich-message-marker, span.rich-message-marker * { + vertical-align: text-bottom; +} Modified: trunk/ui/message/src/main/resources/org/richfaces/renderkit/html/css/msgs.css =================================================================== --- trunk/ui/message/src/main/resources/org/richfaces/renderkit/html/css/msgs.css 2007-09-04 08:16:09 UTC (rev 2728) +++ trunk/ui/message/src/main/resources/org/richfaces/renderkit/html/css/msgs.css 2007-09-04 11:29:23 UTC (rev 2729) @@ -10,6 +10,10 @@ .rich-messages-header{ } -SPAN.rich-messages-marker, SPAN.rich-messages-marker *{ - vertical-align: middle; +SPAN.rich-messages-marker, SPAN.rich-messages-marker * { + vertical-align: text-bottom; } + +span.rich-messages-marker, span.rich-messages-marker * { + vertical-align: text-bottom; +}