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

[Christian Bauer]

  User: cbauer  
  Date: 07/04/20 05:10:12

  Modified:    examples/wiki/view  docHistory.xhtml
  Log:
  Finished document history and diff feature
  
  Revision  Changes    Path
  1.6       +10 -20    jboss-seam/examples/wiki/view/docHistory.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: docHistory.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docHistory.xhtml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- docHistory.xhtml	2 Apr 2007 18:25:04 -0000	1.5
  +++ docHistory.xhtml	20 Apr 2007 09:10:12 -0000	1.6
  @@ -36,13 +36,13 @@
   <ui:define name="content">
   
   <h:form rendered="#{historicalNodeList.rowCount >0}">
  -<div class="form">
   
  -    <div class="formHead">Document History: #{currentNode.name}</div>
  -    <div class="formFieldsWideLabels">
  +<div class="form">
  +<div class="formHead">Document History: #{currentNode.name}</div>
  +<div class="formFields formBorder wideLabels">
   
           <s:div styleClass="entry">
  -            <div class="label">Revision:</div>
  +            <div class="label">Current revision:</div>
               <div class="output">
                   <h:outputText value="#{currentNode.revision}"/>
               </div>
  @@ -84,8 +84,7 @@
                                styleClass="datatable topLeftBottomBorder"
                                headerClass="sortableHeader rightBorder"
                                columnClasses="onePercentColumn rightBorder alignCenter,
  -                                            tenPercentColumn rightBorder alignLeft,
  -                                            tenPercentColumn rightBorder alignLeft,
  +                                            twentyPercentColumn rightBorder alignLeft,
                                               defaultColumn rightBorder alignCenter"
                                rowClasses="rowOdd,rowEven"
                                cellpadding="0" cellspacing="0" border="0">
  @@ -96,15 +95,11 @@
                       </h:column>
   
                       <h:column>
  -                        <f:facet name="header">Last Modified On</f:facet>
  +                        <f:facet name="header">Last Modified</f:facet>
                           <h:outputText value="#{hnode.lastModifiedOn}">
                               <f:convertDateTime type="both"/>
                           </h:outputText>
  -                    </h:column>
  -
  -                    <h:column>
  -                        <f:facet name="header">Last Modified By</f:facet>
  -                        <h:outputText value="#{hnode.lastModifiedByUsername}"/>
  +                        (#{hnode.lastModifiedByUsername})
                       </h:column>
   
                       <h:column>
  @@ -127,14 +122,9 @@
   </div>
   </h:form>
   
  -    <s:div id="diffOutput" rendered="#{not empty nodeHistory.diffResult}">
  -        <wiki:formattedText value="#{nodeHistory.diffResult}"
  -                            linkStyleClass="regularLink"
  -                            brokenLinkStyleClass="brokenLink"
  -                            attachmentLinkStyleClass="regularLink"
  -                            inlineLinkStyleClass="regularLink"/>
  -    </s:div>
  -
  +<s:div id="diffOutput" rendered="#{not empty nodeHistory.diffResult}">
  +    <h:outputText value="#{nodeHistory.diffResult}" escape="false"/>
  +</s:div>
   
   </ui:define>