[Jboss-svn-commits] JBL Code SVN: r4842 - in labs/jbossforums/trunk/forums/src: main/org/jboss/portlet/forums/ui/action resources/portal-forums-war/WEB-INF resources/portal-forums-war/views/moderator resources/portal-forums-war/views/topics

[<jbo...@li...>]

Author: unibrew
Date: 2006-06-27 20:17:45 -0400 (Tue, 27 Jun 2006)
New Revision: 4842

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/moderator/modcp_body.xhtml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
Log:
[JBFORUMS-94] Integrating move and delete topic actions into TopicView usecase.

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-27 21:13:44 UTC (rev 4841)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java	2006-06-28 00:17:45 UTC (rev 4842)
@@ -38,6 +38,7 @@
 import javax.faces.component.html.HtmlInputHidden;
 import javax.faces.context.FacesContext;
 
+import org.jboss.portlet.forums.ForumsModuleExtension;
 import org.jboss.portlet.forums.model.Forum;
 import org.jboss.portlet.forums.model.Topic;
 import org.jboss.portlet.forums.theme.FolderType;
@@ -138,7 +139,7 @@
     //ui actions supported by this bean----------------------------------------------------------------------------------------------------
     
     public String deleteTopic () 
-    {
+    {  
         Iterator it = checkboxes.keySet().iterator();
         String message="";     
         try {
@@ -157,46 +158,40 @@
                 {
                     message = bundle.getString("ERR_CANNOT_REMOVE_TOPIC");
                     FacesContext.getCurrentInstance().addMessage("message",
-                        new FacesMessage(FacesMessage.SEVERITY_ERROR,message,"moderate"));
+                        new FacesMessage(FacesMessage.SEVERITY_WARN,message,"moderate"));
                     return "success";
                 }        
             }
             message = bundle.getString("SUCC_TOPIC_REMOVED");
             FacesContext.getCurrentInstance().addMessage("message",
                 new FacesMessage(FacesMessage.SEVERITY_INFO,message, "moderate"));
-            this.forum = BaseController.getForumsModule().findForumById(forum.getId());
-            checkboxes=new HashMap();
+            
         } catch (Exception e) 
         {
             JSFUtil.handleException(e);
         }
-        System.out.println("HEEEEEELLLLLLLLLLOOOOOOOOOOOOO");
         return "success";
     }
     
     public String moveTopic () 
     {
-        System.out.println("HELLO WORLD");
         String message="";
         String forum_to_id = ForumUtil.getParameter(Constants.p_forum_to_id);
         if (forum_to_id==null || forum_to_id.trim().compareToIgnoreCase("-1")==0) 
         {
-            System.out.println("HELLO WORLD2");
             message = bundle.getString("ERR_NO_DEST_FORUM");
             FacesContext.getCurrentInstance().addMessage("message",
-                new FacesMessage(FacesMessage.SEVERITY_ERROR,message,"moderate"));
+                new FacesMessage(FacesMessage.SEVERITY_WARN,message,"moderate"));
             return "success";
         }
         Forum forumDest=null;
         try {
             forumDest = this.getForumsModule().findForumById(new Integer(forum_to_id));
-            System.out.println("HELLO WORLD3");
         } catch (Exception e) 
         {
-            System.out.println("HELLO WORL4");
             message = bundle.getString("ERR_INTERNAL");
             FacesContext.getCurrentInstance().addMessage("message",
-                new FacesMessage(FacesMessage.SEVERITY_ERROR,message,"moderate"));
+                new FacesMessage(FacesMessage.SEVERITY_WARN,message,"moderate"));
             return "success";
         }
         Iterator it = checkboxes.keySet().iterator();
@@ -209,16 +204,14 @@
                 {
                     Topic topic = null;
                     try {   
-                        System.out.println("HELLO WORLD5");
                         topic = getForumsModule().findTopicById(topicId);
                     } catch(Exception e)
                     {
                         message = bundle.getString("ERR_INTERNAL");
                         FacesContext.getCurrentInstance().addMessage("message",
-                            new FacesMessage(FacesMessage.SEVERITY_ERROR,message,"moderate"));
+                            new FacesMessage(FacesMessage.SEVERITY_WARN,message,"moderate"));
                         return "success";
                     }
-                    System.out.println("HELLO WORLD6");
                     forumDest.addTopic(topic);
                 }
             }
@@ -256,7 +249,7 @@
                     {
                         message = bundle.getString("ERR_INTERNAL");
                         FacesContext.getCurrentInstance().addMessage("message",
-                            new FacesMessage(FacesMessage.SEVERITY_ERROR,message,"moderate"));
+                            new FacesMessage(FacesMessage.SEVERITY_WARN,message,"moderate"));
                         return "";
                     }        
                 }
@@ -275,7 +268,7 @@
         {
             String message = bundle.getString("None_selected");
             FacesContext.getCurrentInstance().addMessage("message",
-                new FacesMessage(FacesMessage.SEVERITY_ERROR,message,"moderate"));
+                new FacesMessage(FacesMessage.SEVERITY_WARN,message,"moderate"));
             return "";
         }
         
@@ -303,13 +296,13 @@
                     {
                         message = bundle.getString("ERR_INTERNAL");
                         FacesContext.getCurrentInstance().addMessage("message",
-                            new FacesMessage(FacesMessage.SEVERITY_ERROR,message,"moderate"));
+                            new FacesMessage(FacesMessage.SEVERITY_WARN,message,"moderate"));
                         return "";
                     }        
                 }
                 message = bundle.getString("SUCC_TOPIC_UNLOCKED");
                 FacesContext.getCurrentInstance().addMessage("message",
-                    new FacesMessage(FacesMessage.SEVERITY_INFO,message, "moderate"));
+                    new FacesMessage(FacesMessage.SEVERITY_WARN,message, "moderate"));
                 this.forum = BaseController.getForumsModule().findForumById(forum.getId());
                 checkboxes=new HashMap();
             } catch (Exception e) 
@@ -321,7 +314,7 @@
         {
             String message = bundle.getString("None_selected");
             FacesContext.getCurrentInstance().addMessage("message",
-                new FacesMessage(FacesMessage.SEVERITY_ERROR,message,"moderate"));
+                new FacesMessage(FacesMessage.SEVERITY_WARN,message,"moderate"));
             return "";
         }
     }
@@ -335,7 +328,7 @@
         {
             String message = bundle.getString("None_selected");
             FacesContext.getCurrentInstance().addMessage("message",
-                new FacesMessage(FacesMessage.SEVERITY_ERROR,message,"moderate"));
+                new FacesMessage(FacesMessage.SEVERITY_WARN,message,"moderate"));
             return "";
         }
     }
@@ -349,21 +342,33 @@
         {
             String message = bundle.getString("None_selected");
             FacesContext.getCurrentInstance().addMessage("message",
-                new FacesMessage(FacesMessage.SEVERITY_ERROR,message,"moderate"));
+                new FacesMessage(FacesMessage.SEVERITY_WARN,message,"moderate"));
             return "";
         }
     }
     
     private boolean isAnyCheckboxSelected() 
     {
-        Iterator it = checkboxes.keySet().iterator();
-        while (it.hasNext()) 
-        {
-            if (((Boolean)checkboxes.get(it.next())).booleanValue()) 
+        // Looking for selected topicId's in checkboxes Map
+        if (checkboxes!=null && checkboxes.size()!=0) {
+            Iterator it = checkboxes.keySet().iterator();
+            while (it.hasNext()) 
             {
-                return true;
+                if (((Boolean)checkboxes.get(it.next())).booleanValue()) 
+                {
+                    return true;
+                }
             }
         }
+        
+        // Looking for topicId sent in parameter
+        String topicId = ForumUtil.getParameter(Constants.p_topicId);
+        
+        if (topicId!=null && topicId.trim().length()>0){    
+            checkboxes = new HashMap(1);
+            checkboxes.put(new Integer(topicId),Boolean.TRUE);
+            return true;
+        }
         return false;
     }
     
@@ -382,7 +387,6 @@
        {
            JSFUtil.handleException(e);
        }
-       System.out.println ("INITIALIZED: "+initialized);
        return initialized;
     }
     
@@ -394,8 +398,7 @@
         Locale locale = uiRoot.getLocale();
         ClassLoader ldr = Thread.currentThread().getContextClassLoader();
         this.bundle = ResourceBundle.getBundle("ResourceJSF", locale, ldr);
-        
-        
+               
         int currentPage = 0;
         //parse the input parameters
         String pageParam = ForumUtil.getParameter(Constants.p_page);
@@ -405,34 +408,52 @@
             currentPage = Integer.parseInt(pageParam);                                           
         }
         
+        // trying to get forumId from request parameter
         int forumId = -1;
         String f = ForumUtil.getParameter(Constants.p_forumId);
         
         if(f!=null && f.trim().length()>0)
         {
             forumId = Integer.parseInt(f);
+            System.out.println("HELLO 1");
         }
-        
+
+        checkboxes=new HashMap();
+
         //grab the data to be displayed for this page
         if(forumId!=-1)
         {
             //setup the business objects like the forum, topics etc that will be displayed
             this.forum = BaseController.getForumsModule().findForumById(new Integer(forumId));
             Object[] topicObjects = this.forum.getTopics().toArray();
-            checkboxes=new HashMap();
-            System.out.println("TOPIC OBJ: "+topicObjects);
-            System.out.println("USER PREF: "+Integer.parseInt(this.userPreferences.getPreference(Constants.TOPICS_FORUM_KEY)));
-            System.out.println("CurrPage: "+currentPage);
             //setup the pageNavigator for this forum
             this.pageNavigator = new PageNavigator(
              topicObjects, //total number of entries to be split up into pages
              Integer.parseInt(this.userPreferences.getPreference(Constants.TOPICS_FORUM_KEY)), 
              currentPage //currently selected page being displayed, first page by default
             );
-            
+            System.out.println("HELLO 2");
             this.page = this.pageNavigator.getPage();
-
+        } else {
+            // trying to get forumId from topicId read from request
+            int topicId;
+            String t = ForumUtil.getParameter(Constants.p_topicId);
+            if (t!=null && t.trim().length()>0) {
+                Topic topic = this.getForumsModule().findTopicById(new Integer(t));
+                this.forum = topic.getForum();
+                Object[] topicObjects = this.forum.getTopics().toArray();
+                //setup the pageNavigator for this forum
+                this.pageNavigator = new PageNavigator(
+                 topicObjects, //total number of entries to be split up into pages
+                 Integer.parseInt(this.userPreferences.getPreference(Constants.TOPICS_FORUM_KEY)), 
+                 currentPage //currently selected page being displayed, first page by default
+                );
+                this.page = this.pageNavigator.getPage();
+            }
+            System.out.println("HELLO 3");
         }
+        
+        System.out.println("FORUM: "+this.forum);
     }
 
     

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-27 21:13:44 UTC (rev 4841)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml	2006-06-28 00:17:45 UTC (rev 4842)
@@ -155,7 +155,15 @@
 		<navigation-case>
 			<from-outcome>instantReply</from-outcome>
 			<to-view-id>/views/topics/viewtopic_body.xhtml</to-view-id>
-		</navigation-case>		
+		</navigation-case>
+                <navigation-case>
+			<from-outcome>confirmDelete</from-outcome>
+			<to-view-id>/views/moderator/delete_topic.xhtml</to-view-id>
+		</navigation-case>
+                <navigation-case>
+			<from-outcome>confirmMove</from-outcome>
+			<to-view-id>/views/moderator/modcp_move.xhtml</to-view-id>
+		</navigation-case>
 	 </navigation-rule>	  
     
     <!-- configuration for NewTopic -->
@@ -306,7 +314,7 @@
             <navigation-case>
                 <from-outcome>success</from-outcome>
                 <to-view-id>/views/moderator/modcp_body.xhtml</to-view-id>
-  </navigation-case>
+            </navigation-case>
         </navigation-rule>
 	 
 	 <!-- managedBean for deletePost usecase -->

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-27 21:13:44 UTC (rev 4841)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml	2006-06-28 00:17:45 UTC (rev 4842)
@@ -22,7 +22,6 @@
 */
 -->
 
-
 <div xmlns="http://www.w3.org/1999/xhtml"
      xmlns:ui="http://java.sun.com/jsf/facelets"
      xmlns:c="http://java.sun.com/jstl/core"
@@ -31,239 +30,227 @@
      xmlns:forums="http://www.jboss.com/products/jbossportal/forums" class="bb">
 <ui:composition template="/views/common/common.xhtml">
 <ui:define name="mainContent">
-<c:choose> 
-   <c:when test="#{moderator.initialized &amp;&amp; moderator.forum!=null &amp;&amp; moderator.forum.id!=-1}">
-   
-<forums:isAllowed fragment="acl://moderateForum" contextData="#{moderator.forum}"> 
- <h:messages layout="table" infoStyle="color:green"
-             warnStyle="color:red"/>
- <h:form>
-    <table width="100%" cellspacing="2" cellpadding="2" border="0"
-           align="center">
-       <tr>
-          <td align="left">
-             <span class="nav">
-                -&gt;
-                <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}"
-                              styleClass="nav">
-                   <f:param name="f" value="#{moderator.forum.id}"/>
-                   <h:outputText value="#{moderator.forum.name}"/>
-                </h:outputLink>
-             </span>
-          </td>
-          <!-- 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}">
-                      &amp;nbsp;&amp;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>
-                      &amp;nbsp;&amp;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}">
-                      &amp;nbsp;&amp;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>
-                      &amp;nbsp;&amp;nbsp;
-                   </c:if>
-                </span>
-             </td>
-          </c:if>
-       </tr>
-    </table>
-    <table width="100%" cellpadding="4" cellspacing="1" border="0"
-           class="forumline">
-       <tr>
-          <td class="catHead" colspan="5" align="center" height="28">
-             <span class="cattitle">${resource.Mod_CP}</span>
-          </td>
-       </tr>
-       <tr>
-          <td class="spaceRow" colspan="5" align="center">
-             <span class="gensmall">${resource.Mod_CP_explain}</span>
-          </td>
-       </tr>
-       <tr>
-          <th width="4%" class="thLeft" nowrap="nowrap">&amp;nbsp;</th>
-          <th nowrap="nowrap">&amp;nbsp;${resource.Topics}&amp;nbsp;</th>
-          <th width="8%" nowrap="nowrap">&amp;nbsp;${resource.Replies}&amp;nbsp;</th>
-          <th width="17%" nowrap="nowrap">&amp;nbsp;${resource.Last_Post}&amp;nbsp;</th>
-          <th width="5%" class="thRight" nowrap="nowrap">&amp;nbsp;${resource.Select}&amp;nbsp;</th>
-       </tr>
-       <c:forEach items="#{moderator.page}" var="topicrow">
-          <tr>
-             <td class="row1" align="center" valign="middle">
-                <img src="#{forums:folderTypeURL(topicrow,moderator.anonymous)}"
-                     width="19" height="18"
-                     alt="${resource.Topic_Moved}"
-                     title="${resource.Topic_Moved}"/>
-             </td>
-             <td class="row1">
-                &amp;nbsp;
-                <span class="topictitle">
-                   ${forums:folderType(topicrow)}
-                   <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}"
-                                 styleClass="topictitle">
-                      <f:param name="t" value="${topicrow.id}"/>
-                      <h:outputText value="${topicrow.subject}"/>
-                   </h:outputLink>
-                </span>
-             </td>
-             <td class="row2" align="center" valign="middle">
-                <span class="postdetails">${topicrow.replies}</span>
-             </td>
-             <td class="row1" align="center" valign="middle">
-                <span class="postdetails">${topicrow.lastPostDate}</span>
-             </td>
-             <td class="row2" align="center" valign="middle">
-                <h:selectBooleanCheckbox value="#{moderator.checkboxes[topicrow.id]}"/>
-             </td>
-          </tr>
-       </c:forEach>
-       <tr align="right">
-          <td class="catBottom" colspan="5" height="29">
-             <h:commandButton action="#{moderator.deleteConfirm}"
-                              class="liteoption"
-                              value="${resource.Delete}">
-                <f:param name="f" value="#{moderator.forum.id}"/>
-             </h:commandButton>
-             &amp;nbsp;
-             <h:commandButton action="#{moderator.moveConfirm}"
-                              class="liteoption"
-                              value="${resource.Move}">
-                <f:param name="f" value="#{moderator.forum.id}"/>
-             </h:commandButton>
-             &amp;nbsp;
-             <h:commandButton action="#{moderator.lockTopic}"
-                              class="liteoption"
-                              value="${resource.Lock}">
-                <f:param name="f" value="#{moderator.forum.id}"/>
-             </h:commandButton>
-             &amp;nbsp;
-             <h:commandButton action="#{moderator.unlockTopic}"
-                              class="liteoption"
-                              value="${resource.Unlock}">
-                <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>
-                        <!-- 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 test="#{moderator.initialized &amp;&amp; moderator.forum!=null &amp;&amp; moderator.forum.id!=-1}">
+   <forums:isAllowed fragment="acl://moderateForum" contextData="#{moderator.forum}">
+      <h:messages layout="table" infoStyle="color:green" warnStyle="color:red"/>
+      <h:form>
+         <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
+            <tr>
+               <td align="left">
+                  <span class="nav">
+                     -&gt;&amp;nbsp;
+                     <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}"
+                                   styleClass="nav">
+                        <f:param name="f"
+                                 value="#{moderator.forum.id}"/>
+                        <h:outputText value="#{moderator.forum.name}"/>
+                     </h:outputLink>
+                  </span>
+               </td>
+               <!-- 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}">
+                           &amp;nbsp;&amp;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>
+                           &amp;nbsp;&amp;nbsp;
                         </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}">
-                                    &amp;nbsp;&amp;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>
-                                    &amp;nbsp;&amp;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}">
-                                    &amp;nbsp;&amp;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>
-                                    &amp;nbsp;&amp;nbsp;
-                                 </c:if>
-                              </span>
-                           </td>
+                        <!-- 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}">
+                           &amp;nbsp;&amp;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>
+                           &amp;nbsp;&amp;nbsp;
                         </c:if>
-                     </tr>
-                  </table>
-               </h:form>
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
-    <tr>
-       <td align="right">
-          <ui:include src="/views/jumpbox.xhtml"/>
-       </td>
-    </tr>
- </table>
- </forums:isAllowed>
-</c:when>
-</c:choose>
+                     </span>
+                  </td>
+               </c:if>
+            </tr>
+         </table>
+         <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
+            <tr>
+               <td class="catHead" colspan="5" align="center" height="28">
+                  <span class="cattitle">${resource.Mod_CP}</span>
+               </td>
+            </tr>
+            <tr>
+               <td class="spaceRow" colspan="5" align="center">
+                  <span class="gensmall">${resource.Mod_CP_explain}</span>
+               </td>
+            </tr>
+            <tr>
+               <th width="4%" class="thLeft" nowrap="nowrap">&amp;nbsp;</th>
+               <th nowrap="nowrap">&amp;nbsp;${resource.Topics}&amp;nbsp;</th>
+               <th width="8%" nowrap="nowrap">&amp;nbsp;${resource.Replies}&amp;nbsp;</th>
+               <th width="17%" nowrap="nowrap">&amp;nbsp;${resource.Last_Post}&amp;nbsp;</th>
+               <th width="5%" class="thRight" nowrap="nowrap">&amp;nbsp;${resource.Select}&amp;nbsp;</th>
+            </tr>
+            <c:forEach items="#{moderator.page}" var="topicrow">
+               <tr>
+                  <td class="row1" align="center" valign="middle">
+                     <img src="#{forums:folderTypeURL(topicrow,moderator.anonymous)}"
+                          width="19" height="18"
+                          alt="${resource.Topic_Moved}"
+                          title="${resource.Topic_Moved}"/>
+                  </td>
+                  <td class="row1">
+                     &amp;nbsp;
+                     <span class="topictitle">
+                        ${forums:folderType(topicrow)}
+                        <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}"
+                                      styleClass="topictitle">
+                           <f:param name="t" value="${topicrow.id}"/>
+                           <h:outputText value="${topicrow.subject}"/>
+                        </h:outputLink>
+                     </span>
+                  </td>
+                  <td class="row2" align="center" valign="middle">
+                     <span class="postdetails">${topicrow.replies}</span>
+                  </td>
+                  <td class="row1" align="center" valign="middle">
+                     <span class="postdetails">${topicrow.lastPostDate}</span>
+                  </td>
+                  <td class="row2" align="center" valign="middle">
+                     <h:selectBooleanCheckbox value="#{moderator.checkboxes[topicrow.id]}"/>
+                  </td>
+               </tr>
+            </c:forEach>
+            <tr align="right">
+               <td class="catBottom" colspan="5" height="29">
+                  <h:commandButton action="#{moderator.deleteConfirm}"
+                                   class="liteoption"
+                                   value="${resource.Delete}">
+                     <f:param name="f" value="#{moderator.forum.id}"/>
+                  </h:commandButton>
+                  &amp;nbsp;
+                  <h:commandButton action="#{moderator.moveConfirm}"
+                                   class="liteoption"
+                                   value="${resource.Move}">
+                     <f:param name="f" value="#{moderator.forum.id}"/>
+                  </h:commandButton>
+                  &amp;nbsp;
+                  <h:commandButton action="#{moderator.lockTopic}"
+                                   class="liteoption"
+                                   value="${resource.Lock}">
+                     <f:param name="f"
+                              value="#{moderator.forum.id}"/>
+                  </h:commandButton>
+                  &amp;nbsp;
+                  <h:commandButton action="#{moderator.unlockTopic}"
+                                   class="liteoption"
+                                   value="${resource.Unlock}">
+                     <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>
+               <!-- 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}">
+                           &amp;nbsp;&amp;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>
+                           &amp;nbsp;&amp;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}">
+                           &amp;nbsp;&amp;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>
+                           &amp;nbsp;&amp;nbsp;
+                        </c:if>
+                     </span>
+                  </td>
+               </c:if>
+            </tr>
+         </table>
+      </h:form>
+      <table width="100%" border="0" cellspacing="0" cellpadding="0">
+         <tr>
+            <td align="right">
+               <ui:include src="/views/jumpbox.xhtml"/>
+            </td>
+         </tr>
+      </table>
+   </forums:isAllowed>
+</c:if>
 </ui:define>
 </ui:composition>
 </div>
\ No newline at end of file

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml	2006-06-27 21:13:44 UTC (rev 4841)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml	2006-06-28 00:17:45 UTC (rev 4842)
@@ -107,7 +107,6 @@
                </tr>
             </table>
          </h:form>
-          <ui:debug key="s" />
       </ui:define>
    </ui:composition>
   

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-27 21:13:44 UTC (rev 4841)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml	2006-06-28 00:17:45 UTC (rev 4842)
@@ -741,16 +741,24 @@
             </td> 
         </tr>
         
-        <!-- TODO: security check needed for the moderator functions integrated into this topic -->
+        <!--<forums:isAllowed fragment="acl://moderateForum" contextData="#{forum.forum}">-->
+        <c:if test="#{moderator.initialized &amp;&amp; moderator.forum!=null &amp;&amp; moderator.forum.id!=-1}">
         <tr>
             <td>
                 &amp;nbsp;<br/>
-                <a href="" style="text-decoration: none;">
+                <h:commandLink action="#{moderator.deleteConfirm}" style="text-decoration: none;">
+                    <f:param name="t" value="#{topic.topic.id}"/>
+                    <f:verbatim>
                 	<img border="0" src="/portal-forums/subSilver/images/topic_delete.gif" alt="Delete this topic" title="Delete this topic"/>
-                </a>&amp;nbsp;
-                <a href="" style="text-decoration: none;">
+                    </f:verbatim>
+                </h:commandLink>
+                &amp;nbsp;
+                <h:commandLink action="#{moderator.moveConfirm}" style="text-decoration: none;">
+                    <f:param name="t" value="#{topic.topic.id}"/>
+                    <f:verbatim>
                 	<img border="0" src="/portal-forums/subSilver/images/topic_move.gif" alt="Move this topic" title="Move this topic"/>
-                </a>&amp;nbsp;
+                    </f:verbatim>
+                </h:commandLink>&amp;nbsp;
                 <c:choose>
                 	<c:when test="#{topic.topic.status==forums:constantInt('TOPIC_LOCKED')}">
 		                <a href="" style="text-decoration: none;">
@@ -768,6 +776,8 @@
                 </a>&amp;nbsp;
             </td>
         </tr>
+        </c:if>
+        <!--</forums:isAllowed>-->
       </table>
       </forums:isAllowed>
       </forums:isAllowed>