[jboss-svn-commits] JBL Code SVN: r18841 - labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/moderator.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Mar 11 12:40:47 EDT 2008


Author: unibrew
Date: 2008-03-11 12:40:47 -0400 (Tue, 11 Mar 2008)
New Revision: 18841

Modified:
   labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml
Log:
[JBFORUMS-216] Moderator's move subview is rewritten.

Modified: labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml	2008-03-11 16:40:23 UTC (rev 18840)
+++ labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml	2008-03-11 16:40:47 UTC (rev 18841)
@@ -22,126 +22,117 @@
 */
 -->
 
-
 <div xmlns="http://www.w3.org/1999/xhtml"
      xmlns:ui="http://java.sun.com/jsf/facelets"
      xmlns:c="http://java.sun.com/jstl/core"
      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">
+     xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
+     class="forumscontainer">
 <ui:composition template="/views/common/common.xhtml">
 <ui:define name="mainContent">
 <forums:isAllowedChoose>
 <forums:isAllowedWhen fragment="acl://moderateForum" contextData="#{moderator.forum}">
 <h:form>
     <input type="hidden" name="f" value="#{moderator.forum.id}"/>
-    <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>&#160;</td>
-                </tr>
-                <tr>
-                   <td align="center">
-                      <span class="gen">
-                         ${resource.Move_to_forum} &#160;
-                         <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>
+    <div class="dialog">
+        <table cellpadding="0" cellspacing="0" border="0" width="100%">
+            <tr>
+                <td class="icon">
+                    <img src="#{forums:themeURL('resourceIconDialogWarningURL')}" border="0" />
+                </td>
+                <td class="title" width="100%">
+                    ${resource.Confirm}<br /><br />
+                </td>
+            </tr>
+            <tr>
+                <td class="icon"></td>
+                <td>
+                    ${resource.Move_to_forum}<br /><br />
+                </td>
+            </tr>
+            <tr>
+                <td class="icon"></td>
+                <td>
+                    <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>
-                         </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="${resource.Yes}"
-                                       styleClass="mainoption"
-                                       action="#{moderator.moveTopic}">
-                         <f:param name="f"
-                                  value="#{moderator.forum.id}"/>
-                      </h:commandButton>
-                      &#160;&#160;
-                      <h:commandButton type="button" value="${resource.No}"
-                                       styleClass="liteoption"
-                                       onclick="javascript:history.back();">
-                         <f:param name="f"
-                                  value="#{moderator.forum.id}"/>
-                      </h:commandButton>
-                   </td>
-                </tr>
-                <tr>
-                   <td>&#160;</td>
-                </tr>
-             </table>
-          </td>
-       </tr>
-    </table>
+                            </forums:isAllowed>
+                        </c:forEach>
+                    </select>
+                    <br /><br />
+                </td>
+            </tr>
+            <!-- TODO: FUTURE FEATURE: SHADOW NOT AVAILABLE-->
+            <!--<input type="checkbox" name="move_leave_shadow" checked="checked"DISABLED/>${resource.Leave_shadow_topic}[N/A yet...]<br /> -->
+            <tr>
+                <td class="icon"></td>
+                <td>
+                    ${resource.Confirm_move_topic}
+                    <br /><br />
+                    <c:forEach items="#{moderator.allSelectedTopics}" var="topicrow">
+                    #{topicrow.subject}<br />
+                    </c:forEach>
+                    <br />
+                </td>
+            </tr>
+            <tr>
+                <td class="buttons" colspan="2">
+                    <h:commandButton type="submit" value="${resource.Yes}"
+                                     styleClass="buttonMed"
+                                     action="#{moderator.moveTopic}">
+                        <f:param name="f"
+                                 value="#{moderator.forum.id}"/>
+                    </h:commandButton>
+                    <h:commandButton type="button" value="${resource.No}"
+                                     styleClass="buttonMed"
+                                     onclick="javascript:history.back();">
+                        <f:param name="f"
+                                 value="#{moderator.forum.id}"/>
+                    </h:commandButton>
+                </td>
+            </tr>
+        </table>
+    </div>
 </h:form>
 </forums:isAllowedWhen>
 <forums:isAllowedOtherwise>
-    <table class="forumline" width="100%" cellspacing="1" cellpadding="4" border="0">
-       <tr>
-          <td>
-             <table width="100%" cellspacing="0" cellpadding="1" border="0">
-                <tr>
-                   <td>&#160;</td>
-                </tr>
-                <tr>
-                   <td align="center">
-                            <span class="gen">${resource.Not_Moderator}</span>
-                   </td>
-                </tr>
-                <tr>
-                   <td>&#160;</td>
-                </tr>
-             </table>
-          </td>
-       </tr>
-   </table>
+    <table width="100%"  border="0" cellpadding="0" cellspacing="0" class="forumtablestyle">
+        <tr>
+            <td>
+                <table width="100%" cellspacing="0" cellpadding="1" border="0">
+                    <tr>
+                        <td>&#160;</td>
+                    </tr>
+                    <tr>
+                        <td align="center">
+                            ${resource.Not_Moderator}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>&#160;</td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
 </forums:isAllowedOtherwise>
 </forums:isAllowedChoose>
 </ui:define>
 </ui:composition>
-  
 </div>
\ No newline at end of file




More information about the jboss-svn-commits mailing list