[jboss-cvs] jboss-seam/examples/wiki/view ...
Christian Bauer
christian at hibernate.org
Sat Apr 21 15:58:01 EDT 2007
User: cbauer
Date: 07/04/21 15:58:01
Modified: examples/wiki/view fileEdit.xhtml dirEdit.xhtml
docEdit.xhtml dirDisplay.xhtml userList.xhtml
Log:
Ability to change owner/creator of wiki node
Revision Changes Path
1.12 +30 -31 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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- fileEdit.xhtml 19 Apr 2007 05:44:46 -0000 1.11
+++ fileEdit.xhtml 21 Apr 2007 19:58:01 -0000 1.12
@@ -48,8 +48,6 @@
<div class="formFields formBorder wideLabels">
- <s:validateAll>
-
<s:div id="selectedDirectory" styleClass="entry" rendered="#{fileHome.managed}">
<div class="label">In directory:</div>
<div class="output">
@@ -59,6 +57,22 @@
</div>
</s:div>
+ <s:div id="selectedCreator" styleClass="entry" rendered="#{fileHome.managed}">
+ <div class="label">Created On:</div>
+ <div class="output">
+ <h:outputText value="#{fileHome.instance.createdOn}">
+ <f:convertDateTime type="both"/>
+ </h:outputText>
+ (#{fileHome.instance.createdBy.username})
+ <h:outputLink id="selectCreator" rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}"
+ value="javascript:Richfaces.showModalPanel('creatorSelection',{width:625, height:320, top:150})"
+ tabindex="1"
+ styleClass="buttonNonpersistent"><span class="buttonLabel">...</span></h:outputLink>
+ </div>
+ </s:div>
+
+ <s:validateAll>
+
<s:decorate>
<div class="entry">
<div class="label">Name:</div>
@@ -184,28 +198,13 @@
</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 type="simpleNode">
- <h:outputText value="#{d.id} - #{d.name}"/>
- </rich:treeNode>
- </rich:tree>
- </ui:define>
- </ui:decorate>
+ <ui:include src="includes/directorySelector.xhtml">
+ <ui:param name="nodeHome" value="#{fileHome}"/>
+ </ui:include>
+
+ <ui:include src="includes/creatorSelector.xhtml">
+ <ui:param name="nodeHome" value="#{fileHome}"/>
+ </ui:include>
</ui:define>
1.18 +9 -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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- dirEdit.xhtml 8 Apr 2007 15:10:35 -0000 1.17
+++ dirEdit.xhtml 21 Apr 2007 19:58:01 -0000 1.18
@@ -59,13 +59,17 @@
</div>
</s:div>
- <s:div styleClass="entry" rendered="#{directoryHome.managed}">
+ <s:div id="selectedCreator" styleClass="entry" rendered="#{directoryHome.managed}">
<div class="label">Created On:</div>
<div class="output">
<h:outputText value="#{directoryHome.instance.createdOn}">
<f:convertDateTime type="both"/>
</h:outputText>
(#{directoryHome.instance.createdBy.username})
+ <h:outputLink id="selectCreator" rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}"
+ value="javascript:Richfaces.showModalPanel('creatorSelection',{width:625, height:320, top:150})"
+ tabindex="1"
+ styleClass="buttonNonpersistent"><span class="buttonLabel">...</span></h:outputLink>
</div>
</s:div>
@@ -207,6 +211,10 @@
</ui:define>
</ui:decorate>
+<ui:include src="includes/creatorSelector.xhtml">
+ <ui:param name="nodeHome" value="#{directoryHome}"/>
+</ui:include>
+
</ui:define>
<ui:define name="footer"> </ui:define>
1.26 +23 -34 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.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- docEdit.xhtml 19 Apr 2007 09:32:08 -0000 1.25
+++ docEdit.xhtml 21 Apr 2007 19:58:01 -0000 1.26
@@ -68,18 +68,22 @@
</div>
</s:div>
- <s:validateAll>
-
- <s:div styleClass="entry" rendered="#{documentHome.managed}">
+ <s:div id="selectedCreator" styleClass="entry" rendered="#{documentHome.managed}">
<div class="label">Created On:</div>
<div class="output">
<h:outputText value="#{documentHome.instance.createdOn}">
<f:convertDateTime type="both"/>
</h:outputText>
(#{documentHome.instance.createdBy.username})
+ <h:outputLink id="selectCreator" rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}"
+ value="javascript:Richfaces.showModalPanel('creatorSelection',{width:625, height:320, top:150})"
+ tabindex="1"
+ styleClass="buttonNonpersistent"><span class="buttonLabel">...</span></h:outputLink>
</div>
</s:div>
+ <s:validateAll>
+
<ui:include src="includes/accessLevelSelector.xhtml"/>
<s:decorate>
@@ -199,11 +203,11 @@
<h:commandLink id="update" action="#{documentHome.update}"
rendered="#{documentHome.managed}"
- tabindex="5" accesskey="U" styleClass="button"><span class="buttonLabel"><u>U</u>pdate</span></h:commandLink>
+ tabindex="4" accesskey="U" styleClass="button"><span class="buttonLabel"><u>U</u>pdate</span></h:commandLink>
<h:outputLink id="delete" value="javascript:Richfaces.showModalPanel('deleteConfirmation',{})"
rendered="#{documentHome.managed and documentHome.instance.id != wikiStart.id}"
- tabindex="7" accesskey="D" styleClass="button"><span class="buttonLabel"><u>D</u>elete</span></h:outputLink>
+ tabindex="4" accesskey="D" styleClass="button"><span class="buttonLabel"><u>D</u>elete</span></h:outputLink>
</div>
</div>
@@ -227,28 +231,13 @@
</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 type="simpleNode">
- <h:outputText value="#{d.id} - #{d.name}"/>
- </rich:treeNode>
- </rich:tree>
- </ui:define>
- </ui:decorate>
+ <ui:include src="includes/directorySelector.xhtml">
+ <ui:param name="nodeHome" value="#{documentHome}"/>
+ </ui:include>
+
+ <ui:include src="includes/creatorSelector.xhtml">
+ <ui:param name="nodeHome" value="#{documentHome}"/>
+ </ui:include>
<s:div styleClass="documentDisplay" id="preview">
<s:div rendered="#{documentHome.enabledPreview}">
1.15 +4 -4 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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- dirDisplay.xhtml 8 Apr 2007 15:10:35 -0000 1.14
+++ dirDisplay.xhtml 21 Apr 2007 19:58:01 -0000 1.15
@@ -157,16 +157,16 @@
<h:column>
<f:facet name="header">
- Read Access Level
+ Read Access
</f:facet>
- #{wiki:truncateString(wiki:resolveAccessLevel(node.readAccessLevel).roleNames, 20, '...')}
+ #{wiki:truncateString(wiki:resolveAccessLevel(node.readAccessLevel).roleNames, 15, '...')}
</h:column>
<h:column>
<f:facet name="header">
- Write Access Level
+ Write Access
</f:facet>
- #{wiki:truncateString(wiki:resolveAccessLevel(node.writeAccessLevel).roleNames, 20, '...')}
+ #{wiki:truncateString(wiki:resolveAccessLevel(node.writeAccessLevel).roleNames, 15, '...')}
</h:column>
<h:column rendered="#{!empty node.lastModifiedOn and !empty node.lastModifiedBy}">
1.13 +2 -2 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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- userList.xhtml 21 Apr 2007 08:13:50 -0000 1.12
+++ userList.xhtml 21 Apr 2007 19:58:01 -0000 1.13
@@ -75,8 +75,8 @@
<h:outputLabel styleClass="label" for="pageSize">Show:</h:outputLabel> 
<h:selectOneMenu value="#{userSearch.pageSize}" id="pageSize" tabindex="5" style="font-size:100%">
<f:selectItem itemLabel="5" itemValue="5"/>
- <f:selectItem itemLabel="10" itemValue="10"/>
- <f:selectItem itemLabel="20" itemValue="20"/>
+ <f:selectItem itemLabel="15" itemValue="10"/>
+ <f:selectItem itemLabel="50" itemValue="20"/>
</h:selectOneMenu>
</h:panelGroup>
More information about the jboss-cvs-commits
mailing list