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

[Christian Bauer]

  User: cbauer  
  Date: 07/09/06 11:54:28

  Modified:    examples/wiki/view   docHistory_d.xhtml docDisplay_d.xhtml
  Log:
  Creator/history footer on documents
  
  Revision  Changes    Path
  1.2       +3 -4      jboss-seam/examples/wiki/view/docHistory_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: docHistory_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docHistory_d.xhtml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- docHistory_d.xhtml	4 Sep 2007 09:33:18 -0000	1.1
  +++ docHistory_d.xhtml	6 Sep 2007 15:54:28 -0000	1.2
  @@ -89,10 +89,9 @@
                                          action="#{nodeHistory.displayHistoricalRevision}"
                                          reRender="messageBoxContainer, diffResult, historicalPreview"
                                          tabindex="3" styleClass="buttonNonpersistent"><span class="buttonLabel">Show</span></a:commandLink>
  -                        <a:commandLink id="diff"
  -                                       action="#{nodeHistory.diff}"
  -                                       reRender="messageBoxContainer, diffResult, historicalPreview"
  -                                       tabindex="3" styleClass="buttonNonpersistent"><span class="buttonLabel">Diff</span></a:commandLink>
  +                        <s:link id="diff" action="#{nodeHistory.diff}" tabindex="3" styleClass="buttonNonpersistent"><span class="buttonLabel">Diff</span>
  +                            <f:param name="historicalNodeId" value="#{hnode.historyId}"/>
  +                        </s:link>
                           <h:commandLink id="rollback"
                                          action="#{nodeHistory.rollback}"
                                          tabindex="4" styleClass="buttonNonpersistent"
  
  
  
  1.2       +52 -0     jboss-seam/examples/wiki/view/docDisplay_d.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: docDisplay_d.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docDisplay_d.xhtml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- docDisplay_d.xhtml	4 Sep 2007 09:33:18 -0000	1.1
  +++ docDisplay_d.xhtml	6 Sep 2007 15:54:28 -0000	1.2
  @@ -47,6 +47,58 @@
                                   renderBaseDirectory="#{documentHome.parentDirectory}"
                                   enablePlugins="true"/>
           </s:div>
  +        <s:div rendered="#{wikiPreferences.showDocumentCreatorHistory and not documentHome.instance.pluginsUsed.contains('hideCreatorHistory')}"
  +               styleClass="documentCreatorHistory undecoratedLink">
  +            <s:div>
  +                Created:&#160;
  +                <h:outputText value="#{documentHome.instance.createdOn}">
  +                    <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                </h:outputText>
  +                <h:outputText value="&#160;#{wikiPreferences.timeZone}&#160;("/>
  +                <h:outputLink value="#{wiki:renderHomeURL(documentHome.instance.createdBy)}"
  +                              rendered="#{!empty documentHome.instance.createdBy.memberHome}">
  +                    <h:outputText value="#{documentHome.instance.createdBy.fullname}"/>
  +                </h:outputLink>
  +                <h:outputText rendered="#{empty documentHome.instance.createdBy.memberHome}"
  +                              value="#{documentHome.instance.createdBy.fullname}"/>
  +                <h:outputText value=")"/>
  +            </s:div>
  +            <s:div rendered="#{not empty documentHome.instance.lastModifiedBy}">
  +                Last Modified:&#160;
  +                <h:outputText value="#{documentHome.instance.lastModifiedOn}">
  +                    <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                </h:outputText>
  +                <h:outputText value="&#160;#{wikiPreferences.timeZone}&#160;("/>
  +                <h:outputLink value="#{wiki:renderHomeURL(documentHome.instance.lastModifiedBy)}"
  +                              rendered="#{!empty documentHome.instance.lastModifiedBy.memberHome}">
  +                    <h:outputText value="#{documentHome.instance.lastModifiedBy.fullname}"/>
  +                </h:outputLink>
  +                <h:outputText rendered="#{empty documentHome.instance.lastModifiedBy.memberHome}"
  +                              value="#{documentHome.instance.lastModifiedBy.fullname}"/>
  +                <h:outputText value=")"/>
  +            </s:div>
  +            <s:div rendered="#{documentHome.historicalNodesPresent}">
  +                Revisions:&#160;
  +                <ui:repeat var="hnode" value="#{documentHome.historicalNodes}">
  +
  +                    <h:outputText value="#{hnode.lastModifiedOn}">
  +                        <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
  +                    </h:outputText>
  +                    <h:outputText value="&#160;#{wikiPreferences.timeZone}&#160;(#{hnode.lastModifiedByUsername})"/>
  +
  +                    &#160;
  +                    <s:link view="/docHistory_#{skin}.xhtml" action="#{nodeHistory.diff}">Diff
  +                        <f:param name="nodeId" value="#{documentHome.instance.id}"/>
  +                        <f:param name="historicalNodeId" value="#{hnode.historyId}"/>
  +                    </s:link>
  +
  +                    <h:outputText rendered="#{documentHome.historicalNodes.indexOf(hnode) &lt; documentHome.historicalNodes.size()-1}"
  +                                  value="&#160;|&#160;"/>
  +
  +                </ui:repeat>
  +            </s:div>
  +
  +        </s:div>
       </div>
   
       <ui:include src="includes/attachmentDisplay.xhtml"/>