[jboss-cvs] jboss-seam/examples/wiki/view ...
Christian Bauer
christian at hibernate.org
Wed Jan 9 10:59:24 EST 2008
User: cbauer
Date: 08/01/09 10:59:24
Modified: examples/wiki/view docEdit_m.xhtml dirDisplay_d.xhtml
uploadEdit_d.xhtml dirEdit_d.xhtml docEdit_d.xhtml
Log:
JBSEAM-2397 and JBSEAM-1883 - implemented trashcan feature and more reliable update of 2nd level cache and lucene index
Revision Changes Path
1.5 +1 -1 jboss-seam/examples/wiki/view/docEdit_m.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: docEdit_m.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docEdit_m.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- docEdit_m.xhtml 30 Dec 2007 02:33:19 -0000 1.4
+++ docEdit_m.xhtml 9 Jan 2008 15:59:24 -0000 1.5
@@ -94,7 +94,7 @@
value="#{messages['lacewiki.button.Save']}"/>
<h:commandButton action="#{documentHome.update}" rendered="#{documentHome.managed}"
value="#{messages['lacewiki.button.Update']}"/>
- <h:commandButton action="#{documentHome.remove}" rendered="#{documentHome.managed and documentHome.instance.id != wikiStart.id}"
+ <h:commandButton action="#{documentHome.remove}" rendered="#{documentHome.removable}"
value="#{messages['lacewiki.button.Delete']}"/>
</s:div>
1.9 +50 -26 jboss-seam/examples/wiki/view/dirDisplay_d.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: dirDisplay_d.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirDisplay_d.xhtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- dirDisplay_d.xhtml 30 Dec 2007 02:33:19 -0000 1.8
+++ dirDisplay_d.xhtml 9 Jan 2008 15:59:24 -0000 1.9
@@ -102,30 +102,12 @@
<h:panelGrid columns="3"
styleClass="directoryControl smallFont"
- columnClasses="directoryPagerControl, directorySelectControl, directoryClipboard"
+ columnClasses="directorySelectControl, directoryClipboard, directoryTrash"
cellpadding="0" cellspacing="0" border="0">
<s:fragment>
- <h:panelGroup rendered="#{not empty childNodesList or
- clipboard.isContainsCutFromDirectory(directoryHome.instance.id)}">
- <h:outputText value="#{messages['lacewiki.label.dirDisplay.ShowItems']}: "/>
- <h:selectOneMenu value="#{directoryHome.pager.pageSize}" tabindex="1">
- <f:selectItem itemLabel="5" itemValue="5"/>
- <f:selectItem itemLabel="15" itemValue="15"/>
- <f:selectItem itemLabel="50" itemValue="50"/>
- <f:selectItem itemLabel="#{messages['lacewiki.label.dirDisplay.All']}" itemValue="999999"/>
- </h:selectOneMenu>
- <h:commandLink action="#{directoryHome.refreshChildNodes()}"
- tabindex="1" accesskey="#{messages['lacewiki.button.dirDisplay.Refresh.accesskey']}"
- styleClass="buttonNonpersistent">
- <h:outputText styleClass="buttonLabel" escape="false" value="#{messages['lacewiki.button.dirDisplay.Refresh']}"/>
- </h:commandLink>
- </h:panelGroup>
- </s:fragment>
-
- <s:fragment>
<h:panelGroup styleClass="undecoratedLink"
- rendered="#{not empty childNodesList and directoryHome.instance.id != wikiRoot.id}">
+ rendered="#{childNodesList.size > 0 and directoryHome.instance.id != wikiRoot.id}">
<h:outputText value="#{messages['lacewiki.label.Clipboard.Select']}: "/>
<h:outputLink value="#" onclick="selectCheckBoxes('wikiFileSelect'); switchClipboardControl();" tabindex="1">
<h:outputText value="#{messages['lacewiki.label.Clipboard.All']}"/>
@@ -187,22 +169,53 @@
</h:panelGroup>
</s:fragment>
+ <s:fragment>
+ <h:panelGroup rendered="#{directoryHome.instance.id == trashArea.id and s:hasPermission('Trash', 'empty', directoryHome.instance)}">
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.trash.gif"
+ width="18" height="20" style="vertical-align:middle;"/>
+ <h:commandLink action="#{directoryHome.emptyTrash()}"
+ tabindex="1" styleClass="button">
+ <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.EmptyTrash']}"/>
+ </h:commandLink>
+ </h:panelGroup>
+ </s:fragment>
+
</h:panelGrid>
+ <h:panelGrid columns="2" styleClass="directoryPathTable" columnClasses="directoryPath, directoryPagerControl"
+ cellpadding="0" cellspacing="0" border="0">
- <div class="directoryPathPanel">
<h:panelGroup>
<h:outputText value="/" styleClass="directorySeparator"/>
<ui:repeat var="directory" value="#{directoryHome.instance.path}">
+
<s:link view="/dirDisplay_#{skin}.xhtml" value="#{directory.name}" styleClass="directoryButton" tabindex="1">
<f:param name="directoryId" value="#{directory.id}"/>
</s:link>
+
<h:outputText value="/" styleClass="directorySeparator" rendered="#{directory != directoryHome.instance}"/>
+
</ui:repeat>
</h:panelGroup>
- </div>
- <s:div styleClass="directoryEmpty" rendered="#{empty childNodesList}">
+ <h:panelGroup rendered="#{childNodesList.size > 0}" styleClass="smallFont">
+ <h:outputText value="#{messages['lacewiki.label.dirDisplay.ShowItems']}: "/>
+ <h:selectOneMenu value="#{directoryHome.pager.pageSize}" tabindex="1">
+ <f:selectItem itemLabel="5" itemValue="5"/>
+ <f:selectItem itemLabel="15" itemValue="15"/>
+ <f:selectItem itemLabel="50" itemValue="50"/>
+ <f:selectItem itemLabel="#{messages['lacewiki.label.dirDisplay.All']}" itemValue="999999"/>
+ </h:selectOneMenu>
+ <h:commandLink action="#{directoryHome.refreshChildNodes()}"
+ tabindex="1" accesskey="#{messages['lacewiki.button.dirDisplay.Refresh.accesskey']}"
+ styleClass="buttonNonpersistent">
+ <h:outputText styleClass="buttonLabel" escape="false" value="#{messages['lacewiki.button.dirDisplay.Refresh']}"/>
+ </h:commandLink>
+ </h:panelGroup>
+
+ </h:panelGrid>
+
+ <s:div styleClass="directoryEmpty" rendered="#{childNodesList.size == 0}">
<s:link view="/dirDisplay_#{skin}.xhtml" tabindex="1" accesskey="."
rendered="#{!empty directoryHome.parentNode and s:hasPermission('Node','read',directoryHome.parentNode)}">
<f:param name="directoryId" value="#{directoryHome.parentNode.id}"/>
@@ -216,7 +229,7 @@
</s:div>
- <h:panelGrid columns="5" rendered="#{not empty childNodesList and directoryHome.pager.numOfRecords > directoryHome.pager.pageSize}"
+ <h:panelGrid columns="5" rendered="#{childNodesList.size > 0 and directoryHome.pager.numOfRecords > directoryHome.pager.pageSize}"
styleClass="pager"
columnClasses="pagerIconColumn,pagerIconColumn,pagerTextColumn,pagerIconColumn,pagerIconColumn"
cellpadding="0" cellspacing="0" border="0">
@@ -269,7 +282,7 @@
<h:dataTable id="directoryTable" var="node"
value="#{childNodesList}"
- rendered="#{!empty childNodesList}"
+ rendered="#{childNodesList.size > 0}"
styleClass="datatable topLeftBottomBorder smallFont"
headerClass="regularHeader rightBorder alignCenter"
columnClasses="onePercentColumn rightBorder alignCenter, onePercentColumn rightBorder alignCenter,
@@ -304,7 +317,18 @@
</f:facet>
<h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dir.gif"
width="18" height="20"
- rendered="#{node.isInstance('WikiDirectory')}"/>
+ rendered="#{node.isInstance('WikiDirectory')
+ and node.id != trashArea.id and node.id != memberArea.id and node.id != helpArea.id}"/>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.trash.gif"
+ width="18" height="20"
+ rendered="#{node.isInstance('WikiDirectory') and node.id == trashArea.id}"/>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.user.gif"
+ width="18" height="20"
+ rendered="#{node.isInstance('WikiDirectory') and node.id == memberArea.id}"/>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.help.gif"
+ width="18" height="20"
+ rendered="#{node.isInstance('WikiDirectory') and node.id == helpArea.id}"/>
+
<h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.doc.gif"
width="18" height="20"
rendered="#{node.isInstance('WikiDocument') and node.id != directoryHome.instance.defaultFile.id}"/>
1.4 +1 -1 jboss-seam/examples/wiki/view/uploadEdit_d.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: uploadEdit_d.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/uploadEdit_d.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- uploadEdit_d.xhtml 4 Jan 2008 22:28:51 -0000 1.3
+++ uploadEdit_d.xhtml 9 Jan 2008 15:59:24 -0000 1.4
@@ -145,7 +145,7 @@
<h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.uploadEdit.Update']}"/>
</h:commandLink>
- <s:fragment rendered="#{uploadHome.managed}">
+ <s:fragment rendered="#{uploadHome.removable}">
<a:jsFunction name="deleteUpload"
action="#{uploadHome.remove}"/>
<h:outputLink value="#" tabindex="1"
1.7 +1 -1 jboss-seam/examples/wiki/view/dirEdit_d.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: dirEdit_d.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirEdit_d.xhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- dirEdit_d.xhtml 4 Jan 2008 22:28:51 -0000 1.6
+++ dirEdit_d.xhtml 9 Jan 2008 15:59:24 -0000 1.7
@@ -244,7 +244,7 @@
<h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.dirEdit.Update']}"/>
</h:commandLink>
- <s:fragment rendered="#{directoryHome.managed and !empty directoryHome.parentNode and directoryHome.instance.id != memberArea.id}">
+ <s:fragment rendered="#{directoryHome.removable}">
<a:jsFunction name="deleteDirectory"
action="#{directoryHome.remove}"/>
<h:outputLink value="#" tabindex="1"
1.13 +44 -37 jboss-seam/examples/wiki/view/docEdit_d.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: docEdit_d.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docEdit_d.xhtml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- docEdit_d.xhtml 4 Jan 2008 22:28:51 -0000 1.12
+++ docEdit_d.xhtml 9 Jan 2008 15:59:24 -0000 1.13
@@ -6,6 +6,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:a="https://ajax4jsf.dev.java.net/ajax"
+ xmlns:c="http://java.sun.com/jstl/core"
xmlns:wiki="http://jboss.com/products/seam/wiki"
xmlns:j4j="http://javascript4jsf.dev.java.net/"
template="themes/#{preferences.get('Wiki').themeName}/template.xhtml">
@@ -113,6 +114,7 @@
</div>
</s:div>
<s:div id="pushOnSiteFeedSwitchUnmanaged">
+ <s:fragment rendered="#{s:hasPermission('Feed','write',wikiRoot.feed)}">
<s:div styleClass="entry">
<div class="label"> </div>
<div class="input">
@@ -120,6 +122,7 @@
<h:outputText value="#{messages['lacewiki.label.docEdit.CreateOnSiteFeed']}"/>
</div>
</s:div>
+ </s:fragment>
</s:div>
</s:fragment>
@@ -144,13 +147,16 @@
</div>
</s:div>
<s:div id="pushOnSiteFeedSwitch">
+ <s:fragment rendered="#{s:hasPermission('Feed','write',wikiRoot.feed)}">
<s:div styleClass="entry">
<div class="label"> </div>
<div class="input">
- <h:selectBooleanCheckbox disabled="#{not documentHome.pushOnFeeds}" value="#{documentHome.pushOnSiteFeed}" tabindex="1"/>
+ <h:selectBooleanCheckbox disabled="#{not documentHome.pushOnFeeds}"
+ value="#{documentHome.pushOnSiteFeed}" tabindex="1"/>
<h:outputText value="#{messages['lacewiki.label.docEdit.CreateOnSiteFeed']}"/>
</div>
</s:div>
+ </s:fragment>
</s:div>
</s:fragment>
</s:fragment>
@@ -292,7 +298,7 @@
<h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.docEdit.Update']}"/>
</h:commandLink>
- <s:fragment rendered="#{documentHome.managed and documentHome.instance.id != wikiStart.id}">
+ <s:fragment rendered="#{documentHome.removable}">
<a:jsFunction name="deleteDocument"
action="#{documentHome.remove}"/>
<h:outputLink value="#" tabindex="1"
@@ -315,8 +321,8 @@
<br/>
<s:div id="contentPreview">
+ <c:if test="#{documentHome.enabledPreview}">
<s:div id="documentDisplayContainer"
- rendered="#{documentHome.enabledPreview}"
styleClass="box">
<s:fragment rendered="#{documentHome.instance.macroPresent('clearBackground')}">
<script type="text/javascript">jQuery(function() {
@@ -339,6 +345,7 @@
<s:div rendered="#{documentHome.enabledPreview}">
<ui:include src="includes/attachmentDisplay.xhtml"/>
</s:div>
+ </c:if>
</s:div>
</ui:define>
More information about the jboss-cvs-commits
mailing list