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

Christian Bauer christian at hibernate.org
Sun Sep 2 10:54:31 EDT 2007


  User: cbauer  
  Date: 07/09/02 10:54:31

  Modified:    examples/wiki/view          adminHome.xhtml docHistory.xhtml
                        search.xhtml fileEdit.xhtml userList.xhtml
                        dirEdit.xhtml userRegister.xhtml userHome.xhtml
                        dirDisplay.xhtml
  Log:
  New diff and improvements to history function
  
  Revision  Changes    Path
  1.12      +1 -1      jboss-seam/examples/wiki/view/adminHome.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: adminHome.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/adminHome.xhtml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- adminHome.xhtml	1 Sep 2007 08:42:47 -0000	1.11
  +++ adminHome.xhtml	2 Sep 2007 14:54:31 -0000	1.12
  @@ -52,7 +52,7 @@
       }
   </script>
   
  -<h:form id="adminForm">
  +<h:form id="adminForm" styleClass="box">
       <div class="form">
   
           <ui:include src="includes/statusIndicator.xhtml"/>
  
  
  
  1.13      +35 -15    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.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- docHistory.xhtml	2 Sep 2007 09:39:43 -0000	1.12
  +++ docHistory.xhtml	2 Sep 2007 14:54:31 -0000	1.13
  @@ -19,43 +19,43 @@
   
   <ui:define name="content">
   
  -<h:form rendered="#{historicalNodeList.rowCount >0}">
  +<h:form rendered="#{historicalNodeList.rowCount >0}" styleClass="box">
   
   <div class="form">
  -    <div class="formHead">Document History: #{currentNode.name}</div>
  -    <div class="formFields formBorder wideLabels">
  +    <div class="formHead">Document History: #{nodeHistory.currentNode.name}</div>
  +    <div class="formFields formBorder">
   
           <s:div styleClass="entry">
               <div class="label">Current revision:</div>
               <div class="output">
  -                <h:outputText value="#{currentNode.revision}"/>
  +                <h:outputText value="#{nodeHistory.currentNode.revision}"/>
               </div>
           </s:div>
   
           <s:div styleClass="entry">
               <div class="label">Parent:</div>
               <div class="output">
  -                <h:outputText value="#{currentNode.parent.name}"/>
  +                <h:outputText value="#{nodeHistory.currentNode.parent.name}"/>
               </div>
           </s:div>
   
           <s:div styleClass="entry">
               <div class="label">Created On:</div>
               <div class="output">
  -                <h:outputText value="#{currentNode.createdOn}">
  +                <h:outputText value="#{nodeHistory.currentNode.createdOn}">
                       <f:convertDateTime type="both" timeZone="#{wikiPreferences.timeZone}"/>
                   </h:outputText>
  -                (#{currentNode.createdBy.username})
  +                (#{nodeHistory.currentNode.createdBy.username})
               </div>
           </s:div>
   
  -        <s:div styleClass="entry" rendered="#{!empty currentNode.lastModifiedBy}">
  +        <s:div styleClass="entry" rendered="#{!empty nodeHistory.currentNode.lastModifiedBy}">
               <div class="label">Last Modified On:</div>
               <div class="output">
  -                <h:outputText value="#{currentNode.lastModifiedOn}">
  +                <h:outputText value="#{nodeHistory.currentNode.lastModifiedOn}">
                       <f:convertDateTime type="both" timeZone="#{wikiPreferences.timeZone}"/>
                   </h:outputText>
  -                (#{currentNode.lastModifiedBy.username})
  +                (#{nodeHistory.currentNode.lastModifiedBy.username})
               </div>
           </s:div>
   
  @@ -96,7 +96,7 @@
                           <h:commandLink id="rollback"
                                          action="#{nodeHistory.rollback}"
                                          tabindex="4" styleClass="buttonNonpersistent"
  -                                       rendered="#{s:hasPermission('Node', 'edit', currentNode)}"><span class="buttonLabel">Rollback</span></h:commandLink>
  +                                       rendered="#{s:hasPermission('Node', 'edit', nodeHistory.currentNode)}"><span class="buttonLabel">Rollback</span></h:commandLink>
                       </h:column>
   
                   </h:dataTable>
  @@ -105,11 +105,31 @@
           </s:div>
   
       </div>
  +
  +    <s:fragment rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}">
  +        <div class="formControls">
  +            <div class="entry">
  +                <div class="label">&#160;</div>
  +                <div class="input">
  +
  +                    <h:commandLink id="purge" action="#{nodeHistory.purgeHistory}"
  +                               tabindex="4" accesskey="U" styleClass="button"><span class="buttonLabel">P<u>u</u>rge History</span></h:commandLink>
  +    
  +                </div>
  +            </div>
  +        </div>
  +    </s:fragment>
  +
   </div>
   </h:form>
   
  +<br/>
  +
   <s:div id="diffResult">
  -    <s:div styleClass="diffOutput" rendered="#{not empty nodeHistory.diffResult}">
  +    <s:div styleClass="box diffOutput" rendered="#{not empty nodeHistory.diffResult}">
  +        <script type="text/javascript">jQuery(function() {
  +            wrapBoxes();
  +        });</script>
           <h:outputText value="#{nodeHistory.diffResult}" escape="false"/>
       </s:div>
   </s:div>
  @@ -127,9 +147,9 @@
                                   brokenLinkStyleClass="brokenLink"
                                   attachmentLinkStyleClass="regularLink"
                                   thumbnailLinkStyleClass="regularLink"
  -                                renderBaseDocument="#{currentNode}"
  -                                renderBaseDirectory="#{currentNode.parent}"
  -                                enablePlugins="true"/>
  +                                renderBaseDocument="#{nodeHistory.currentNode}"
  +                                renderBaseDirectory="#{nodeHistory.currentNode.parent}"
  +                                enablePlugins="false"/>
           </s:div>
       </s:div>
   </s:div>
  
  
  
  1.7       +1 -1      jboss-seam/examples/wiki/view/search.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: search.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/search.xhtml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- search.xhtml	31 Aug 2007 15:18:26 -0000	1.6
  +++ search.xhtml	2 Sep 2007 14:54:31 -0000	1.7
  @@ -20,7 +20,7 @@
   
   <ui:define name="content">
   
  -    <h:form id="searchForm">
  +    <h:form id="searchForm" styleClass="box">
           <s:div styleClass="form" id="searchControl">
   
               <ui:include src="includes/statusIndicator.xhtml"/>
  
  
  
  1.23      +1 -1      jboss-seam/examples/wiki/view/fileEdit.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: fileEdit.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/fileEdit.xhtml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- fileEdit.xhtml	31 Aug 2007 15:18:26 -0000	1.22
  +++ fileEdit.xhtml	2 Sep 2007 14:54:31 -0000	1.23
  @@ -41,7 +41,7 @@
           </ui:include>
       </s:span>
   
  -    <h:form id="fileEditForm" enctype="multipart/form-data">
  +    <h:form id="fileEditForm" styleClass="box" enctype="multipart/form-data">
           <div class="form">
   
               <ui:include src="includes/statusIndicator.xhtml"/>
  
  
  
  1.22      +2 -3      jboss-seam/examples/wiki/view/userList.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: userList.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userList.xhtml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- userList.xhtml	2 Sep 2007 09:39:43 -0000	1.21
  +++ userList.xhtml	2 Sep 2007 14:54:31 -0000	1.22
  @@ -22,7 +22,7 @@
   
   <ui:define name="content">
   
  -    <h:form id="userSearchForm">
  +    <h:form id="userSearchForm" styleClass="box">
   
           <div class="form" id="userSearchControl">
   
  @@ -32,7 +32,7 @@
                            styleClass="datatable topLeftBottomBorder"
                            headerClass="regularHeader rightBorder"
                            columnClasses="tenPercentColumn formFields, tenPercentColumn formFields, tenPercentColumn formFields,
  -                                        tenPercentColumn formFields, twentyPercentColumn alignRight formFields,
  +                                        tenPercentColumn formFields, twentyPercentColumn alignLeft formFields,
                                           defaultColumn alignRight formFields rightBorder"
                            cellpadding="0" cellspacing="0" border="0">
   
  @@ -204,7 +204,6 @@
   
           </h:dataTable>
   
  -
       </h:form>
   
   </ui:define>
  
  
  
  1.31      +1 -1      jboss-seam/examples/wiki/view/dirEdit.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: dirEdit.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirEdit.xhtml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- dirEdit.xhtml	31 Aug 2007 15:18:26 -0000	1.30
  +++ dirEdit.xhtml	2 Sep 2007 14:54:31 -0000	1.31
  @@ -40,7 +40,7 @@
   </s:span>
   
   
  -<h:form id="directoryEditForm">
  +<h:form id="directoryEditForm" styleClass="box">
   <div class="form">
   
   <ui:include src="includes/statusIndicator.xhtml"/>
  
  
  
  1.10      +1 -1      jboss-seam/examples/wiki/view/userRegister.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: userRegister.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userRegister.xhtml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- userRegister.xhtml	31 Aug 2007 15:18:26 -0000	1.9
  +++ userRegister.xhtml	2 Sep 2007 14:54:31 -0000	1.10
  @@ -19,7 +19,7 @@
   
   <ui:define name="content">
   
  -<h:form id="userRegisterForm">
  +<h:form id="userRegisterForm" styleClass="box">
       <div class="form">
   
           <ui:include src="includes/statusIndicator.xhtml"/>
  
  
  
  1.16      +1 -1      jboss-seam/examples/wiki/view/userHome.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: userHome.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userHome.xhtml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- userHome.xhtml	2 Sep 2007 09:39:43 -0000	1.15
  +++ userHome.xhtml	2 Sep 2007 14:54:31 -0000	1.16
  @@ -28,7 +28,7 @@
       </ui:include>
   </s:span>
   
  -<h:form id="userHomeForm" enctype="multipart/form-data">
  +<h:form id="userHomeForm" styleClass="box" enctype="multipart/form-data">
       <div class="form">
   
           <ui:include src="includes/statusIndicator.xhtml"/>
  
  
  
  1.24      +2 -0      jboss-seam/examples/wiki/view/dirDisplay.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: dirDisplay.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirDisplay.xhtml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -b -r1.23 -r1.24
  --- dirDisplay.xhtml	30 Aug 2007 16:51:01 -0000	1.23
  +++ dirDisplay.xhtml	2 Sep 2007 14:54:31 -0000	1.24
  @@ -57,6 +57,7 @@
   </ui:define>
   
   <ui:define name="content">
  +<div class="box">
   
       <div class="directoryPathPanel">
   
  @@ -201,6 +202,7 @@
   
       </h:dataTable>
   
  +</div>
   </ui:define>
   
   <ui:define name="footer">&#160;</ui:define>
  
  
  



More information about the jboss-cvs-commits mailing list