[jboss-svn-commits] JBL Code SVN: r10588 - in labs/jbossforums/branches/forums101P22/forums/src: resources/portal-forums-war/views/admin and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: unibrew
Date: 2007-03-28 15:54:19 -0400 (Wed, 28 Mar 2007)
New Revision: 10588

Modified:
   labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java
   labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/admin/deleteCategory.xhtml
Log:
[JBFORUMS-196] Delete category view done.

Modified: labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java
===================================================================
--- labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java	2007-03-28 19:53:07 UTC (rev 10587)
+++ labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java	2007-03-28 19:54:19 UTC (rev 10588)
@@ -733,4 +733,13 @@
     {
         return null;
     }
+    
+    /**
+     * 
+     */
+    public String cancel()
+    {
+        cleanup();
+        return "cancel";
+    }
 }

Modified: labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/admin/deleteCategory.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/admin/deleteCategory.xhtml	2007-03-28 19:53:07 UTC (rev 10587)
+++ labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/admin/deleteCategory.xhtml	2007-03-28 19:54:19 UTC (rev 10588)
@@ -27,58 +27,55 @@
      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">
-   
-   <h1>${resource.Category_delete}</h1>
+<ui:composition template="/views/common/common.xhtml">
+<ui:define name="mainContent">
+
+<h1>${resource.Category_delete}</h1>
+<p>${resource.Forum_delete_explain}</p>
+
+<div class="forumsubscriptionconfirm">
+<h:form>
+    <input type="hidden" name="c" value="#{param['c']}"/>
+    <h3>${resource.Category_delete}</h3>
+    <p>${resource.Category}</p>
+    <h4>#{adminController.categoryName}</h4>
+    <label>${resource.Move_contents}</label>
+    <br />
+    <h:selectOneMenu value="#{adminController.selectedCategory}">
+        <f:selectItem itemValue="-1" itemLabel="${resource.Delete_all_forums_topics_posts}" />
+        <c:forEach items="#{adminPanel.categories}" var="category">
+            <c:if test="#{category.id != param['c']}">
+                <f:selectItem itemValue="#{category.id}" itemLabel="#{category.title}" />
+            </c:if>
+        </c:forEach>
+    </h:selectOneMenu>
+    <div class="forumformbuttonrow">
+        <ul>
+            <li>
+                <h:commandButton value="${resource.Confirm}" styleClass="buttonMed"
+                                 action="#{adminController.deleteCategory}"/>
+            </li>
+            <li>
+                <h:commandButton type="submit" action="${adminController.cancel}"
+                                 value="${resource.Cancel}" styleClass="buttonMed" />
+            </li>
+        </ul>
+    </div>
+</h:form>
+</div>
 
-   <p>${resource.Forum_delete_explain}</p>
-   
-    <!-- display the delete category widget -->   
-    <h:form>
-           <input type="hidden" name="c" value="#{param['c']}"/>
-		   <table cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
-		      <tr>
-		         <th colspan="2" class="thHead">${resource.Category_delete}</th>
-		      </tr>
-		      <tr>
-		         <td class="row1">${resource.Category}</td>
-		         <td class="row1"><span class="row1">#{adminController.categoryName}</span></td>		
-		      </tr>
-		      <tr>
-		         <td class="row1">${resource.Move_contents}</td>
-		         <td class="row1">		         	
-					<h:selectOneMenu value="#{adminController.selectedCategory}">
-					    <f:selectItem itemValue="-1" itemLabel="${resource.Delete_all_forums_topics_posts}" />
-            			<c:forEach items="#{adminPanel.categories}" var="category">
-            				<c:if test="#{category.id != param['c']}">
-            					<f:selectItem itemValue="#{category.id}" itemLabel="#{category.title}" />
-            				</c:if>
-            			</c:forEach>	         	
-					</h:selectOneMenu>
-				  </td>
-		      </tr>
-		      <tr>
-		         <td class="catBottom" colspan="2" align="center">		         			         	
-		         	<h:commandButton value="${resource.Confirm}" styleClass="mainoption" action="#{adminController.deleteCategory}"/>
-		         </td>
-		      </tr>
-		   </table>
-	</h:form>
+<!-- integrate the jump box -->    
+<table cellspacing="0" cellpadding="0" border="0" align="right">
+    <tr>
+        <td align="right" valign="top" nowrap="nowrap">
+            <ui:include src="/views/jumpbox.xhtml"/>
+        </td>
+    </tr>
+</table>
 
-
-    
-    <!-- integrate the jump box -->    
-    <table cellspacing="0" cellpadding="0" border="0" align="right">
-      <tr>
-            <td align="right" valign="top" nowrap="nowrap">
-                <ui:include src="/views/jumpbox.xhtml"/>                
-            </td>
-      </tr>
-    </table>
-   
-   </ui:define>
-   </ui:composition>   
+</ui:define>
+</ui:composition>   
 </div>
\ No newline at end of file