[jboss-cvs] jboss-seam/examples/wiki/view/plugins/forumList ...
Christian Bauer
christian at hibernate.org
Tue Dec 18 23:29:27 EST 2007
User: cbauer
Date: 07/12/18 23:29:27
Modified: examples/wiki/view/plugins/forumList forumForm.xhtml
forumListTable.xhtml lastTopicPost.xhtml
plugin.xhtml forumListControls.xhtml
Log:
Major rewrite of the most of the application
Revision Changes Path
1.2 +30 -21 jboss-seam/examples/wiki/view/plugins/forumList/forumForm.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: forumForm.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/plugins/forumList/forumForm.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- forumForm.xhtml 9 Nov 2007 15:00:29 -0000 1.1
+++ forumForm.xhtml 19 Dec 2007 04:29:27 -0000 1.2
@@ -13,17 +13,14 @@
<div class="box">
-<s:fragment rendered="#{forumHome.managed}">
- <ui:include src="../../includes/deleteConfirmation.xhtml">
- <ui:param name="home" value="#{forumHome}"/>
- <ui:param name="reRender" value="forumListPluginContainer, messageBoxContainer"/>
- </ui:include>
-</s:fragment>
-
<h:form id="forumForm">
<div class="form">
+ <ui:include src="../../includes/statusIndicator.xhtml">
+ <ui:param name="statusId" value="forumFormStatus"/>
+ </ui:include>
+
<div class="formHead">
<h:outputText value="#{forumHome.managed ? messages['forum.label.EditForum'] : messages['forum.label.NewForum']}"/>
</div>
@@ -32,20 +29,20 @@
<s:decorate id="nameDecorate" template="../../includes/formFieldDecorate.xhtml">
<ui:define name="label">#{messages['forum.label.ForumName']}</ui:define>
- <h:inputText size="40" maxlength="255" required="true" tabindex="1" value="#{forumHome.instance.name}">
- <a:support event="onblur" reRender="nameDecorate"/>
+ <h:inputText styleClass="ajaxSupport" size="40" maxlength="255" required="true" tabindex="1" value="#{forumHome.instance.name}">
+ <a:support event="onblur" status="forumFormStatus" reRender="nameDecorate"/>
</h:inputText>
</s:decorate>
<s:decorate id="descriptionDecorate" template="../../includes/formFieldDecorate.xhtml">
<ui:define name="label">#{messages['forum.label.ForumDescription']}</ui:define>
- <h:inputText size="70" maxlength="512" required="false" tabindex="1" value="#{forumHome.instance.description}">
- <a:support event="onblur" reRender="descriptionDecorate"/>
+ <h:inputText styleClass="ajaxSupport" size="70" maxlength="512" required="false" tabindex="1" value="#{forumHome.instance.description}">
+ <a:support event="onblur" status="forumFormStatus" reRender="descriptionDecorate"/>
</h:inputText>
</s:decorate>
<ui:include src="../../includes/accessLevelSelector.xhtml">
- <ui:param name="nodeHome" value="#{forumHome}"/>
+ <ui:param name="home" value="#{forumHome}"/>
</ui:include>
<s:div styleClass="entry">
@@ -55,8 +52,9 @@
<h:outputText value="#{messages['forum.label.EnableFeed']}"/>
<a:commandLink id="resetFeed" reRender="messageBoxContainer"
action="#{forumHome.resetFeed}"
+ status="forumFormStatus"
rendered="#{!empty forumHome.instance.feed}"
- styleClass="buttonNonpersistent">
+ styleClass="buttonNonpersistent sessionEventTrigger">
<h:outputText styleClass="buttonLabel" value="#{messages['forum.button.ResetFeed']}"/>
</a:commandLink>
</div>
@@ -71,29 +69,40 @@
<a:commandLink action="#{forumHome.update}" rendered="#{forumHome.managed}"
reRender="forumListPluginContainer, messageBoxContainer"
+ status="forumFormStatus"
tabindex="1" accesskey="#{messages['forum.button.Update.accesskey']}"
- styleClass="button saveButton">
+ styleClass="button saveButton sessionEventTrigger">
<h:outputText escape="false" styleClass="buttonLabel" value="#{messages['forum.button.Update']}"/>
</a:commandLink>
- <h:outputLink id="delete" value="#" rendered="#{forumHome.managed}"
- tabindex="1" accesskey="#{messages['forum.button.Remove.accesskey']}"
- styleClass="button saveButton"><j4j:idProxy id="openDialogDelete"/>
+
+ <s:fragment rendered="#{forumHome.managed}">
+ <a:jsFunction name="deleteForum"
+ reRender="forumListPluginContainer, messageBoxContainer"
+ status="forumFormStatus"
+ action="#{forumHome.remove}"/>
+ <h:outputLink value="#" tabindex="1"
+ accesskey="#{messages['forum.button.Remove.accesskey']}"
+ onclick="deleteConfirmation('\\'#{forumHome.instance.name}\\'', 'deleteForum')"
+ styleClass="button saveButton sessionEventTrigger">
<h:outputText escape="false" styleClass="buttonLabel" value="#{messages['forum.button.Remove']}"/>
</h:outputLink>
+ </s:fragment>
<a:commandLink action="#{forumHome.persist}" rendered="#{!forumHome.managed}"
reRender="forumListPluginContainer, messageBoxContainer"
+ status="forumFormStatus"
tabindex="1" accesskey="#{messages['forum.button.Save.accesskey']}"
- styleClass="button saveButton">
+ styleClass="button saveButton sessionEventTrigger">
<h:outputText escape="false" styleClass="buttonLabel" value="#{messages['forum.button.Save']}"/>
</a:commandLink>
<a:region>
<a:commandLink action="#{forumHome.cancel}"
immediate="true"
+ status="forumFormStatus"
reRender="forumListPluginContainer, messageBoxContainer"
- tabindex="1" styleClass="buttonNonpersistent"
+ tabindex="1" styleClass="buttonNonpersistent sessionEventTrigger"
accesskey="#{messages['forum.button.Cancel.accesskey']}">
<h:outputText styleClass="buttonLabel" escape="false" value="#{messages['forum.button.Cancel']}"/>
</a:commandLink>
1.3 +53 -68 jboss-seam/examples/wiki/view/plugins/forumList/forumListTable.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: forumListTable.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/plugins/forumList/forumListTable.xhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- forumListTable.xhtml 20 Nov 2007 08:05:13 -0000 1.2
+++ forumListTable.xhtml 19 Dec 2007 04:29:27 -0000 1.3
@@ -14,35 +14,38 @@
<h:dataTable id="forumListTable"
var="f"
value="#{forumQuery.forums}"
- styleClass="datatable topLeftBottomBorder"
- headerClass="regularHeader rightBorder alignCenter"
- columnClasses="onePercentColumn rightBorder alignCenter,
- defaultColumn rightBorder alignLeft,
- fivePercentColumn rightBorder alignCenter,
- fivePercentColumn rightBorder alignCenter,
- tenPercentColumn rightBorder alignCenter,
- tenPercentColumn rightBorder alignCenter"
- rowClasses="rowOdd,rowEven"
+ styleClass="datatable topBorder leftBorder"
+ headerClass="regularHeader rightBorder alignCenter smallFont"
+ columnClasses="onePercentColumn rightBorder bottomBorder alignCenter smallFont,
+ defaultColumn rightBorder bottomBorder alignLeft wrapWhitespace,
+ fivePercentColumn rightBorder bottomBorder alignCenter smallFont,
+ fivePercentColumn rightBorder bottomBorder alignCenter smallFont,
+ tenPercentColumn rightBorder bottomBorder alignCenter smallFont,
+ tenPercentColumn rightBorder bottomBorder alignCenter smallFont"
+ rowClasses="rowOdd"
cellpadding="0" cellspacing="0" border="0">
<h:column>
+ <f:facet name="header"> </f:facet>
<h:panelGroup>
+ <h:outputLink styleClass="undecoratedLink" value="#{wiki:renderURL(f.forum)}" tabindex="1">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.posting_unread.gif" width="22" height="26"
- rendered="#{forumQuery.forumInfo[f.id].unreadPostings}"/>
+ rendered="#{f.unreadPostings}"/>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.posting.gif" width="22" height="26"
- rendered="#{not forumQuery.forumInfo[f.id].unreadPostings}"/>
+ rendered="#{not f.unreadPostings}"/>
+ </h:outputLink>
- <s:span styleClass="forumFeedLink undecoratedLink" rendered="#{not empty f.feed}">
- <h:outputLink value="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{f.feed.id}"
+ <s:span styleClass="forumFeedLink undecoratedLink" rendered="#{not empty f.forum.feed}">
+ <h:outputLink value="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{f.forum.feed.id}"
tabindex="1">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.atom.gif" width="18" height="18"/>
</h:outputLink>
</s:span>
- <s:span styleClass="forumFeedLink" rendered="#{empty f.feed}">
- <h:graphicImage rendered="#{empty f.feed}"
+ <s:span styleClass="forumFeedLink" rendered="#{empty f.forum.feed}">
+ <h:graphicImage rendered="#{empty f.forum.feed}"
value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="18" height="18"/>
</s:span>
@@ -51,97 +54,79 @@
<h:column>
<f:facet name="header">#{messages['forum.label.Forum']}</f:facet>
- <s:div styleClass="undecoratedLink forumTitle">
- <h:outputLink styleClass="undecoratedLink" value="#{wiki:renderURL(f)}" tabindex="1">
- <h:outputText value="#{f.name}"/>
+ <s:div styleClass="undecoratedLink forumTitle extraLargeFont">
+ <h:outputLink styleClass="undecoratedLink" value="#{wiki:renderURL(f.forum)}" tabindex="1">
+ <h:outputText value="#{f.forum.name}"/>
</h:outputLink>
</s:div>
- <s:div styleClass="forumDescription">
- <h:outputText value="#{f.description}"/>
+ <s:div styleClass="forumDescription smallFont" rendered="#{not empty f.forum.description}">
+ <h:outputText value="#{f.forum.description}"/>
</s:div>
</h:column>
<h:column rendered="#{not forumListHome.managed}">
<f:facet name="header">#{messages['forum.label.TopicCount']}</f:facet>
- <h:outputText value="#{forumQuery.forumInfo[f.id].totalNumOfTopics}"
- rendered="#{not empty forumQuery.forumInfo[f.id]}"/>
- <h:outputText value="-" rendered="#{empty forumQuery.forumInfo[f.id]}"/>
+ <h:outputText value="#{f.totalNumOfTopics}"
+ rendered="#{not empty f.totalNumOfTopics}"/>
+ <h:outputText value="-" rendered="#{empty f.totalNumOfTopics}"/>
</h:column>
<h:column rendered="#{not forumListHome.managed}">
<f:facet name="header">#{messages['forum.label.PostCount']}</f:facet>
- <h:outputText value="#{forumQuery.forumInfo[f.id].totalNumOfPosts}"
- rendered="#{not empty forumQuery.forumInfo[f.id]}"/>
- <h:outputText value="-" rendered="#{empty forumQuery.forumInfo[f.id]}"/>
+ <h:outputText value="#{f.totalNumOfPosts}"
+ rendered="#{not empty f.totalNumOfPosts}"/>
+ <h:outputText value="-" rendered="#{empty f.totalNumOfPosts}"/>
</h:column>
<h:column rendered="#{not forumListHome.managed}">
<f:facet name="header">#{messages['forum.label.NewestTopic']}</f:facet>
- <s:fragment rendered="#{not empty forumQuery.forumInfo[f.id].lastTopic}">
+ <s:fragment rendered="#{not empty f.lastTopic}">
<ui:include src="lastTopicPost.xhtml">
- <ui:param name="link" value="#{wiki:renderURL(forumQuery.forumInfo[f.id].lastTopic)}"/>
- <ui:param name="name" value="#{forumQuery.forumInfo[f.id].lastTopic.name}"/>
- <ui:param name="createdOn" value="#{forumQuery.forumInfo[f.id].lastTopic.createdOn}"/>
- <ui:param name="createdBy" value="#{forumQuery.forumInfo[f.id].lastTopic.createdBy}"/>
- <ui:param name="popupId" value="lastTopic#{forumQuery.forumInfo[f.id].lastTopic.id}"/>
+ <ui:param name="link" value="#{wiki:renderURL(f.lastTopic)}"/>
+ <ui:param name="name" value="#{f.lastTopic.name}"/>
+ <ui:param name="createdOn" value="#{f.lastTopic.createdOn}"/>
+ <ui:param name="createdBy" value="#{f.lastTopic.createdBy}"/>
+ <ui:param name="popupId" value="lastTopic#{f.lastTopic.id}"/>
<ui:param name="rightOffset" value="12%"/>
</ui:include>
</s:fragment>
- <s:fragment rendered="#{empty forumQuery.forumInfo[f.id].lastTopic}">
+ <s:fragment rendered="#{empty f.lastTopic}">
-
</s:fragment>
</h:column>
<h:column rendered="#{not forumListHome.managed}">
<f:facet name="header">#{messages['forum.label.LatestPost']}</f:facet>
- <s:fragment rendered="#{forumQuery.forumInfo[f.id].lastPostLastTopic}">
+ <s:fragment rendered="#{f.lastPostLastTopic}">
<ui:include src="lastTopicPost.xhtml">
- <ui:param name="link" value="#{wiki:renderURL(forumQuery.forumInfo[f.id].lastTopic)}"/>
- <ui:param name="name" value="#{forumQuery.forumInfo[f.id].lastTopic.name}"/>
- <ui:param name="createdOn" value="#{forumQuery.forumInfo[f.id].lastTopic.createdOn}"/>
- <ui:param name="createdBy" value="#{forumQuery.forumInfo[f.id].lastTopic.createdBy}"/>
- <ui:param name="popupId" value="latestPost#{forumQuery.forumInfo[f.id].lastTopic.id}"/>
+ <ui:param name="link" value="#{wiki:renderURL(f.lastTopic)}"/>
+ <ui:param name="name" value="#{f.lastTopic.name}"/>
+ <ui:param name="createdOn" value="#{f.lastTopic.createdOn}"/>
+ <ui:param name="createdBy" value="#{f.lastTopic.createdBy}"/>
+ <ui:param name="popupId" value="latestPost#{f.lastTopic.id}"/>
<ui:param name="rightOffset" value="1%"/>
</ui:include>
</s:fragment>
- <s:fragment rendered="#{not empty forumQuery.forumInfo[f.id].lastComment and not forumQuery.forumInfo[f.id].lastPostLastTopic}">
+ <s:fragment rendered="#{not empty f.lastComment and not f.lastPostLastTopic}">
<ui:include src="lastTopicPost.xhtml">
- <ui:param name="link" value="#{wiki:renderCommentURL(forumQuery.forumInfo[f.id].lastComment.document, forumQuery.forumInfo[f.id].lastComment)}"/>
- <ui:param name="name" value="#{forumQuery.forumInfo[f.id].lastComment.subject}"/>
- <ui:param name="createdOn" value="#{forumQuery.forumInfo[f.id].lastComment.createdOn}"/>
- <ui:param name="createdBy" value="#{forumQuery.forumInfo[f.id].lastComment.fromUser}"/>
- <ui:param name="popupId" value="latestPost#{forumQuery.forumInfo[f.id].lastComment.id}"/>
+ <ui:param name="link" value="#{wiki:renderURL(f.lastComment)}"/>
+ <ui:param name="name" value="#{f.lastComment.subject}"/>
+ <ui:param name="createdOn" value="#{f.lastComment.createdOn}"/>
+ <ui:param name="createdBy" value="#{f.lastComment.createdBy}"/>
+ <ui:param name="popupId" value="latestPost#{f.lastComment.id}"/>
<ui:param name="rightOffset" value="1%"/>
</ui:include>
</s:fragment>
- <s:fragment rendered="#{empty forumQuery.forumInfo[f.id].lastComment and not forumQuery.forumInfo[f.id].lastPostLastTopic}">
+ <s:fragment rendered="#{empty f.lastComment and not f.lastPostLastTopic}">
-
</s:fragment>
</h:column>
<h:column rendered="#{forumListHome.managed and not forumHome.showForm}">
- <a:commandLink rendered="#{uiComponent['forumListPlugin:forumListTableForm:forumListTable'].rowIndex != 0}"
- action="#{forumListHome.moveNode(f.displayPosition, f.displayPosition-1)}"
- reRender="forumListTable, messageBoxContainer"
- tabindex="1" styleClass="button">
- <h:outputText styleClass="buttonLabel" value="#{messages['forum.button.MoveUp']}"/>
- </a:commandLink>
- </h:column>
-
- <h:column rendered="#{forumListHome.managed and not forumHome.showForm}">
- <a:commandLink rendered="#{uiComponent['forumListPlugin:forumListTableForm:forumListTable'].rowIndex != uiComponent['forumListPlugin:forumListTableForm:forumListTable'].rowCount-1}"
- action="#{forumListHome.moveNode(f.displayPosition, f.displayPosition+1)}"
- reRender="forumListTable, messageBoxContainer"
- tabindex="1" styleClass="button">
- <h:outputText styleClass="buttonLabel" value="#{messages['forum.button.MoveDown']}"/>
- </a:commandLink>
- </h:column>
-
- <h:column rendered="#{forumListHome.managed and not forumHome.showForm}">
- <a:commandLink action="#{forumHome.edit(f.id)}"
+ <a:commandLink action="#{forumHome.edit(f.forum.id)}"
reRender="forumListControlsContainer, forumListTable, forumFormContainer, messageBoxContainer"
- tabindex="1" styleClass="buttonNonpersistent">
+ tabindex="1" styleClass="buttonNonpersistent sessionEventTrigger">
<h:outputText styleClass="buttonLabel" value="#{messages['forum.button.Edit']}"/>
</a:commandLink>
1.2 +5 -17 jboss-seam/examples/wiki/view/plugins/forumList/lastTopicPost.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: lastTopicPost.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/plugins/forumList/lastTopicPost.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- lastTopicPost.xhtml 9 Nov 2007 15:00:29 -0000 1.1
+++ lastTopicPost.xhtml 19 Dec 2007 04:29:27 -0000 1.2
@@ -10,31 +10,19 @@
<s:div>
<h:outputLink value="#{link}" tabindex="1">
- <h:outputText value="#{wiki:truncateString(name, 25, '...')}"/>
+ <h:outputText value="#{wiki:truncateString(name, 15, '...')}"/>
<h:graphicImage styleClass="topicGotoIcon" value="/themes/#{wikiPreferences.themeName}/img/icon.posting_goto.gif" width="18" height="9"/>
</h:outputLink>
</s:div>
<s:div>
<h:outputText value="#{createdOn}">
- <f:convertDateTime type="both" timeZone="#{wikiPreferences.timeZone}"/>
+ <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
</h:outputText>
</s:div>
- <s:fragment rendered="#{wiki:isRegularUser(createdBy)}">
- <s:div styleClass="undecoratedLink">
- <h:outputLink value="#"
- onclick="jQuery('#userInfoPopup#{popupId}').jqmShow().css({left:'#{leftOffset}', right:'#{rightOffset}'});">
- <h:outputText value="#{createdBy.fullname}"/>
- </h:outputLink>
- </s:div>
- <ui:include src="../forumPosting/userInfoPopup.xhtml">
+ <ui:include src="../../includes/userInfoLink.xhtml">
<ui:param name="user" value="#{createdBy}"/>
- <ui:param name="userInfoPopupId" value="#{popupId}"/>
</ui:include>
- </s:fragment>
- <s:div rendered="#{not wiki:isRegularUser(createdBy)}">
- <h:outputText value="#{createdBy.fullname}"/>
- </s:div>
</s:fragment>
\ No newline at end of file
1.2 +0 -8 jboss-seam/examples/wiki/view/plugins/forumList/plugin.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: plugin.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/plugins/forumList/plugin.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- plugin.xhtml 9 Nov 2007 15:00:29 -0000 1.1
+++ plugin.xhtml 19 Dec 2007 04:29:27 -0000 1.2
@@ -10,14 +10,6 @@
<s:span id="forumListPluginContainer">
- <script type="text/javascript">jQuery(function() {
- jQuery(".userInfoPopupContainer")
- .jqm({trigger: false, overlay: 0});
- });</script>
- <script type="text/javascript">jQuery(function() {
- wrapBoxes();
- });</script>
-
<ui:include src="forumListControls.xhtml"/>
<ui:include src="forumForm.xhtml"/>
1.2 +9 -2 jboss-seam/examples/wiki/view/plugins/forumList/forumListControls.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: forumListControls.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/plugins/forumList/forumListControls.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- forumListControls.xhtml 9 Nov 2007 15:00:29 -0000 1.1
+++ forumListControls.xhtml 19 Dec 2007 04:29:27 -0000 1.2
@@ -23,6 +23,8 @@
<h:form rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}">
<s:fragment rendered="#{not forumListHome.managed}">
+ <script type="text/javascript">stopSessionTimeoutCheck();</script>
+
<h:panelGroup>
<a:commandLink action="#{forumListHome.manage()}"
@@ -36,6 +38,10 @@
</s:fragment>
+<s:fragment rendered="#{forumListHome.managed}">
+ <script type="text/javascript">startSessionTimeoutCheck();</script>
+</s:fragment>
+
<s:fragment rendered="#{forumListHome.managed and not forumHome.showForm}">
<h:panelGroup>
@@ -43,19 +49,20 @@
<a:commandLink action="#{forumHome.newForum()}"
reRender="forumListPluginContainer, messageBoxContainer"
accesskey="#{messages['forum.button.NewForum.accesskey']}"
- tabindex="1" styleClass="buttonNonpersistent">
+ tabindex="1" styleClass="buttonNonpersistent sessionEventTrigger">
<h:outputText styleClass="buttonLabel" escape="false" value="#{messages['forum.button.NewForum']}"/>
</a:commandLink>
<h:outputLink value="#{wiki:renderURL(currentDirectory)}"
accesskey="#{messages['forum.button.Exit.accesskey']}"
- tabindex="1" styleClass="buttonNonpersistent">
+ tabindex="1" styleClass="buttonNonpersistent sessionEventTrigger">
<h:outputText styleClass="buttonLabel" escape="false" value="#{messages['forum.button.Exit']}"/>
</h:outputLink>
</h:panelGroup>
</s:fragment>
+
</h:form>
</s:div>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list