Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4811 - in labs/jbossforums/trunk/forums/src: main/org/jboss/portlet/forums/ui/action resources/portal-forums-war/WEB-INF resources/portal-forums-war/views/forums resources/portal-forums-war/views/moderator resources/portal-forums-war/views/topics
|
From: <jbo...@li...> - 2006-06-24 10:04:24
|
Author: unibrew
Date: 2006-06-24 06:04:17 -0400 (Sat, 24 Jun 2006)
New Revision: 4811
Modified:
labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
Log:
[JBFORUMS-44] Working on pagination, bundle issues, authorization.
Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java 2006-06-23 05:35:41 UTC (rev 4810)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java 2006-06-24 10:04:17 UTC (rev 4811)
@@ -170,6 +170,7 @@
{
JSFUtil.handleException(e);
}
+ System.out.println("HEEEEEELLLLLLLLLLOOOOOOOOOOOOO");
return "success";
}
@@ -263,6 +264,7 @@
FacesContext.getCurrentInstance().addMessage("message",
new FacesMessage(FacesMessage.SEVERITY_INFO,message, "moderate"));
this.forum = BaseController.getForumsModule().findForumById(forum.getId());
+
checkboxes=new HashMap();
} catch (Exception e)
{
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml 2006-06-23 05:35:41 UTC (rev 4810)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml 2006-06-24 10:04:17 UTC (rev 4811)
@@ -78,7 +78,11 @@
<key>message</key>
<value>/views/profile/usermessage_body.jsf</value>
</map-entry>
- </map-entries>
+ <map-entry>
+ <key>moderator</key>
+ <value>/views/moderator/modcp_body.jsf</value>
+ </map-entry>
+ </map-entries>
</managed-property>
</managed-bean>
@@ -280,7 +284,12 @@
<managed-bean-name>moderator</managed-bean-name>
<managed-bean-class>org.jboss.portlet.forums.ui.action.ModeratorAction</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
+ <managed-property>
+ <property-name>userPreferences</property-name>
+ <property-class>org.jboss.portlet.forums.ui.action.PreferenceController</property-class>
+ <value>#{prefController}</value>
+ </managed-property>
+ </managed-bean>
<navigation-rule>
<from-view-id>/views/moderator/modcp_body.xhtml</from-view-id>
<navigation-case>
@@ -289,7 +298,7 @@
</navigation-case>
<navigation-case>
<from-outcome>confirmMove</from-outcome>
- <to-view-id>/views/moderator/move_topic.xhtml</to-view-id>
+ <to-view-id>/views/moderator/modcp_move.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
@@ -366,13 +375,27 @@
<to-view-id>/views/admin/index.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
-
+ <navigation-rule>
+ <from-view-id>/views/pref/index.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>success</from-outcome>
+ <to-view-id>/views/category/viewcategory_body.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/views/moderator/modcp_move.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>success</from-outcome>
+ <to-view-id>/views/moderator/modcp_body.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
<!-- managedBean for the user preference usecase -->
<managed-bean>
<managed-bean-name>prefController</managed-bean-name>
<managed-bean-class>org.jboss.portlet.forums.ui.action.PreferenceController</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
+ <managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>defaultPreferences</property-name>
<map-entries>
@@ -428,19 +451,4 @@
</map-entries>
</managed-property>
</managed-bean>
- <navigation-rule>
- <from-view-id>/views/pref/index.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>success</from-outcome>
- <to-view-id>/views/category/viewcategory_body.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
-
- <managed-bean>
- <managed-bean-name>deleteTopic</managed-bean-name>
- <managed-bean-class>org.jboss.portlet.forums.ui.action.DeleteTopic</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
-
</faces-config>
\ No newline at end of file
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml 2006-06-23 05:35:41 UTC (rev 4810)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml 2006-06-24 10:04:17 UTC (rev 4811)
@@ -98,14 +98,14 @@
<td align="right" valign="middle" nowrap="nowrap">
<span class="gensmall"></span><br/>
<span class="nav">
- Goto page
+ {resource.Goto_page}
<!-- previous link -->
<c:if test="#{forum.pageNavigator.pageNumber gt 1}">
&nbsp;&nbsp;
<h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
<f:param name="f" value="#{forum.forum.id}"/>
<f:param name="page" value="#{forum.pageNavigator.currentPage-1}"/>
- <h:outputText value="Previous"/>
+ <h:outputText value="${resource.Previous}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -133,7 +133,7 @@
<h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
<f:param name="f" value="#{forum.forum.id}"/>
<f:param name="page" value="#{forum.pageNavigator.currentPage+1}"/>
- <h:outputText value="Next"/>
+ <h:outputText value="${resource.Next}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -522,14 +522,14 @@
<td align="right" valign="middle" nowrap="nowrap">
<span class="gensmall"></span><br/>
<span class="nav">
- Goto page
+ ${resource.Goto_page}
<!-- previous link -->
<c:if test="#{forum.pageNavigator.pageNumber gt 1}">
&nbsp;&nbsp;
<h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
<f:param name="f" value="#{forum.forum.id}"/>
<f:param name="page" value="#{forum.pageNavigator.currentPage-1}"/>
- <h:outputText value="Previous"/>
+ <h:outputText value="${resource.Previous}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -557,7 +557,7 @@
<h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
<f:param name="f" value="#{forum.forum.id}"/>
<f:param name="page" value="#{forum.pageNavigator.currentPage+1}"/>
- <h:outputText value="Next"/>
+ <h:outputText value="${resource.Next}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -573,7 +573,12 @@
<tr>
<td align="left" colspan="3">
<span class="nav">
- Page <b>#{forum.pageNavigator.pageNumber}</b> of <b>#{forum.pageNavigator.totalPages}</b>
+ <b>
+ <h:outputFormat value="#{resource.PageNumber}">
+ <f:param value="${forum.pageNavigator.pageNumber}"/>
+ <f:param value="${forum.pageNavigator.totalPages}"/>
+ </h:outputFormat>
+ </b>
</span>
</td>
</tr>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml 2006-06-23 05:35:41 UTC (rev 4810)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml 2006-06-24 10:04:17 UTC (rev 4811)
@@ -33,6 +33,8 @@
<ui:define name="mainContent">
<c:choose>
<c:when test="#{moderator.initialized && moderator.forum!=null && moderator.forum.id!=-1}">
+
+<forums:isAllowed fragment="acl://moderateForum" contextData="#{moderator.forum}">
<h:messages layout="table" infoStyle="color:green"
warnStyle="color:red"/>
<h:form>
@@ -49,14 +51,12 @@
</h:outputLink>
</span>
</td>
- </tr>
- <tr>
<!-- page navigation -->
<c:if test="#{moderator.pageNavigator.totalPages gt 1}">
<td align="right" valign="middle" nowrap="nowrap">
<br/>
<span class="nav">
- Goto page
+ ${resource.Goto_page}
<!-- previous link -->
<c:if test="#{moderator.pageNavigator.pageNumber gt 1}">
&nbsp;&nbsp;
@@ -64,7 +64,7 @@
<f:param name="f" value="#{moderator.forum.id}"/>
<f:param name="page"
value="#{moderator.pageNavigator.currentPage-1}"/>
- <h:outputText value="Previous"/>
+ <h:outputText value="${resource.Previous}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -95,7 +95,7 @@
<f:param name="f" value="#{moderator.forum.id}"/>
<f:param name="page"
value="#{moderator.pageNavigator.currentPage+1}"/>
- <h:outputText value="Next"/>
+ <h:outputText value="${resource.Next}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -158,44 +158,102 @@
<h:commandButton action="#{moderator.deleteConfirm}"
class="liteoption"
value="${resource.Delete}">
- <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="f" value="#{moderator.forum.id}"/>
</h:commandButton>
&nbsp;
<h:commandButton action="#{moderator.moveConfirm}"
class="liteoption"
value="${resource.Move}">
- <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="f" value="#{moderator.forum.id}"/>
</h:commandButton>
&nbsp;
<h:commandButton action="#{moderator.lockTopic}"
class="liteoption"
value="${resource.Lock}">
- <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="f" value="#{moderator.forum.id}"/>
</h:commandButton>
&nbsp;
<h:commandButton action="#{moderator.unlockTopic}"
class="liteoption"
value="${resource.Unlock}">
- <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="f" value="#{moderator.forum.id}"/>
</h:commandButton>
</td>
</tr>
</table>
- <table width="100%" cellspacing="2" border="0" align="center"
- cellpadding="2">
- <!--<tr>
- <td align="left" valign="middle">
- <span class="nav">
- <b>#{moderator.pagination}</b>
- </span>
- </td>
- <td align="right" valign="top" nowrap="nowrap">
- <br/>
- <span class="nav">#{moderator.pageNumber}</span>
- </td>
- </tr>-->
- </table>
- </h:form>
+ <table width="100%" cellspacing="2" border="0" align="center"
+ cellpadding="2">
+ <tr>
+ <!-- the current page number information -->
+ <c:if test="#{moderator.pageNavigator.totalPages gt 1}">
+ <td align="left" colspan="3">
+ <span class="nav">
+ <b>
+ <h:outputFormat value="#{resource.PageNumber}">
+ <f:param value="${moderator.pageNavigator.pageNumber}"/>
+ <f:param value="${moderator.pageNavigator.totalPages}"/>
+ </h:outputFormat>
+ </b>
+ </span>
+ </td>
+ </c:if>
+ <!-- page navigation -->
+ <c:if test="#{moderator.pageNavigator.totalPages gt 1}">
+ <td align="right" valign="middle" nowrap="nowrap">
+ <br/>
+ <span class="nav">
+ ${resource.Goto_page}
+ <!-- previous link -->
+ <c:if test="#{moderator.pageNavigator.pageNumber gt 1}">
+ &nbsp;&nbsp;
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f"
+ value="#{moderator.forum.id}"/>
+ <f:param name="page"
+ value="#{moderator.pageNavigator.currentPage-1}"/>
+ <h:outputText value="${resource.Previous}"/>
+ </h:outputLink>
+ &nbsp;&nbsp;
+ </c:if>
+ <!-- actual pages -->
+ <c:forEach items="#{moderator.pageNavigator.pages}"
+ var="page" varStatus="idx">
+ <c:choose>
+ <c:when test="#{moderator.pageNavigator.pageNumber==page}">
+ <b>${page}</b>
+ </c:when>
+ <c:otherwise>
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f"
+ value="#{moderator.forum.id}"/>
+ <f:param name="page"
+ value="#{page-1}"/>
+ <h:outputText value="${page}"/>
+ </h:outputLink>
+ </c:otherwise>
+ </c:choose>
+ <c:if test="${idx.index-1 ne moderator.pageNavigator.totalPages-1}">
+ <f:verbatim>,</f:verbatim>
+ </c:if>
+ </c:forEach>
+ <!-- Next link -->
+ <c:if test="#{moderator.pageNavigator.pageNumber lt moderator.pageNavigator.totalPages}">
+ &nbsp;&nbsp;
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f"
+ value="#{moderator.forum.id}"/>
+ <f:param name="page"
+ value="#{moderator.pageNavigator.currentPage+1}"/>
+ <h:outputText value="${resource.Next}"/>
+ </h:outputLink>
+ &nbsp;&nbsp;
+ </c:if>
+ </span>
+ </td>
+ </c:if>
+ </tr>
+ </table>
+ </h:form>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="right">
@@ -203,29 +261,9 @@
</td>
</tr>
</table>
- </c:when>
- <c:otherwise>
- <table class="forumline" width="100%" cellspacing="1" cellpadding="4" border="0">
- <tr>
- <td>
- <table width="100%" cellspacing="0" cellpadding="1" border="0">
- <tr>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td align="center">
- <span class="gen">This forum has no posts....</span>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </c:otherwise>
- </c:choose>
+ </forums:isAllowed>
+</c:when>
+</c:choose>
</ui:define>
</ui:composition>
</div>
\ No newline at end of file
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml 2006-06-23 05:35:41 UTC (rev 4810)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml 2006-06-24 10:04:17 UTC (rev 4811)
@@ -52,14 +52,14 @@
<td align="right" valign="middle" nowrap="nowrap">
<span class="gensmall"></span><br/>
<span class="nav">
- Goto page
+ ${resource.Goto_page}
<!-- previous link -->
<c:if test="#{topic.pageNavigator.pageNumber gt 1}">
&nbsp;&nbsp;
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
<f:param name="t" value="#{topic.topic.id}"/>
<f:param name="page" value="#{topic.pageNavigator.currentPage-1}"/>
- <h:outputText value="Previous"/>
+ <h:outputText value="${resource.Previous}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -87,7 +87,7 @@
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
<f:param name="t" value="#{topic.topic.id}"/>
<f:param name="page" value="#{topic.pageNavigator.currentPage+1}"/>
- <h:outputText value="Next"/>
+ <h:outputText value="${resource.Next}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -614,14 +614,14 @@
<td align="right" valign="middle" nowrap="nowrap">
<span class="gensmall"></span><br/>
<span class="nav">
- Goto page
+ ${resource.Goto_page}
<!-- previous link -->
<c:if test="#{topic.pageNavigator.pageNumber gt 1}">
&nbsp;&nbsp;
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
<f:param name="t" value="#{topic.topic.id}"/>
<f:param name="page" value="#{topic.pageNavigator.currentPage-1}"/>
- <h:outputText value="Previous"/>
+ <h:outputText value="${resource.Previous}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -649,7 +649,7 @@
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
<f:param name="t" value="#{topic.topic.id}"/>
<f:param name="page" value="#{topic.pageNavigator.currentPage+1}"/>
- <h:outputText value="Next"/>
+ <h:outputText value="${resource.Next}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -665,7 +665,12 @@
<tr>
<td align="left" colspan="3">
<span class="nav">
- Page <b>#{topic.pageNavigator.pageNumber}</b> of <b>#{topic.pageNavigator.totalPages}</b>
+ <b>
+ <h:outputFormat value="#{resource.PageNumber}">
+ <f:param value="${topic.pageNavigator.pageNumber}"/>
+ <f:param value="${topic.pageNavigator.totalPages}"/>
+ </h:outputFormat>
+ </b>
</span>
</td>
</tr>
@@ -777,7 +782,7 @@
</tr>
<tr>
<td align="center">
- <span class="gen">This topic has no posts....</span>
+ <span class="gen">${resource.No_posts_topic}</span>
</td>
</tr>
<tr>
|
