[jboss-cvs] jboss-seam/examples/wiki/view/includes ...

[Christian Bauer]

  User: cbauer  
  Date: 07/09/09 05:58:00

  Modified:    examples/wiki/view/includes  commentsDisplay.xhtml
  Log:
  Comments rendered as Wiki text not plain Seam text
  
  Revision  Changes    Path
  1.11      +60 -48    jboss-seam/examples/wiki/view/includes/commentsDisplay.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: commentsDisplay.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/commentsDisplay.xhtml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- commentsDisplay.xhtml	1 Sep 2007 08:42:48 -0000	1.10
  +++ commentsDisplay.xhtml	9 Sep 2007 09:58:00 -0000	1.11
  @@ -4,21 +4,25 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:a="https://ajax4jsf.dev.java.net/ajax"
  +     xmlns:wiki="http://jboss.com/products/seam/wiki"
  +     xmlns:c="http://java.sun.com/jstl/core"
        xmlns:s="http://jboss.com/products/seam/taglib">
   
   <s:div styleClass="box" style="margin-top:25px"
        rendered="#{not empty commentHome.comments and documentHome.instance.enableComments}">
   
  -    <h:dataTable value="#{commentHome.comments}" var="c"
  +    <h:panelGrid columns="1"
                    styleClass="datatable rightBorder leftBorder topBorder bottomBorder"
  -                 headerClass="regularHeader alignLeft"
  -                 columnClasses="commentColumn"
  -                 rowClasses="rowOdd,rowEven"
  +                 columnClasses="commentColumn" rowClasses="rowOdd, rowEven"
                    cellpadding="0" cellspacing="0" border="0">
  -        <h:column>
               <f:facet name="header">
  -                #{wiki:sizeOf(commentHome.comments)} comment(s):
  +            <s:div styleClass="regularHeader alignLeft">
  +                <h:outputText value="#{wiki:sizeOf(commentHome.comments)}&#160;comment:" rendered="#{wiki:sizeOf(commentHome.comments) == 1}"/>
  +                <h:outputText value="#{wiki:sizeOf(commentHome.comments)}&#160;comments:" rendered="#{wiki:sizeOf(commentHome.comments) > 1}"/>
  +            </s:div>
               </f:facet>
  +        <c:forEach var="c" items="#{commentHome.comments}">
  +            <s:span>
   
               <div class="commentSubject">
                   <h:outputText value="#{c.subject}" rendered="#{documentHome.instance.name != c.subject}"/>
  @@ -42,7 +46,14 @@
               </div>
   
               <s:div styleClass="commentText" rendered="#{c.useWikiText}">
  -                <s:formattedText value="#{c.text}"/>
  +                    <wiki:formattedText value="#{c.text}"
  +                                        linkStyleClass="regularLink"
  +                                        brokenLinkStyleClass="brokenLink"
  +                                        attachmentLinkStyleClass="regularLink"
  +                                        thumbnailLinkStyleClass="regularLink"
  +                                        renderBaseDocument="#{documentHome.instance}"
  +                                        renderBaseDirectory="#{documentHome.parentDirectory}"
  +                                        enablePlugins="false"/>
               </s:div>
               <s:div styleClass="commentText" rendered="#{not c.useWikiText and documentHome.instance.name != c.subject}" style="margin-top:15px;">
                   <h:outputText value="#{wiki:escapeHTML(c.text, true)}" escape="false"/>
  @@ -58,8 +69,9 @@
                   </h:form>
               </div>
   
  -        </h:column>
  -    </h:dataTable>
  +            </s:span>
  +        </c:forEach>
  +    </h:panelGrid>
   
   </s:div>
   </s:span>