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

[Christian Bauer]

  User: cbauer  
  Date: 07/08/30 12:51:01

  Modified:    examples/wiki/view/includes  commentsDisplay.xhtml
  Log:
  Finished Blosxom importer (not perfect though) and minor bugfixes
  
  Revision  Changes    Path
  1.9       +8 -2      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.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- commentsDisplay.xhtml	25 Aug 2007 17:59:24 -0000	1.8
  +++ commentsDisplay.xhtml	30 Aug 2007 16:51:01 -0000	1.9
  @@ -21,7 +21,7 @@
               </f:facet>
   
               <div class="commentSubject">
  -                #{c.subject}
  +                <h:outputText value="#{c.subject}" rendered="#{documentHome.instance.name != c.subject}"/>
               </div>
   
               <div class="commentAuthorDate">
  @@ -41,9 +41,15 @@
                   </s:span>
               </div>
   
  -            <s:div styleClass="commentText">
  +            <s:div styleClass="commentText" rendered="#{c.useWikiText}">
                   <s:formattedText value="#{c.text}"/>
               </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"/>
  +            </s:div>
  +            <s:div styleClass="commentText" rendered="#{not c.useWikiText and documentHome.instance.name == c.subject}">
  +                <h:outputText value="#{wiki:escapeHTML(c.text, true)}" escape="false"/>
  +            </s:div>
   
               <div align="right">
                   <h:form rendered="#{s:hasPermission('Comment', 'delete', documentHome.instance)}">