[jboss-cvs] jboss-seam/examples/wiki/view ...
Christian Bauer
christian at hibernate.org
Fri Nov 9 10:08:24 EST 2007
User: cbauer
Date: 07/11/09 10:08:24
Modified: examples/wiki/view dirEdit_d.xhtml fileEdit_d.xhtml
docDisplay_d.xhtml message.xhtml docEdit_d.xhtml
Log:
Various updates to core classes and views, required for forum plugin
Revision Changes Path
1.3 +6 -2 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- dirEdit_d.xhtml 12 Oct 2007 16:31:24 -0000 1.2
+++ dirEdit_d.xhtml 9 Nov 2007 15:08:24 -0000 1.3
@@ -97,7 +97,9 @@
</s:decorate>
<s:span rendered="#{directoryHome.instance.id != wikiPreferences.memberAreaId}">
- <ui:include src="includes/accessLevelSelector.xhtml"/>
+ <ui:include src="includes/accessLevelSelector.xhtml">
+ <ui:param name="nodeHome" value="#{directoryHome}"/>
+ </ui:include>
</s:span>
</s:validateAll>
@@ -190,7 +192,9 @@
<a:commandLink id="resetFeed" reRender="messageBoxContainer"
action="#{directoryHome.resetFeed}"
rendered="#{!empty directoryHome.instance.feed}"
- styleClass="buttonNonpersistent"><span class="buttonLabel">Reset Feed</span></a:commandLink>
+ styleClass="buttonNonpersistent">
+ <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.dirEdit.ResetFeed']}"/>
+ </a:commandLink>
</div>
</s:div>
1.3 +3 -1 jboss-seam/examples/wiki/view/fileEdit_d.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: fileEdit_d.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/fileEdit_d.xhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- fileEdit_d.xhtml 12 Oct 2007 16:31:24 -0000 1.2
+++ fileEdit_d.xhtml 9 Nov 2007 15:08:24 -0000 1.3
@@ -87,7 +87,9 @@
</h:inputText>
</s:decorate>
- <ui:include src="includes/accessLevelSelector.xhtml"/>
+ <ui:include src="includes/accessLevelSelector.xhtml">
+ <ui:param name="nodeHome" value="#{fileHome}"/>
+ </ui:include>
<s:div id="details" rendered="#{fileHome.managed}">
1.6 +49 -34 jboss-seam/examples/wiki/view/docDisplay_d.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: docDisplay_d.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docDisplay_d.xhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- docDisplay_d.xhtml 12 Oct 2007 16:31:24 -0000 1.5
+++ docDisplay_d.xhtml 9 Nov 2007 15:08:24 -0000 1.6
@@ -11,10 +11,23 @@
xmlns:rich="http://richfaces.org/rich"
template="themes/#{wikiPreferences.themeName}/template.xhtml">
+<ui:define name="includeHeaders">
+
+ <s:fragment rendered="#{not empty documentHome.parentDirectory.feed}">
+ <link rel="alternate" type="application/atom+xml"
+ title="#{documentHome.parentDirectory.name}"
+ href="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{currentDirectory.feed.id}"/>
+
+ </s:fragment>
+
+</ui:define>
+
<ui:define name="screenname">#{documentHome.instance.name}</ui:define>
<ui:define name="controlTwo">
+ <s:fragment rendered="#{not documentHome.instance.macroPresent('hideControls') or s:hasPermission('User', 'isAdmin', currentUser)}">
+
<s:link id="createDoc" styleClass="linkNavigation"
accesskey="#{messages['lacewiki.button.CreateDocument.accesskey']}"
view="/docEdit_#{skin}.xhtml"
@@ -46,11 +59,13 @@
<f:param name="directoryId" value="#{documentHome.parentDirectory.id}"/>
</s:link>
+ </s:fragment>
+
</ui:define>
<ui:define name="content">
- <s:fragment rendered="#{documentHome.instance.pluginsUsed.contains('clearBackground')}">
+ <s:fragment rendered="#{documentHome.instance.macroPresent('clearBackground')}">
<script type="text/javascript">jQuery(function() {
clearDocumentBackground();
});</script>
@@ -69,7 +84,7 @@
enablePlugins="true"/>
</s:div>
- <s:div rendered="#{documentHome.instance.pluginsUsed.contains('showTags') and not empty documentHome.instance.tags}"
+ <s:div rendered="#{documentHome.instance.macroPresent('showTags') and not empty documentHome.instance.tags}"
styleClass="documentTags undecoratedLink">
<s:div>
#{messages['lacewiki.label.docDisplay.Tags']}: 
@@ -84,7 +99,7 @@
</s:div>
</s:div>
- <s:div rendered="#{wikiPreferences.showDocumentCreatorHistory and not documentHome.instance.pluginsUsed.contains('hideCreatorHistory')}"
+ <s:div rendered="#{wikiPreferences.showDocumentCreatorHistory and not documentHome.instance.macroPresent('hideCreatorHistory')}"
styleClass="documentCreatorHistory undecoratedLink">
<s:div>
#{messages['lacewiki.label.docDisplay.Created']}: 
@@ -141,7 +156,7 @@
<ui:include src="includes/attachmentDisplay.xhtml"/>
- <s:span id="commentDisplayForm">
+ <s:span id="commentDisplayForm" rendered="#{not documentHome.instance.macroPresent('hideComments')}">
<ui:include src="includes/commentsDisplay.xhtml"/>
<ui:include src="includes/commentForm.xhtml"/>
1.8 +8 -4 jboss-seam/examples/wiki/view/message.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: message.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/message.xhtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- message.xhtml 12 Oct 2007 16:31:24 -0000 1.7
+++ message.xhtml 9 Nov 2007 15:08:24 -0000 1.8
@@ -14,7 +14,11 @@
<h:messages/>
</div>
- <s:div id="stackTraceHandled" rendered="#{init.debug and not empty org.jboss.seam.handledException}">
+<s:fragment rendered="#{init.debug}">
+ Exception Details:
+ <hr/>
+
+ <s:div id="stackTraceHandled">
Handled exception:
<pre style="font-size:75%;">
@@ -32,8 +36,8 @@
<hr/>
</s:div>
- <s:div id="stackTrace" rendered="#{init.debug and not empty org.jboss.seam.exception}">
- Unhandled exception:
+ <s:div id="stackTrace">
+ Unhandled or wrapper exception:
<pre style="font-size:75%;">
Top level exception : #{org.jboss.seam.exception.class.name}: #{org.jboss.seam.exception.message}
@@ -50,7 +54,7 @@
<hr/>
</s:div>
-
+</s:fragment>
</body>
</html>
1.9 +17 -4 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- docEdit_d.xhtml 12 Oct 2007 16:31:24 -0000 1.8
+++ docEdit_d.xhtml 9 Nov 2007 15:08:24 -0000 1.9
@@ -231,8 +231,9 @@
</div>
</s:div>
- <ui:include src="includes/accessLevelSelector.xhtml"/>
-
+ <ui:include src="includes/accessLevelSelector.xhtml">
+ <ui:param name="nodeHome" value="#{documentHome}"/>
+ </ui:include>
<s:div styleClass="entry">
<div class="label">
@@ -247,13 +248,25 @@
</s:div>
<s:div id="commentFormSwitch">
+
<s:div styleClass="entry">
<div class="label"> </div>
<div class="input">
- <h:selectBooleanCheckbox disabled="#{not documentHome.instance.enableComments}" value="#{documentHome.instance.enableCommentForm}" tabindex="1"/>
+ <h:selectBooleanCheckbox disabled="#{not documentHome.instance.enableComments}"
+ value="#{documentHome.instance.enableCommentForm}" tabindex="1"/>
<h:outputText value="#{messages['lacewiki.label.docEdit.AllowCommentPosting']}"/>
</div>
</s:div>
+
+ <s:div styleClass="entry">
+ <div class="label"> </div>
+ <div class="input">
+ <h:selectBooleanCheckbox disabled="#{not documentHome.instance.enableComments}"
+ value="#{documentHome.instance.enableCommentsOnFeeds}" tabindex="1"/>
+ <h:outputText value="#{messages['lacewiki.label.docEdit.PushCommentsOnFeeds']}"/>
+ </div>
+ </s:div>
+
</s:div>
<s:div styleClass="entry">
@@ -355,7 +368,7 @@
<script type="text/javascript">jQuery(function() {
wrapBoxes();
});</script>
- <s:fragment rendered="#{documentHome.instance.pluginsUsed.contains('clearBackground')}">
+ <s:fragment rendered="#{documentHome.instance.macroPresent('clearBackground')}">
<script type="text/javascript">jQuery(function() {
clearDocumentBackground();
});</script>
More information about the jboss-cvs-commits
mailing list