[jboss-cvs] jboss-seam/examples/wiki/view ...
Christian Bauer
christian at hibernate.org
Sun Sep 2 05:39:44 EDT 2007
User: cbauer
Date: 07/09/02 05:39:43
Modified: examples/wiki/view docEdit.xhtml userList.xhtml
docDisplay.xhtml docHistory.xhtml userHome.xhtml
Log:
New diff and improvements to history function
Revision Changes Path
1.43 +1 -1 jboss-seam/examples/wiki/view/docEdit.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: docEdit.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docEdit.xhtml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- docEdit.xhtml 1 Sep 2007 08:42:47 -0000 1.42
+++ docEdit.xhtml 2 Sep 2007 09:39:43 -0000 1.43
@@ -305,7 +305,7 @@
<script type="text/javascript">jQuery(function() {
wrapBoxes();
});</script>
- <s:div id="documentDisplay" styleClass="documentDisplay"><j4j:idProxy id="documentDisplay_" />
+ <s:div id="documentDisplay" styleClass="documentDisplay">
<s:div rendered="#{documentHome.instance.nameAsTitle}"><h1 class="documentTitle">#{documentHome.instance.name}</h1></s:div>
<wiki:formattedText value="#{documentHome.instance.content}"
linkStyleClass="regularLink"
1.21 +1 -1 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.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- userList.xhtml 1 Sep 2007 08:42:47 -0000 1.20
+++ userList.xhtml 2 Sep 2007 09:39:43 -0000 1.21
@@ -71,7 +71,7 @@
<h:commandLink id="find" styleClass="buttonNonpersistent"
action="#{userSearch.find()}"
- tabindex="6" accesskey="F"><span class="buttonLabel"><u>F</u>ind</span></h:commandLink>
+ tabindex="6" accesskey="I"><span class="buttonLabel">F<u>i</u>nd</span></h:commandLink>
</h:panelGrid>
1.25 +1 -1 jboss-seam/examples/wiki/view/docDisplay.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: docDisplay.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docDisplay.xhtml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- docDisplay.xhtml 1 Sep 2007 08:42:47 -0000 1.24
+++ docDisplay.xhtml 2 Sep 2007 09:39:43 -0000 1.25
@@ -44,7 +44,7 @@
<ui:define name="content">
<div id="documentDisplayContainer" class="box">
- <s:div id="documentDisplay" styleClass="documentDisplay"><j4j:idProxy id="documentDisplay_" />
+ <s:div id="documentDisplay" styleClass="documentDisplay">
<s:div rendered="#{documentHome.instance.nameAsTitle}"><h1 class="documentTitle">#{documentHome.instance.name}</h1></s:div>
<wiki:formattedText value="#{documentHome.instance.content}"
linkStyleClass="regularLink"
1.12 +28 -2 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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- docHistory.xhtml 1 Sep 2007 08:42:47 -0000 1.11
+++ docHistory.xhtml 2 Sep 2007 09:39:43 -0000 1.12
@@ -13,7 +13,7 @@
<ui:define name="controlTwo">
- <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end" accesskey="E">Clos<u>e</u></s:link>
+ <s:link id="close" styleClass="linkNavigation" action="exit" accesskey="E">Clos<u>e</u></s:link>
</ui:define>
@@ -85,8 +85,13 @@
</h:column>
<h:column>
+ <a:commandLink id="show"
+ 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"
+ action="#{nodeHistory.diff}"
+ reRender="messageBoxContainer, diffResult, historicalPreview"
tabindex="3" styleClass="buttonNonpersistent"><span class="buttonLabel">Diff</span></a:commandLink>
<h:commandLink id="rollback"
action="#{nodeHistory.rollback}"
@@ -109,6 +114,27 @@
</s:div>
</s:div>
+<s:div id="historicalPreview">
+ <s:div id="documentDisplayContainer"
+ rendered="#{not empty nodeHistory.displayedHistoricalNode}"
+ styleClass="box">
+ <script type="text/javascript">jQuery(function() {
+ wrapBoxes();
+ });</script>
+ <s:div id="documentDisplay" styleClass="documentDisplay">
+ <wiki:formattedText value="#{nodeHistory.displayedHistoricalNode.content}"
+ linkStyleClass="regularLink"
+ brokenLinkStyleClass="brokenLink"
+ attachmentLinkStyleClass="regularLink"
+ thumbnailLinkStyleClass="regularLink"
+ renderBaseDocument="#{currentNode}"
+ renderBaseDirectory="#{currentNode.parent}"
+ enablePlugins="true"/>
+ </s:div>
+ </s:div>
+</s:div>
+
+
</ui:define>
<ui:define name="footer"> </ui:define>
1.15 +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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- userHome.xhtml 1 Sep 2007 08:42:47 -0000 1.14
+++ userHome.xhtml 2 Sep 2007 09:39:43 -0000 1.15
@@ -44,7 +44,7 @@
<h:outputText value="Edit user"/>
</li>
<li id="userAccountTab"><a href="#userAccount" accesskey="N">Accou<u>n</u>t</a></li>
- <li id="userProfileTab"><a href="#userProfile" accesskey="F">Pro<u>f</u>ile</a></li>
+ <li id="userProfileTab"><a href="#userProfile" accesskey="I">Prof<u>i</u>le</a></li>
<li id="userPrefsTab"><a href="#userPreferences" accesskey="R">P<u>r</u>eferences</a></li>
</ul>
More information about the jboss-cvs-commits
mailing list