[jboss-cvs] jboss-seam/examples/wiki/view ...
Christian Bauer
christian at hibernate.org
Mon Mar 19 22:38:14 EDT 2007
User: cbauer
Date: 07/03/19 22:38:14
Modified: examples/wiki/view fileEdit.xhtml userProfile.xhtml
dirEdit.xhtml docEdit.xhtml userPrefs.xhtml
userAccount.xhtml
Log:
Implemented moving of documents and files between directories
Revision Changes Path
1.7 +34 -2 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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- fileEdit.xhtml 18 Mar 2007 23:29:19 -0000 1.6
+++ fileEdit.xhtml 20 Mar 2007 02:38:14 -0000 1.7
@@ -33,7 +33,7 @@
<ui:define name="controlRight">
<s:link id="exit" styleClass="linkNavigation"
- action="#{fileHome.exitConversation(true)}"
+ action="#{browser.exitConversation(true)}"
accesskey="E"><u>E</u>xit Editor</s:link>
</ui:define>
@@ -50,6 +50,15 @@
<s:validateAll>
+ <s:div id="selectedDirectory" styleClass="entry" rendered="#{fileHome.managed}">
+ <div class="label">In directory:</div>
+ <div class="output">
+ #{fileHome.parentDirectory}
+ <h:outputLink id="selectDirectory" value="javascript:Richfaces.showModalPanel('directorySelection',{width:250, height:250, top:100})"
+ tabindex="1" styleClass="buttonNonpersistent"><span class="buttonLabel">...</span></h:outputLink>
+ </div>
+ </s:div>
+
<s:decorate>
<div class="entry">
<div class="label">Name:</div>
@@ -164,7 +173,7 @@
<ui:decorate template="includes/confirmationModalDialog.xhtml">
<ui:param name="confirmationModalDialogId" value="deleteConfirmation"/>
- <ui:define name="confirmationText">
+ <ui:define name="confirmationContent">
<p>Are you sure you want to delete the file '#{fileHome.instance.name}'?</p>
</ui:define>
<ui:define name="confirmationOption">
@@ -175,6 +184,29 @@
</ui:define>
</ui:decorate>
+ <ui:decorate template="includes/confirmationModalDialog.xhtml">
+ <ui:param name="confirmationModalDialogId" value="directorySelection"/>
+ <ui:define name="confirmationTitle">
+ Select parent directory...
+ </ui:define>
+ <ui:define name="confirmationContent">
+ <rich:tree id="directoryTree" switchType="ajax"
+ value="#{writableDirectoryTree}" var="d"
+ style="margin: 10px;"
+ icon="/themes/default/img/icon.dir.gif"
+ iconLeaf="/themes/default/img/icon.dir.gif"
+ selectedClass="activeTab"
+ ajaxSubmitSelection="true"
+ onselected="Richfaces.hideModalPanel('directorySelection')"
+ nodeSelectListener="#{fileHome.parentDirectorySelected}"
+ reRender="selectedDirectory">
+ <rich:treeNode>
+ <h:outputText value="#{d.id} - #{d.name}"/>
+ </rich:treeNode>
+ </rich:tree>
+ </ui:define>
+ </ui:decorate>
+
</ui:define>
<ui:define name="footer"> </ui:define>
1.5 +3 -3 jboss-seam/examples/wiki/view/userProfile.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userProfile.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userProfile.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- userProfile.xhtml 18 Mar 2007 23:29:19 -0000 1.4
+++ userProfile.xhtml 20 Mar 2007 02:38:14 -0000 1.5
@@ -29,9 +29,9 @@
<ui:define name="controlLeft">
<s:div rendered="#{userHome.managed}">
- <s:link id="editAccount" styleClass="linkTab" action="editAccount">Account</s:link>
- <s:link id="editProfile" styleClass="linkTabActive" action="editProfile">Profile</s:link>
- <s:link id="editPreferences" styleClass="linkTab" action="editPreferences">Preferences</s:link>
+ <s:link id="editAccount" styleClass="linkTab inactiveTab" action="editAccount">Account</s:link>
+ <s:link id="editProfile" styleClass="linkTab activeTab" action="editProfile">Profile</s:link>
+ <s:link id="editPreferences" styleClass="linkTab inactiveTab" action="editPreferences">Preferences</s:link>
</s:div>
</ui:define>
1.14 +3 -3 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.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- dirEdit.xhtml 19 Mar 2007 04:53:53 -0000 1.13
+++ dirEdit.xhtml 20 Mar 2007 02:38:14 -0000 1.14
@@ -33,7 +33,7 @@
<ui:define name="controlRight">
<s:link id="exit" styleClass="linkNavigation"
- action="#{directoryHome.exitConversation(true)}"
+ action="#{browser.exitConversation(true)}"
accesskey="E"><u>E</u>xit Editor</s:link>
</ui:define>
@@ -83,7 +83,7 @@
</s:validateAll>
- <s:div styleClass="entry" rendered="#{directoryHome.managed}">
+ <s:div styleClass="entry" rendered="#{directoryHome.managed and !empty directoryHome.instance.parent}">
<div class="label">Default document:</div>
<div class="input">
<h:selectOneMenu value="#{directoryHome.instance.defaultDocument}" converter="#{restrictedEntityConverter}" tabindex="2">
@@ -189,7 +189,7 @@
<ui:decorate template="includes/confirmationModalDialog.xhtml">
<ui:param name="confirmationModalDialogId" value="deleteConfirmation"/>
- <ui:define name="confirmationText">
+ <ui:define name="confirmationContent">
<p>Are you sure you want to delete the directory '#{directoryHome.instance.name}'?</p>
</ui:define>
<ui:define name="confirmationOption">
1.16 +35 -3 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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- docEdit.xhtml 19 Mar 2007 04:53:53 -0000 1.15
+++ docEdit.xhtml 20 Mar 2007 02:38:14 -0000 1.16
@@ -39,7 +39,7 @@
rendered="#{s:hasPermission('Node', 'create', documentHome.parentDirectory)}">Upload <u>F</u>ile</s:link>
<s:link id="exit" styleClass="linkNavigation"
- action="#{documentHome.exitConversation(true)}"
+ action="#{browser.exitConversation(true)}"
accesskey="E"><u>E</u>xit Editor</s:link>
</ui:define>
@@ -56,6 +56,15 @@
<div class="formFields">
+ <s:div id="selectedDirectory" styleClass="entry" rendered="#{documentHome.managed}">
+ <div class="label">In directory:</div>
+ <div class="output">
+ #{documentHome.parentDirectory}
+ <h:outputLink id="selectDirectory" value="javascript:Richfaces.showModalPanel('directorySelection',{width:250, height:250, top:100})"
+ tabindex="1" styleClass="buttonNonpersistent"><span class="buttonLabel">...</span></h:outputLink>
+ </div>
+ </s:div>
+
<s:validateAll>
<s:div styleClass="entry" rendered="#{documentHome.managed}">
@@ -135,7 +144,7 @@
<h:outputLink id="delete" value="javascript:Richfaces.showModalPanel('deleteConfirmation',{})"
rendered="#{documentHome.managed}"
- tabindex="6" accesskey="D" styleClass="button"><span class="buttonLabel"><u>D</u>elete</span></h:outputLink>
+ tabindex="7" accesskey="D" styleClass="button"><span class="buttonLabel"><u>D</u>elete</span></h:outputLink>
</div>
</div>
@@ -148,7 +157,7 @@
<ui:decorate template="includes/confirmationModalDialog.xhtml">
<ui:param name="confirmationModalDialogId" value="deleteConfirmation"/>
- <ui:define name="confirmationText">
+ <ui:define name="confirmationContent">
<p>Are you sure you want to delete the document '#{documentHome.instance.name}'?</p>
</ui:define>
<ui:define name="confirmationOption">
@@ -159,6 +168,29 @@
</ui:define>
</ui:decorate>
+ <ui:decorate template="includes/confirmationModalDialog.xhtml">
+ <ui:param name="confirmationModalDialogId" value="directorySelection"/>
+ <ui:define name="confirmationTitle">
+ Select parent directory...
+ </ui:define>
+ <ui:define name="confirmationContent">
+ <rich:tree id="directoryTree" switchType="ajax"
+ value="#{writableDirectoryTree}" var="d"
+ style="margin: 10px;"
+ icon="/themes/default/img/icon.dir.gif"
+ iconLeaf="/themes/default/img/icon.dir.gif"
+ selectedClass="activeTab"
+ ajaxSubmitSelection="true"
+ onselected="Richfaces.hideModalPanel('directorySelection')"
+ nodeSelectListener="#{documentHome.parentDirectorySelected}"
+ reRender="selectedDirectory, content">
+ <rich:treeNode>
+ <h:outputText value="#{d.id} - #{d.name}"/>
+ </rich:treeNode>
+ </rich:tree>
+ </ui:define>
+ </ui:decorate>
+
<s:div styleClass="documentDisplay" id="preview">
<wiki:formattedText value="#{documentHome.instance.content}"
rendered="#{documentHome.enabledPreview}"
1.5 +3 -3 jboss-seam/examples/wiki/view/userPrefs.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userPrefs.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userPrefs.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- userPrefs.xhtml 18 Mar 2007 23:29:19 -0000 1.4
+++ userPrefs.xhtml 20 Mar 2007 02:38:14 -0000 1.5
@@ -29,9 +29,9 @@
<ui:define name="controlLeft">
<s:div rendered="#{userHome.managed}">
- <s:link id="editAccount" styleClass="linkTab" action="editAccount">Account</s:link>
- <s:link id="editProfile" styleClass="linkTab" action="editProfile">Profile</s:link>
- <s:link id="editPreferences" styleClass="linkTabActive" action="editPreferences">Preferences</s:link>
+ <s:link id="editAccount" styleClass="linkTab inactiveTab" action="editAccount">Account</s:link>
+ <s:link id="editProfile" styleClass="linkTab inactiveTab" action="editProfile">Profile</s:link>
+ <s:link id="editPreferences" styleClass="linkTab activeTab" action="editPreferences">Preferences</s:link>
</s:div>
</ui:define>
1.5 +3 -3 jboss-seam/examples/wiki/view/userAccount.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userAccount.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userAccount.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- userAccount.xhtml 18 Mar 2007 23:29:19 -0000 1.4
+++ userAccount.xhtml 20 Mar 2007 02:38:14 -0000 1.5
@@ -32,9 +32,9 @@
<ui:define name="controlLeft">
<s:div rendered="#{userHome.managed}">
- <s:link id="editAccount" styleClass="linkTabActive" action="editAccount">Account</s:link>
- <s:link id="editProfile" styleClass="linkTab" action="editProfile">Profile</s:link>
- <s:link id="editPreferences" styleClass="linkTab" action="editPreferences">Preferences</s:link>
+ <s:link id="editAccount" styleClass="linkTab activeTab" action="editAccount">Account</s:link>
+ <s:link id="editProfile" styleClass="linkTab inactiveTab" action="editProfile">Profile</s:link>
+ <s:link id="editPreferences" styleClass="linkTab inactiveTab" action="editPreferences">Preferences</s:link>
</s:div>
</ui:define>
More information about the jboss-cvs-commits
mailing list