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

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

Author: unibrew
Date: 2006-06-28 21:01:11 -0400 (Wed, 28 Jun 2006)
New Revision: 4860

Modified:
   labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml
Log:
[JBFORUMS-44] Improving moderator's view XHTML's as well as improving their authorization support.

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-29 00:58:59 UTC (rev 4859)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java	2006-06-29 01:01:11 UTC (rev 4860)
@@ -66,6 +66,7 @@
     private Collection page = new ArrayList();
     private Map topicNavigator = new HashMap();
     private Map checkboxes;
+
     
     private ResourceBundle bundle;
     

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml	2006-06-29 00:58:59 UTC (rev 4859)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml	2006-06-29 01:01:11 UTC (rev 4860)
@@ -34,7 +34,7 @@
 
 <ui:composition template="/views/common/common.xhtml">
 <ui:define name="mainContent">
-	
+<forums:isAllowed fragment="acl://moderateForum" contextData="#{moderator.forum}">
     <table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0">
 	   <tr>
 	      <th class="thHead" height="25" valign="middle"><span class="tableTitle">${resource.Topic_delete_message}</span></th>
@@ -58,7 +58,7 @@
 	   </tr>
 	</table>
 
-
+</forums:isAllowed>
 </ui:define>
 </ui:composition>
 

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-29 00:58:59 UTC (rev 4859)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml	2006-06-29 01:01:11 UTC (rev 4860)
@@ -29,85 +29,95 @@
      xmlns:h="http://java.sun.com/jsf/html"
      xmlns:f="http://java.sun.com/jsf/core"
      xmlns:forums="http://www.jboss.com/products/jbossportal/forums" class="bb">
-   <ui:composition template="/views/common/common.xhtml">
-      <ui:define name="mainContent">
-         <h:form>
-            <table width="100%" cellspacing="2" cellpadding="2" border="0"
-                   align="center">
-               <tr>
-                  <td align="left" class="nav">
-                     <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>
-                  </td>
-               </tr>
-            </table>
-            <table width="100%" cellpadding="4" cellspacing="1" border="0"
-                   class="forumline">
-               <tr>
-                  <th height="25" class="thHead">
-                     <b>${resource.Confirm}</b>
-                  </th>
-               </tr>
-               <tr>
-                  <td class="row1">
-                     <table width="100%" border="0" cellspacing="0"
-                            cellpadding="1">
-                        <tr>
-                           <td>&amp;nbsp;</td>
-                        </tr>
-                        <tr>
-                           <td align="center">
-                              <span class="gen">
-                                 ${resource.Move_to_forum} &amp;nbsp;
-                                 <select name="forum_to_id">
-                                    <option value="-1">${resource.Select_forum}</option>
-                                    <c:forEach items="${jumpbox.categories}"
-                                               var="category">
-                                       <option value="-1"></option>
-                                       <option value="-1">${category.title}</option>
-                                       <option value="-1">----------------</option>
-                                       <c:forEach items="${category.forums}"
-                                                  var="forum">
-                                          <option value="${forum.id}">${forum.name}</option>
-                                       </c:forEach>
-                                    </c:forEach>
-                                 </select>
-                                 <br/>
-                                 <br/>
-                                 <!-- TODO: FUTURE FEATURE: SHADOW NOT AVAILABLE-->
-                                 <!--<input type="checkbox" name="move_leave_shadow" checked="checked"DISABLED/>${resource.Leave_shadow_topic}[N/A yet...]<br /> -->
-                                 <br/>
-                                 ${resource.Confirm_move_topic}
-                              </span>
-                              <br/>
-                              <br/>
-                              <h:commandButton type="submit" value="Yes"
-                                               styleClass="mainoption"
-                                               action="#{moderator.moveTopic}">
-                                 <f:param name="f"
-                                          value="#{moderator.forum.id}"/>
-                              </h:commandButton>
-                              &amp;nbsp;&amp;nbsp;
-                              <h:commandButton type="button" value="No"
-                                               styleClass="liteoption"
-                                               onclick="javascript:history.back();">
-                                 <f:param name="f"
-                                          value="#{moderator.forum.id}"/>
-                              </h:commandButton>
-                           </td>
-                        </tr>
-                        <tr>
-                           <td>&amp;nbsp;</td>
-                        </tr>
-                     </table>
-                  </td>
-               </tr>
-            </table>
-         </h:form>
-      </ui:define>
-   </ui:composition>
+<ui:composition template="/views/common/common.xhtml">
+<ui:define name="mainContent">
+<forums:isAllowed fragment="acl://moderateForum" contextData="#{moderator.forum}">
+<h:form>
+    <table width="100%" cellspacing="2" cellpadding="2" border="0"
+           align="center">
+       <tr>
+          <td align="left" class="nav">
+             <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>
+          </td>
+       </tr>
+    </table>
+    <table width="100%" cellpadding="4" cellspacing="1" border="0"
+           class="forumline">
+       <tr>
+          <th height="25" class="thHead">
+             <b>${resource.Confirm}</b>
+          </th>
+       </tr>
+       <tr>
+          <td class="row1">
+             <table width="100%" border="0" cellspacing="0"
+                    cellpadding="1">
+                <tr>
+                   <td>&amp;nbsp;</td>
+                </tr>
+                <tr>
+                   <td align="center">
+                      <span class="gen">
+                         ${resource.Move_to_forum} &amp;nbsp;
+                         <select name="forum_to_id">
+                            <option value="-1">${resource.Select_forum}</option>
+                            <c:forEach items="${jumpbox.categories}"
+                                       var="category">
+                               <forums:isAllowed fragment="acl://readCategory" 
+                                                 contextData="#{category}">
+                               <option value="-1"></option>
+                               <option value="-1">${category.title}</option>
+                               <option value="-1">----------------</option>
+                               <c:forEach items="${category.forums}"
+                                          var="forum">
+                                  <forums:isAllowed fragment="acl://newTopic" 
+                                                    contextData="#{forum}">
+                                  <option value="${forum.id}">
+                                      ${forum.name}
+                                  </option>
+                                  </forums:isAllowed>
+                               </c:forEach>
+                               </forums:isAllowed>
+                            </c:forEach>
+                         </select>
+                         <br/>
+                         <br/>
+                         <!-- TODO: FUTURE FEATURE: SHADOW NOT AVAILABLE-->
+                         <!--<input type="checkbox" name="move_leave_shadow" checked="checked"DISABLED/>${resource.Leave_shadow_topic}[N/A yet...]<br /> -->
+                         <br/>
+                         ${resource.Confirm_move_topic}
+                      </span>
+                      <br/>
+                      <br/>
+                      <h:commandButton type="submit" value="Yes"
+                                       styleClass="mainoption"
+                                       action="#{moderator.moveTopic}">
+                         <f:param name="f"
+                                  value="#{moderator.forum.id}"/>
+                      </h:commandButton>
+                      &amp;nbsp;&amp;nbsp;
+                      <h:commandButton type="button" value="No"
+                                       styleClass="liteoption"
+                                       onclick="javascript:history.back();">
+                         <f:param name="f"
+                                  value="#{moderator.forum.id}"/>
+                      </h:commandButton>
+                   </td>
+                </tr>
+                <tr>
+                   <td>&amp;nbsp;</td>
+                </tr>
+             </table>
+          </td>
+       </tr>
+    </table>
+</h:form>
+</forums:isAllowed>
+</ui:define>
+</ui:composition>
   
 </div>
\ No newline at end of file