diff --git a/config/alfresco/web-client-config-dialogs.xml b/config/alfresco/web-client-config-dialogs.xml
index 935a75351d..fa5eea4ae6 100644
--- a/config/alfresco/web-client-config-dialogs.xml
+++ b/config/alfresco/web-client-config-dialogs.xml
@@ -15,6 +15,11 @@
                  icon="/images/icons/details_large.gif" title-id="modify_space_properties" 
                  description-id="editspace_description" />
          
+         <!-- Definition of the delete space dialog -->
+         <dialog name="deleteSpace" page="/jsp/dialog/delete.jsp" managed-bean="DeleteSpaceDialog" 
+                 icon="/images/icons/delete_large.gif" title-id="delete_space" 
+                 description-id="delete_space_info" />
+         
          <!-- Definition of the set content properties dialog -->
          <dialog name="setContentProperties" page="/jsp/content/edit-content-properties.jsp" 
                  managed-bean="SetContentPropertiesDialog" icon="/images/icons/details_large.gif"
@@ -25,6 +30,10 @@
                  managed-bean="EditContentPropertiesDialog" icon="/images/icons/details_large.gif"
                  title-id="modify_content_properties" description-id="edit_content_description" />
          
+         <!-- Definition of the delete content dialog -->
+         <dialog name="deleteFile" page="/jsp/dialog/delete.jsp" managed-bean="DeleteContentDialog" 
+                 icon="/images/icons/delete_large.gif" title-id="delete_file" 
+                 description-id="delete_file_info" />
          
          <!--                -->
          <!-- Forums Dialogs -->
@@ -72,4 +81,35 @@
       </dialogs>
    </config>
    
+   <config evaluator="node-type" condition="fm:forums">
+      <dialogs>
+         <dialog name="deleteSpace" page="/jsp/dialog/delete.jsp" managed-bean="DeleteForumsDialog"
+                 icon="/images/icons/delete_forums_large.gif" title-id="delete_forums" 
+                 description-id="delete_forums_info" />
+      </dialogs>
+   </config>
+   
+   <config evaluator="node-type" condition="fm:forum">
+      <dialogs>
+         <dialog name="deleteSpace" page="/jsp/dialog/delete.jsp" managed-bean="DeleteForumDialog"
+                 icon="/images/icons/delete_forum_large.gif" title-id="delete_forum" 
+                 description-id="delete_forum_info" />
+      </dialogs>
+   </config>
+   
+   <config evaluator="node-type" condition="fm:topic">
+      <dialogs>
+         <dialog name="deleteSpace" page="/jsp/dialog/delete.jsp" managed-bean="DeleteTopicDialog"
+                 icon="/images/icons/delete_topic_large.gif" title-id="delete_topic" 
+                 description-id="delete_topic_info" />
+      </dialogs>
+   </config>
+   
+   <config evaluator="node-type" condition="fm:post">
+      <dialogs>
+         <dialog name="deleteFile" page="/jsp/dialog/delete.jsp" managed-bean="DeletePostDialog" 
+                 icon="/images/icons/delete_large.gif" title-id="delete_post" 
+                 description-id="delete_post_info" />
+      </dialogs>
+   </config>
 </alfresco-config>
diff --git a/config/alfresco/web-client-config-forum-actions.xml b/config/alfresco/web-client-config-forum-actions.xml
index 76891b781e..8037d12083 100644
--- a/config/alfresco/web-client-config-forum-actions.xml
+++ b/config/alfresco/web-client-config-forum-actions.xml
@@ -99,8 +99,8 @@
             </permissions>
             <label-id>delete_forums</label-id>
             <image>/images/icons/delete_forums.gif</image>
-            <action>dialog:deleteForums</action>
-            <action-listener>#{BrowseBean.setupContentAction}</action-listener>
+            <action>dialog:deleteSpace</action>
+            <action-listener>#{BrowseBean.setupDeleteAction}</action-listener>
             <params>
                <param name="id">#{actionContext.id}</param>
             </params>
@@ -113,8 +113,8 @@
             </permissions>
             <label-id>delete_forum</label-id>
             <image>/images/icons/delete_forum.gif</image>
-            <action>dialog:deleteForum</action>
-            <action-listener>#{BrowseBean.setupContentAction}</action-listener>
+            <action>dialog:deleteSpace</action>
+            <action-listener>#{BrowseBean.setupDeleteAction}</action-listener>
             <params>
                <param name="id">#{actionContext.id}</param>
             </params>
@@ -137,8 +137,8 @@
             </permissions>
             <label-id>delete_topic</label-id>
             <image>/images/icons/delete_topic.gif</image>
-            <action>dialog:deleteTopic</action>
-            <action-listener>#{BrowseBean.setupContentAction}</action-listener>
+            <action>dialog:deleteSpace</action>
+            <action-listener>#{BrowseBean.setupDeleteAction}</action-listener>
             <params>
                <param name="id">#{actionContext.id}</param>
             </params>
@@ -189,7 +189,7 @@
             </permissions>
             <label-id>delete_post</label-id>
             <image>/images/icons/delete.gif</image>
-            <action>dialog:deletePost</action>
+            <action>dialog:deleteFile</action>
             <action-listener>#{BrowseBean.setupContentAction}</action-listener>
             <params>
                <param name="id">#{actionContext.id}</param>
diff --git a/config/alfresco/web-client-config-navigation.xml b/config/alfresco/web-client-config-navigation.xml
index c340a99c71..0dab5a7ec2 100644
--- a/config/alfresco/web-client-config-navigation.xml
+++ b/config/alfresco/web-client-config-navigation.xml
@@ -5,7 +5,6 @@
          <override from-view-id="/jsp/browse/browse.jsp" to-view-id="/jsp/forums/forums.jsp" />
          <override from-outcome="browse" to-view-id="/jsp/forums/forums.jsp" />
          <override from-outcome="showSpaceDetails" to-view-id="/jsp/forums/forums-details.jsp" />
-         <override from-outcome="deleteSpace" to-view-id="/jsp/forums/delete-forums.jsp" />
       </navigation>
    </config>
    
@@ -14,7 +13,6 @@
          <override from-view-id="/jsp/browse/browse.jsp" to-view-id="/jsp/forums/forum.jsp" />
          <override from-outcome="browse" to-view-id="/jsp/forums/forum.jsp" />
          <override from-outcome="showSpaceDetails" to-view-id="/jsp/forums/forum-details.jsp" />
-         <override from-outcome="deleteSpace" to-view-id="/jsp/forums/delete-forum.jsp" />
       </navigation>
    </config>
    
@@ -23,7 +21,6 @@
          <override from-view-id="/jsp/browse/browse.jsp" to-view-id="/jsp/forums/topic.jsp" />
          <override from-outcome="browse" to-view-id="/jsp/forums/topic.jsp" />
          <override from-outcome="showSpaceDetails" to-view-id="/jsp/forums/topic-details.jsp" />
-         <override from-outcome="deleteSpace" to-view-id="/jsp/forums/delete-topic.jsp" />
       </navigation>
    </config>
    
diff --git a/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java b/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
index fe95708dfa..978bf86817 100644
--- a/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
+++ b/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
@@ -266,11 +266,18 @@ public class AlfrescoNavigationHandler extends NavigationHandler
       
       if (dispatchContext != null)
       {
+         if (logger.isDebugEnabled())
+            logger.debug("Using dispatch context for dialog lookup: " + 
+                  dispatchContext.getType().toString());
+         
          // use the node to perform the lookup (this will include the global section)
          config = configSvc.getConfig(dispatchContext);
       }
       else
       {
+         if (logger.isDebugEnabled())
+            logger.debug("Looking up dialog in global config");
+            
          // just use the global 
          config = configSvc.getGlobalConfig();
       }
@@ -306,11 +313,18 @@ public class AlfrescoNavigationHandler extends NavigationHandler
       
       if (dispatchContext != null)
       {
+         if (logger.isDebugEnabled())
+            logger.debug("Using dispatch context for wizard lookup: " + 
+                  dispatchContext.getType().toString());
+         
          // use the node to perform the lookup (this will include the global section)
          config = configSvc.getConfig(dispatchContext);
       }
       else
       {
+         if (logger.isDebugEnabled())
+            logger.debug("Looking up wizard in global config");
+         
          // just use the global 
          config = configSvc.getGlobalConfig();
       }
diff --git a/source/java/org/alfresco/web/bean/BrowseBean.java b/source/java/org/alfresco/web/bean/BrowseBean.java
index 3c8b7c57df..12e283bc33 100644
--- a/source/java/org/alfresco/web/bean/BrowseBean.java
+++ b/source/java/org/alfresco/web/bean/BrowseBean.java
@@ -1350,117 +1350,38 @@ public class BrowseBean implements IContextListener
    }
    
    /**
-    * Handler called upon the completion of the Delete Space page
+    * Removes the given node from the breadcrumb i.e. following a delete
     * 
-    * @return outcome
+    * @param node The space to remove from the breadcrumb
     */
-   public String deleteSpaceOK()
+   public void removeSpaceFromBreadcrumb(Node node)
    {
-      String outcome = null;
-      
-      Node node = getActionSpace();
-      if (node != null)
+      List<IBreadcrumbHandler> location = navigator.getLocation();
+      IBreadcrumbHandler handler = location.get(location.size() - 1);
+      if (handler instanceof BrowseBreadcrumbHandler)
       {
-         try
+         // see if the current breadcrumb location is our node 
+         if ( ((BrowseBreadcrumbHandler)handler).getNodeRef().equals(node.getNodeRef()) == true )
          {
-            if (logger.isDebugEnabled())
-               logger.debug("Trying to delete space: " + node.getId());
+            location.remove(location.size() - 1);
             
-            this.nodeService.deleteNode(node.getNodeRef());
-            
-            // remove this node from the breadcrumb if required
-            List<IBreadcrumbHandler> location = navigator.getLocation();
-            IBreadcrumbHandler handler = location.get(location.size() - 1);
-            if (handler instanceof BrowseBreadcrumbHandler)
+            // now work out which node to set the list to refresh against
+            if (location.size() != 0)
             {
-               // see if the current breadcrumb location is our node 
-               if ( ((BrowseBreadcrumbHandler)handler).getNodeRef().equals(node.getNodeRef()) == true )
+               handler = location.get(location.size() - 1);
+               if (handler instanceof BrowseBreadcrumbHandler)
                {
-                  location.remove(location.size() - 1);
-                  
-                  // now work out which node to set the list to refresh against
-                  if (location.size() != 0)
-                  {
-                     handler = location.get(location.size() - 1);
-                     if (handler instanceof BrowseBreadcrumbHandler)
-                     {
-                        // change the current node Id
-                        navigator.setCurrentNodeId(((BrowseBreadcrumbHandler)handler).getNodeRef().getId());
-                     }
-                     else
-                     {
-                        // TODO: shouldn't do this - but for now the user home dir is the root!
-                        navigator.setCurrentNodeId(Application.getCurrentUser(FacesContext.getCurrentInstance()).getHomeSpaceId());
-                     }
-                  }
+                  // change the current node Id
+                  navigator.setCurrentNodeId(((BrowseBreadcrumbHandler)handler).getNodeRef().getId());
+               }
+               else
+               {
+                  // TODO: shouldn't do this - but for now the user home dir is the root!
+                  navigator.setCurrentNodeId(Application.getCurrentUser(FacesContext.getCurrentInstance()).getHomeSpaceId());
                }
             }
-            
-            // add a message to inform the user that the delete was OK 
-            String statusMsg = MessageFormat.format(
-                  Application.getMessage(FacesContext.getCurrentInstance(), "status_space_deleted"), 
-                  new Object[]{node.getName()});
-            Utils.addStatusMessage(FacesMessage.SEVERITY_INFO, statusMsg);
-            
-            // clear action context
-            setActionSpace(null);
-            
-            // setting the outcome will show the browse view again
-            outcome = AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME + 
-                      AlfrescoNavigationHandler.OUTCOME_SEPARATOR + "browse";
-         }
-         catch (Throwable err)
-         {
-            Utils.addErrorMessage(Application.getMessage(
-                  FacesContext.getCurrentInstance(), MSG_ERROR_DELETE_SPACE) + err.getMessage(), err);
          }
       }
-      else
-      {
-         logger.warn("WARNING: deleteSpaceOK called without a current Space!");
-      }
-      
-      return outcome;
-   }
-   
-   /**
-    * Handler called upon the completion of the Delete File page
-    * 
-    * @return outcome
-    */
-   public String deleteFileOK()
-   {
-      String outcome = null;
-      
-      Node node = getDocument();
-      if (node != null)
-      {
-         try
-         {
-            if (logger.isDebugEnabled())
-               logger.debug("Trying to delete content node: " + node.getId());
-            
-            this.nodeService.deleteNode(node.getNodeRef());
-            
-            // clear action context
-            setDocument(null);
-            
-            // setting the outcome will show the browse view again
-            outcome = AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME +
-                      AlfrescoNavigationHandler.OUTCOME_SEPARATOR + "browse";
-         }
-         catch (Throwable err)
-         {
-            Utils.addErrorMessage(Application.getMessage(
-                  FacesContext.getCurrentInstance(), MSG_ERROR_DELETE_FILE) + err.getMessage(), err);
-         }
-      }
-      else
-      {
-         logger.warn("WARNING: deleteFileOK called without a current Document!");
-      }
-      
-      return outcome;
    }
    
    /**
@@ -1724,8 +1645,6 @@ public class BrowseBean implements IContextListener
    private static final String PAGE_NAME_BROWSE = "browse";
    
    /** I18N messages */
-   private static final String MSG_ERROR_DELETE_FILE  = "error_delete_file";
-   private static final String MSG_ERROR_DELETE_SPACE = "error_delete_space";
    private static final String MSG_DELETE_COMPANYROOT = "delete_companyroot_confirm";
    private static final String MSG_SEARCH_MINIMUM     = "search_minimum";
    
diff --git a/source/java/org/alfresco/web/bean/content/DeleteContentDialog.java b/source/java/org/alfresco/web/bean/content/DeleteContentDialog.java
new file mode 100644
index 0000000000..1e48b2ea51
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/content/DeleteContentDialog.java
@@ -0,0 +1,87 @@
+package org.alfresco.web.bean.content;
+
+import java.text.MessageFormat;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.web.app.AlfrescoNavigationHandler;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.dialog.BaseDialogBean;
+import org.alfresco.web.bean.repository.Node;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Bean implementation for the "Delete Content" dialog
+ * 
+ * @author gavinc
+ */
+public class DeleteContentDialog extends BaseDialogBean
+{
+   private static final Log logger = LogFactory.getLog(DeleteContentDialog.class);
+   
+   // ------------------------------------------------------------------------------
+   // Dialog implementation
+   
+   @Override
+   protected String finishImpl(FacesContext context, String outcome)
+         throws Exception
+   {
+      // get the content to delete
+      Node node = this.browseBean.getDocument();
+      if (node != null)
+      {
+         if (logger.isDebugEnabled())
+            logger.debug("Trying to delete content node: " + node.getId());
+         
+         // delete the node
+         this.nodeService.deleteNode(node.getNodeRef());         
+      }
+      else
+      {
+         logger.warn("WARNING: delete called without a current Document!");
+      }
+      
+      return outcome;
+   }
+      
+   @Override
+   protected String doPostCommitProcessing(FacesContext context, String outcome)
+   {
+      // clear action context
+      this.browseBean.setDocument(null);
+            
+      // setting the outcome will show the browse view again
+      return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME +
+             AlfrescoNavigationHandler.OUTCOME_SEPARATOR + "browse";
+   }
+   
+   @Override
+   protected String getErrorMessageId()
+   {
+      return "error_delete_file";
+   }
+
+   @Override
+   public boolean getFinishButtonDisabled()
+   {
+      return false;
+   }
+   
+   // ------------------------------------------------------------------------------
+   // Bean Getters and Setters
+
+   /**
+    * Returns the confirmation to display to the user before deleting the content.
+    * 
+    * @return The formatted message to display
+    */
+   public String getConfirmMessage()
+   {
+      String fileConfirmMsg = Application.getMessage(FacesContext.getCurrentInstance(), 
+               "delete_file_confirm");
+      
+      return MessageFormat.format(fileConfirmMsg, 
+            new Object[] {this.browseBean.getDocument().getName()});
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/forums/CreateDiscussionDialog.java b/source/java/org/alfresco/web/bean/forums/CreateDiscussionDialog.java
index 8d42b33b30..6bf649df91 100644
--- a/source/java/org/alfresco/web/bean/forums/CreateDiscussionDialog.java
+++ b/source/java/org/alfresco/web/bean/forums/CreateDiscussionDialog.java
@@ -16,6 +16,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.web.app.AlfrescoNavigationHandler;
 import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.ui.common.Utils;
 import org.apache.commons.logging.Log;
@@ -154,11 +155,17 @@ public class CreateDiscussionDialog extends CreateTopicDialog
          this.nodeService.removeAspect(this.discussingNodeRef, ForumModel.ASPECT_DISCUSSABLE);
          
          // delete the forum space created when the wizard started         
-         this.browseBean.setActionSpace(this.navigator.getCurrentNode());
-         this.browseBean.deleteSpaceOK();
-         
+         Node forumNode = this.navigator.getCurrentNode();
+         this.nodeService.deleteNode(forumNode.getNodeRef());
+            
          // commit the transaction
          tx.commit();
+         
+         // remove this node from the breadcrumb if required
+         this.browseBean.removeSpaceFromBreadcrumb(forumNode);
+               
+         // clear action context
+         this.browseBean.setActionSpace(null);
       }
       catch (Throwable e)
       {
diff --git a/source/java/org/alfresco/web/bean/forums/CreateReplyDialog.java b/source/java/org/alfresco/web/bean/forums/CreateReplyDialog.java
index 5da944ae4b..2602445122 100644
--- a/source/java/org/alfresco/web/bean/forums/CreateReplyDialog.java
+++ b/source/java/org/alfresco/web/bean/forums/CreateReplyDialog.java
@@ -5,8 +5,6 @@ import java.util.Map;
 import javax.faces.context.FacesContext;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.service.cmr.repository.ContentReader;
-import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.ui.common.Utils;
 import org.apache.commons.logging.Log;
diff --git a/source/java/org/alfresco/web/bean/forums/DeleteForumDialog.java b/source/java/org/alfresco/web/bean/forums/DeleteForumDialog.java
new file mode 100644
index 0000000000..786511cbf8
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/forums/DeleteForumDialog.java
@@ -0,0 +1,103 @@
+package org.alfresco.web.bean.forums;
+
+import java.text.MessageFormat;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.model.ForumModel;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.AlfrescoNavigationHandler;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.spaces.DeleteSpaceDialog;
+
+/**
+ * Bean implementation for the "Delete Forum" dialog
+ * 
+ * @author gavinc
+ */
+public class DeleteForumDialog extends DeleteSpaceDialog
+{
+   protected boolean reDisplayForums;
+
+   // ------------------------------------------------------------------------------
+   // Dialog implementation
+   
+   @Override
+   public void init(Map<String, String> parameters)
+   {
+      super.init(parameters);
+      
+      // reset the reDisplayForums flag
+      this.reDisplayForums = false;
+   }
+
+   @Override
+   protected String finishImpl(FacesContext context, String outcome) throws Exception
+   {
+      // find out what the parent type of the node being deleted 
+      Node node = this.browseBean.getActionSpace();
+      ChildAssociationRef assoc = this.nodeService.getPrimaryParent(node.getNodeRef());
+      if (assoc != null)
+      {
+         // get the parent node
+         NodeRef parent = assoc.getParentRef();
+         
+         // get the association type
+         QName type = assoc.getTypeQName();
+         if (type.equals(ForumModel.ASSOC_DISCUSSION))
+         {
+            // if the association type is the 'discussion' association we
+            // need to remove the discussable aspect from the parent node
+            this.nodeService.removeAspect(parent, ForumModel.ASPECT_DISCUSSABLE);
+         }
+         
+         // if the parent type is a forum space then we need the dialog to go
+         // back to the forums view otherwise it will use the default of 'browse',
+         // this happens when a forum being used to discuss a node is deleted.
+         QName parentType = this.nodeService.getType(parent);
+         if (parentType.equals(ForumModel.TYPE_FORUMS))
+         {
+            this.reDisplayForums = true;
+         }
+      }
+
+      return super.finishImpl(context, outcome);
+   }
+
+   @Override
+   protected String doPostCommitProcessing(FacesContext context, String outcome)
+   {
+      outcome = super.doPostCommitProcessing(context, outcome);
+      
+      if (this.reDisplayForums)
+      {
+         return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME +
+                AlfrescoNavigationHandler.OUTCOME_SEPARATOR + "forumDeleted";
+      }
+      else
+      {
+         return outcome;
+      }
+   }
+   
+   // ------------------------------------------------------------------------------
+   // Bean Getters and Setters
+   
+   /**
+    * Returns the confirmation to display to the user before deleting the content.
+    * 
+    * @return The formatted message to display
+    */
+   public String getConfirmMessage()
+   {
+      String fileConfirmMsg = Application.getMessage(FacesContext.getCurrentInstance(), 
+               "delete_forum_confirm");
+      
+      return MessageFormat.format(fileConfirmMsg, 
+            new Object[] {this.browseBean.getActionSpace().getName()});
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/forums/DeleteForumsDialog.java b/source/java/org/alfresco/web/bean/forums/DeleteForumsDialog.java
new file mode 100644
index 0000000000..a8902db9ee
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/forums/DeleteForumsDialog.java
@@ -0,0 +1,70 @@
+package org.alfresco.web.bean.forums;
+
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.model.ForumModel;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.AlfrescoNavigationHandler;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.spaces.DeleteSpaceDialog;
+
+/**
+ * Bean implementation for the "Delete Forum Space" dialog
+ * 
+ * @author gavinc
+ */
+public class DeleteForumsDialog extends DeleteSpaceDialog
+{
+   protected boolean reDisplayForums;
+
+   // ------------------------------------------------------------------------------
+   // Dialog implementation
+   
+   @Override
+   public void init(Map<String, String> parameters)
+   {
+      super.init(parameters);
+      
+      // reset the reDisplayForums flag
+      this.reDisplayForums = false;
+   }
+
+   @Override
+   protected String finishImpl(FacesContext context, String outcome) throws Exception
+   {
+      // find out what the parent type of the node being deleted 
+      Node node = this.browseBean.getActionSpace();
+      ChildAssociationRef assoc = this.nodeService.getPrimaryParent(node.getNodeRef());
+      if (assoc != null)
+      {
+         NodeRef parent = assoc.getParentRef();
+         QName parentType = this.nodeService.getType(parent);
+         if (parentType.equals(ForumModel.TYPE_FORUMS))
+         {
+            this.reDisplayForums = true;
+         }
+      }
+
+      return super.finishImpl(context, outcome);
+   }
+
+   @Override
+   protected String doPostCommitProcessing(FacesContext context, String outcome)
+   {
+      outcome = super.doPostCommitProcessing(context, outcome);
+      
+      if (this.reDisplayForums)
+      {
+         return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME +
+                AlfrescoNavigationHandler.OUTCOME_SEPARATOR + "forumsDeleted";
+      }
+      else
+      {
+         return outcome;
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/forums/DeletePostDialog.java b/source/java/org/alfresco/web/bean/forums/DeletePostDialog.java
new file mode 100644
index 0000000000..eded89c149
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/forums/DeletePostDialog.java
@@ -0,0 +1,44 @@
+package org.alfresco.web.bean.forums;
+
+import java.text.MessageFormat;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.content.DeleteContentDialog;
+
+/**
+ * Bean implementation for the "Delete Post" dialog.
+ * 
+ * @author gavinc
+ */
+public class DeletePostDialog extends DeleteContentDialog
+{
+   // ------------------------------------------------------------------------------
+   // Dialog implementation
+   
+   @Override
+   protected String doPostCommitProcessing(FacesContext context, String outcome)
+   {
+      super.doPostCommitProcessing(context, outcome);
+      
+      return this.getDefaultFinishOutcome();
+   }
+   
+   // ------------------------------------------------------------------------------
+   // Bean Getters and Setters
+
+   /**
+    * Returns the confirmation to display to the user before deleting the content.
+    * 
+    * @return The formatted message to display
+    */
+   public String getConfirmMessage()
+   {
+      String postConfirmMsg = Application.getMessage(FacesContext.getCurrentInstance(), 
+               "delete_post_confirm");
+      
+      return MessageFormat.format(postConfirmMsg, 
+            new Object[] {this.browseBean.getDocument().getProperties().get("creator")});
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/forums/DeleteTopicDialog.java b/source/java/org/alfresco/web/bean/forums/DeleteTopicDialog.java
new file mode 100644
index 0000000000..fcb2c93869
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/forums/DeleteTopicDialog.java
@@ -0,0 +1,89 @@
+package org.alfresco.web.bean.forums;
+
+import java.text.MessageFormat;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.model.ForumModel;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.AlfrescoNavigationHandler;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.spaces.DeleteSpaceDialog;
+
+/**
+ * Bean implementation for the "Delete Topic" dialog
+ * 
+ * @author gavinc
+ */
+public class DeleteTopicDialog extends DeleteSpaceDialog
+{
+   protected boolean reDisplayTopics;
+
+   // ------------------------------------------------------------------------------
+   // Dialog implementation
+   
+   @Override
+   public void init(Map<String, String> parameters)
+   {
+      super.init(parameters);
+      
+      // reset the reDisplayTopics flag
+      this.reDisplayTopics = false;
+   }
+
+   @Override
+   protected String finishImpl(FacesContext context, String outcome) throws Exception
+   {
+      // find out what the parent type of the node being deleted 
+      Node node = this.browseBean.getActionSpace();
+      ChildAssociationRef assoc = this.nodeService.getPrimaryParent(node.getNodeRef());
+      if (assoc != null)
+      {
+         NodeRef parent = assoc.getParentRef();
+         QName parentType = this.nodeService.getType(parent);
+         if (parentType.equals(ForumModel.TYPE_FORUM))
+         {
+            this.reDisplayTopics = true;
+         }
+      }
+
+      return super.finishImpl(context, outcome);
+   }
+
+   @Override
+   protected String doPostCommitProcessing(FacesContext context, String outcome)
+   {
+      outcome = super.doPostCommitProcessing(context, outcome);
+      
+      if (this.reDisplayTopics)
+      {
+         return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME +
+                AlfrescoNavigationHandler.OUTCOME_SEPARATOR + "topicDeleted";
+      }
+      else
+      {
+         return outcome;
+      }
+   }
+   
+   // ------------------------------------------------------------------------------
+   // Bean Getters and Setters
+   
+   /**
+    * Returns the confirmation to display to the user before deleting the content.
+    * 
+    * @return The formatted message to display
+    */
+   public String getConfirmMessage()
+   {
+      String fileConfirmMsg = Application.getMessage(FacesContext.getCurrentInstance(), 
+               "delete_topic_confirm");
+      
+      return MessageFormat.format(fileConfirmMsg, 
+            new Object[] {this.browseBean.getActionSpace().getName()});
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/forums/ForumsBean.java b/source/java/org/alfresco/web/bean/forums/ForumsBean.java
index 124d38388c..81d016fd86 100644
--- a/source/java/org/alfresco/web/bean/forums/ForumsBean.java
+++ b/source/java/org/alfresco/web/bean/forums/ForumsBean.java
@@ -51,7 +51,6 @@ import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
-import org.alfresco.web.app.AlfrescoNavigationHandler;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.app.context.IContextListener;
 import org.alfresco.web.app.context.UIContextService;
@@ -768,148 +767,6 @@ public class ForumsBean implements IContextListener
                children.size() + " children!");
       }
    }
-      
-   /**
-    * Called when the user confirms they wish to delete a forum space
-    * 
-    * @return The outcome
-    */
-   public String deleteForumsOK()
-   {
-      String outcomeOverride = "browse";
-      
-      // find out what the parent type of the node being deleted 
-      Node node = this.browseBean.getActionSpace();
-      ChildAssociationRef assoc = this.nodeService.getPrimaryParent(node.getNodeRef());
-      if (assoc != null)
-      {
-         NodeRef parent = assoc.getParentRef();
-         QName parentType = this.nodeService.getType(parent);
-         if (parentType.equals(ForumModel.TYPE_FORUMS))
-         {
-            outcomeOverride = "forumsDeleted";
-         }
-      }
-      
-      // call the generic handler
-      String outcome = this.browseBean.deleteSpaceOK();
-      
-      // if the delete was successful update the outcome
-      if (outcome != null)
-      {
-         // return an overidden outcome which closes the dialog with an outcome
-         outcome = AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME +
-                   AlfrescoNavigationHandler.OUTCOME_SEPARATOR + outcomeOverride;
-      }
-
-      return outcome;
-   }
-   
-   /**
-    * Called when the user confirms they wish to delete a forum space
-    * 
-    * @return The outcome
-    */
-   public String deleteForumOK()
-   {
-      String outcomeOverride = "browse";
-      
-      // if this forum is being used for a discussion on a node we also
-      // need to remove the discussable aspect from the node.
-      Node forumSpace = this.browseBean.getActionSpace();
-      ChildAssociationRef assoc = this.nodeService.getPrimaryParent(forumSpace.getNodeRef());
-      if (assoc != null)
-      {
-         // get the parent node
-         NodeRef parent = assoc.getParentRef();
-         
-         // get the association type
-         QName type = assoc.getTypeQName();
-         if (type.equals(ForumModel.ASSOC_DISCUSSION))
-         {
-            // if the association type is the 'discussion' association we
-            // need to remove the discussable aspect from the parent node
-            this.nodeService.removeAspect(parent, ForumModel.ASPECT_DISCUSSABLE);
-         }
-         
-         // if the parent type is a forum space then we need the dialog to go
-         // back to the forums view otherwise it will use the default of 'browse',
-         // this happens when a forum being used to discuss a node is deleted.
-         QName parentType = this.nodeService.getType(parent);
-         if (parentType.equals(ForumModel.TYPE_FORUMS))
-         {
-            outcomeOverride = "forumDeleted";
-         }
-      }
-      
-      // call the generic handler
-      String outcome = this.browseBean.deleteSpaceOK();
-      
-      // if the delete was successful update the outcome
-      if (outcome != null)
-      {
-         // return an overidden outcome which closes the dialog with an outcome
-         outcome = AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME +
-                   AlfrescoNavigationHandler.OUTCOME_SEPARATOR + outcomeOverride;
-      }
-      
-      return outcome;
-   }
-   
-   /**
-    * Called when the user confirms they wish to delete a forum space
-    * 
-    * @return The outcome
-    */
-   public String deleteTopicOK()
-   {
-      String outcomeOverride = "browse";
-      
-      // find out what the parent type of the node being deleted 
-      Node node = this.browseBean.getActionSpace();
-      ChildAssociationRef assoc = this.nodeService.getPrimaryParent(node.getNodeRef());
-      if (assoc != null)
-      {
-         NodeRef parent = assoc.getParentRef();
-         QName parentType = this.nodeService.getType(parent);
-         if (parentType.equals(ForumModel.TYPE_FORUM))
-         {
-            outcomeOverride = "topicDeleted";
-         }
-      }
-      
-      // call the generic handler
-      String outcome = this.browseBean.deleteSpaceOK();
-      
-      // if the delete was successful update the outcome
-      if (outcome != null)
-      {
-         outcome = AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME +
-                   AlfrescoNavigationHandler.OUTCOME_SEPARATOR + outcomeOverride;
-      }
-      
-      return outcome;
-   }
-   
-   /**
-    * Called when the user confirms they wish to delete a forum space
-    * 
-    * @return The outcome
-    */
-   public String deletePostOK()
-   {
-      // call the generic handler
-      String outcome = this.browseBean.deleteFileOK();
-      
-      // if the delete was successful update the outcome
-      if (outcome != null)
-      {
-         outcome = AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME;
-      }
-      
-      return outcome;
-   }
-   
    
    // ------------------------------------------------------------------------------
    // Property Resolvers
diff --git a/source/java/org/alfresco/web/bean/spaces/DeleteSpaceDialog.java b/source/java/org/alfresco/web/bean/spaces/DeleteSpaceDialog.java
new file mode 100644
index 0000000000..5001db6ca6
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/spaces/DeleteSpaceDialog.java
@@ -0,0 +1,100 @@
+package org.alfresco.web.bean.spaces;
+
+import java.text.MessageFormat;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+
+import org.alfresco.web.app.AlfrescoNavigationHandler;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.content.DeleteContentDialog;
+import org.alfresco.web.bean.dialog.BaseDialogBean;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.ui.common.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Bean implementation for the "Delete Space" dialog
+ * 
+ * @author gavinc
+ */
+public class DeleteSpaceDialog extends BaseDialogBean
+{
+   private static final Log logger = LogFactory.getLog(DeleteContentDialog.class);
+
+   // ------------------------------------------------------------------------------
+   // Dialog implementation
+   
+   @Override
+   protected String finishImpl(FacesContext context, String outcome)
+         throws Exception
+   {
+      // get the space to delete
+      Node node = this.browseBean.getActionSpace();
+      if (node != null)
+      {
+         if (logger.isDebugEnabled())
+            logger.debug("Trying to delete space: " + node.getId());
+            
+         this.nodeService.deleteNode(node.getNodeRef());
+      }
+      else
+      {
+         logger.warn("WARNING: delete called without a current Space!");
+      }
+      
+      return outcome;
+   }
+   
+   @Override
+   protected String doPostCommitProcessing(FacesContext context, String outcome)
+   {
+      Node node = this.browseBean.getActionSpace();
+      
+      // remove this node from the breadcrumb if required
+      this.browseBean.removeSpaceFromBreadcrumb(node);
+            
+      // add a message to inform the user that the delete was OK 
+      String statusMsg = MessageFormat.format(
+            Application.getMessage(FacesContext.getCurrentInstance(), "status_space_deleted"), 
+            new Object[]{node.getName()});
+      Utils.addStatusMessage(FacesMessage.SEVERITY_INFO, statusMsg);
+      
+      // clear action context
+      this.browseBean.setActionSpace(null);
+      
+      // setting the outcome will show the browse view again
+      return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME + 
+             AlfrescoNavigationHandler.OUTCOME_SEPARATOR + "browse";
+   }
+   
+   @Override
+   protected String getErrorMessageId()
+   {
+      return "error_delete_space";
+   }
+   
+   @Override
+   public boolean getFinishButtonDisabled()
+   {
+      return false;
+   }
+   
+   // ------------------------------------------------------------------------------
+   // Bean Getters and Setters
+   
+   /**
+    * Returns the confirmation to display to the user before deleting the content.
+    * 
+    * @return The formatted message to display
+    */
+   public String getConfirmMessage()
+   {
+      String fileConfirmMsg = Application.getMessage(FacesContext.getCurrentInstance(), 
+               "delete_space_confirm");
+      
+      return MessageFormat.format(fileConfirmMsg, 
+            new Object[] {this.browseBean.getActionSpace().getName()});
+   }
+}
diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml
index 17b5b55b71..296811df9b 100644
--- a/source/web/WEB-INF/faces-config-beans.xml
+++ b/source/web/WEB-INF/faces-config-beans.xml
@@ -179,6 +179,43 @@
       </managed-property>
    </managed-bean>
 
+   <managed-bean>
+      <description>
+         The bean that backs up the Delete Space Dialog
+      </description>
+      <managed-bean-name>DeleteSpaceDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.spaces.DeleteSpaceDialog</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>namespaceService</property-name>
+         <value>#{NamespaceService}</value>
+      </managed-property>
+   </managed-bean>
+   
    <managed-bean>
       <description>
          The bean that holds a users Clipboard state.
@@ -495,6 +532,43 @@
       </managed-property>
    </managed-bean>
    
+   <managed-bean>
+      <description>
+         The bean that backs up the Delete Content Dialog
+      </description>
+      <managed-bean-name>DeleteContentDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.content.DeleteContentDialog</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>namespaceService</property-name>
+         <value>#{NamespaceService}</value>
+      </managed-property>
+   </managed-bean>
+   
    <managed-bean>
       <description>
          The bean that backs up the Link Properties Dialog
@@ -1402,6 +1476,154 @@
       </managed-property>
    </managed-bean>
    
+   <managed-bean>
+      <description>
+         The bean that backs up the Delete Forum Space Dialog
+      </description>
+      <managed-bean-name>DeleteForumsDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.forums.DeleteForumsDialog</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>namespaceService</property-name>
+         <value>#{NamespaceService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Delete Forum Dialog
+      </description>
+      <managed-bean-name>DeleteForumDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.forums.DeleteForumDialog</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>namespaceService</property-name>
+         <value>#{NamespaceService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Delete Topic Dialog
+      </description>
+      <managed-bean-name>DeleteTopicDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.forums.DeleteTopicDialog</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>namespaceService</property-name>
+         <value>#{NamespaceService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Delete Post Dialog
+      </description>
+      <managed-bean-name>DeletePostDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.forums.DeletePostDialog</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>namespaceService</property-name>
+         <value>#{NamespaceService}</value>
+      </managed-property>
+   </managed-bean>
+   
    <managed-bean>
       <description>
          The bean that holds state for the Manage Deleted Items screen.
diff --git a/source/web/WEB-INF/faces-config-navigation.xml b/source/web/WEB-INF/faces-config-navigation.xml
index 1528a0d7dd..5ca6e3a9c2 100644
--- a/source/web/WEB-INF/faces-config-navigation.xml
+++ b/source/web/WEB-INF/faces-config-navigation.xml
@@ -97,14 +97,6 @@
    <!-- Browse screen action outcomes -->
    <navigation-rule>
       <from-view-id>/jsp/browse/browse.jsp</from-view-id>
-      <navigation-case>
-         <from-outcome>deleteSpace</from-outcome>
-         <to-view-id>/jsp/dialog/delete-space.jsp</to-view-id>
-      </navigation-case>
-      <navigation-case>
-         <from-outcome>deleteFile</from-outcome>
-         <to-view-id>/jsp/dialog/delete-file.jsp</to-view-id>
-      </navigation-case>
       <navigation-case>
          <from-outcome>addContent</from-outcome>
          <to-view-id>/jsp/content/add-content-dialog.jsp</to-view-id>
@@ -267,10 +259,6 @@
          <from-outcome>manageRules</from-outcome>
          <to-view-id>/jsp/dialog/rules.jsp</to-view-id>
       </navigation-case>
-      <navigation-case>
-         <from-outcome>deleteSpace</from-outcome>
-         <to-view-id>/jsp/dialog/delete-space.jsp</to-view-id>
-      </navigation-case>
       <navigation-case>
          <from-outcome>import</from-outcome>
          <to-view-id>/jsp/dialog/import.jsp</to-view-id>
@@ -315,10 +303,6 @@
          <from-outcome>updateFile</from-outcome>
          <to-view-id>/jsp/dialog/update-file.jsp</to-view-id>
       </navigation-case>
-      <navigation-case>
-         <from-outcome>deleteFile</from-outcome>
-         <to-view-id>/jsp/dialog/delete-file.jsp</to-view-id>
-      </navigation-case>
       <navigation-case>
          <from-outcome>editFile</from-outcome>
          <to-view-id>/jsp/dialog/edit-file.jsp</to-view-id>
@@ -339,10 +323,6 @@
          <from-outcome>editCategories</from-outcome>
          <to-view-id>/jsp/dialog/edit-category.jsp</to-view-id>
       </navigation-case>
-      <navigation-case>
-         <from-outcome>createAction</from-outcome>
-         <to-view-id>/jsp/wizard/create-action/action.jsp</to-view-id>
-      </navigation-case>
       <navigation-case>
          <from-outcome>previewContent</from-outcome>
          <to-view-id>/jsp/dialog/preview-file.jsp</to-view-id>
@@ -432,10 +412,6 @@
          <from-outcome>manageContentUsers</from-outcome>
          <to-view-id>/jsp/roles/manage-content-users.jsp</to-view-id>
       </navigation-case>
-      <navigation-case>
-         <from-outcome>deleteFile</from-outcome>
-         <to-view-id>/jsp/dialog/delete-file.jsp</to-view-id>
-      </navigation-case>
    </navigation-rule>
    
    <!-- Space Link object details page navigation -->
@@ -449,10 +425,6 @@
          <from-outcome>manageContentUsers</from-outcome>
          <to-view-id>/jsp/roles/manage-content-users.jsp</to-view-id>
       </navigation-case>
-      <navigation-case>
-         <from-outcome>deleteFile</from-outcome>
-         <to-view-id>/jsp/dialog/delete-file.jsp</to-view-id>
-      </navigation-case>
    </navigation-rule>
    
    <!-- Edit Link object properties page navigation -->
@@ -823,24 +795,6 @@
          <from-outcome>showTopicDetails</from-outcome>
          <to-view-id>/jsp/forums/topic-details.jsp</to-view-id>
       </navigation-case>
-      
-      <navigation-case>
-         <from-outcome>deleteForums</from-outcome>
-         <to-view-id>/jsp/forums/delete-forums.jsp</to-view-id>
-      </navigation-case>
-      <navigation-case>
-         <from-outcome>deleteForum</from-outcome>
-         <to-view-id>/jsp/forums/delete-forum.jsp</to-view-id>
-      </navigation-case>
-      <navigation-case>
-         <from-outcome>deleteTopic</from-outcome>
-         <to-view-id>/jsp/forums/delete-topic.jsp</to-view-id>
-      </navigation-case>
-      <navigation-case>
-         <from-outcome>deletePost</from-outcome>
-         <to-view-id>/jsp/forums/delete-post.jsp</to-view-id>
-      </navigation-case>
-      
       <navigation-case>
          <from-outcome>manageInvitedUsers</from-outcome>
          <to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
@@ -855,34 +809,6 @@
       </navigation-case>
    </navigation-rule>
    
-   <navigation-rule>
-      <from-view-id>/jsp/forums/delete-forums.jsp</from-view-id>
-      <navigation-case>
-         <from-outcome>forumsDeleted</from-outcome>
-         <to-view-id>/jsp/forums/forums.jsp</to-view-id>
-      </navigation-case>
-      <navigation-case>
-         <from-outcome>browse</from-outcome>
-         <to-view-id>/jsp/browse/browse.jsp</to-view-id>
-      </navigation-case>
-   </navigation-rule>
-   
-   <navigation-rule>
-      <from-view-id>/jsp/forums/delete-forum.jsp</from-view-id>
-      <navigation-case>
-         <from-outcome>forumDeleted</from-outcome>
-         <to-view-id>/jsp/forums/forums.jsp</to-view-id>
-      </navigation-case>
-   </navigation-rule>
-   
-   <navigation-rule>
-      <from-view-id>/jsp/forums/delete-topic.jsp</from-view-id>
-      <navigation-case>
-         <from-outcome>topicDeleted</from-outcome>
-         <to-view-id>/jsp/forums/forum.jsp</to-view-id>
-      </navigation-case>
-   </navigation-rule>
-   
    <!-- Manage Deleted Items screen action outcomes -->
    <navigation-rule>
       <from-view-id>/jsp/trashcan/*</from-view-id>
@@ -920,4 +846,21 @@
       </navigation-case>
    </navigation-rule>
 
+   <!-- Overridden dialog:close rules -->
+   <navigation-rule>
+      <from-view-id>/jsp/dialog/container.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>forumsDeleted</from-outcome>
+         <to-view-id>/jsp/forums/forums.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>forumDeleted</from-outcome>
+         <to-view-id>/jsp/forums/forums.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>topicDeleted</from-outcome>
+         <to-view-id>/jsp/forums/forum.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
 </faces-config>
diff --git a/source/web/jsp/dialog/delete-file.jsp b/source/web/jsp/dialog/delete-file.jsp
deleted file mode 100644
index 228626540a..0000000000
--- a/source/web/jsp/dialog/delete-file.jsp
+++ /dev/null
@@ -1,157 +0,0 @@
-<%--
-  Copyright (C) 2005 Alfresco, Inc.
- 
-  Licensed under the Mozilla Public License version 1.1 
-  with a permitted attribution clause. You may obtain a
-  copy of the License at
- 
-    http://www.alfresco.org/legal/license.txt
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-  either express or implied. See the License for the specific
-  language governing permissions and limitations under the
-  License.
---%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
-<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
-
-<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
-<%@ page isELIgnored="false" %>
-<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
-
-<r:page titleId="title_delete_file">
-
-<f:view>
-   
-   <%-- load a bundle of properties with I18N strings --%>
-   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
-   
-   <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="delete-file">
-   
-   <%-- Main outer table --%>
-   <table cellspacing="0" cellpadding="2">
-      
-      <%-- Title bar --%>
-      <tr>
-         <td colspan="2">
-            <%@ include file="../parts/titlebar.jsp" %>
-         </td>
-      </tr>
-      
-      <%-- Main area --%>
-      <tr valign="top">
-         <%-- Shelf --%>
-         <td>
-            <%@ include file="../parts/shelf.jsp" %>
-         </td>
-         
-         <%-- Work Area --%>
-         <td width="100%">
-            <table cellspacing="0" cellpadding="0" width="100%">
-               <%-- Breadcrumb --%>
-               <%@ include file="../parts/breadcrumb.jsp" %>
-               
-               <%-- Status and Actions --%>
-               <tr>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
-                  <td bgcolor="#EEEEEE">
-                     
-                     <%-- Status and Actions inner contents table --%>
-                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
-                     <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr>
-                           <td width="32">
-                              <h:graphicImage url="/images/icons/delete_large.gif"/>
-                           </td>
-                           <td>
-                              <div class="mainTitle"><h:outputText value="#{msg.delete_file}" /> '<h:outputText value="#{BrowseBean.document.name}" />'</div>
-                              <div class="mainSubText"><h:outputText value="#{msg.delete_file_info}" /></div>
-                           </td>
-                        </tr>
-                     </table>
-                     
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with gradient shadow --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
-               </tr>
-               
-               <%-- Details --%>
-               <tr valign=top>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
-                  <td>
-                     <table cellspacing="0" cellpadding="4" border="0" width="100%">
-                        <tr>
-                           
-                           <td width="100%" valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
-                              <table cellpadding="2" cellspacing="2" border="0">
-                                 <tr>
-                                    <td class="mainSubTitle">
-                                       <h:outputFormat value="#{msg.delete_file_confirm}">
-                                          <f:param value="#{BrowseBean.document.name}"/>
-                                       </h:outputFormat>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td>
-                                       <%-- Error Messages --%>
-                                       <%-- messages tag to show messages not handled by other specific message tags --%>
-                                       <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
-                                    <td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
-                           </td>
-                           
-                           <td valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <table cellpadding="1" cellspacing="1" border="0">
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.yes}" action="#{BrowseBean.deleteFileOK}" styleClass="dialogControls" />
-                                    </td>
-                                 </tr>
-                                 <tr><td class="dialogButtonSpacing"></td></tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.no}" action="dialog:close" styleClass="dialogControls" />
-                                    </td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                        </tr>
-                     </table>
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with bottom panel graphics --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
-                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
-               </tr>
-               
-            </table>
-          </td>
-       </tr>
-    </table>
-    
-    </h:form>
-    
-</f:view>
-
-</r:page>
diff --git a/source/web/jsp/dialog/delete-space.jsp b/source/web/jsp/dialog/delete-space.jsp
deleted file mode 100644
index 2126763bb7..0000000000
--- a/source/web/jsp/dialog/delete-space.jsp
+++ /dev/null
@@ -1,173 +0,0 @@
-<%--
-  Copyright (C) 2005 Alfresco, Inc.
- 
-  Licensed under the Mozilla Public License version 1.1 
-  with a permitted attribution clause. You may obtain a
-  copy of the License at
- 
-    http://www.alfresco.org/legal/license.txt
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-  either express or implied. See the License for the specific
-  language governing permissions and limitations under the
-  License.
---%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
-<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
-
-<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
-<%@ page isELIgnored="false" %>
-<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
-
-<r:page titleId="title_delete_space">
-
-<f:view>
-   
-   <%-- load a bundle of properties with I18N strings --%>
-   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
-   
-   <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="delete-space">
-   
-   <%-- Main outer table --%>
-   <table cellspacing="0" cellpadding="2">
-      
-      <%-- Title bar --%>
-      <tr>
-         <td colspan="2">
-            <%@ include file="../parts/titlebar.jsp" %>
-         </td>
-      </tr>
-      
-      <%-- Main area --%>
-      <tr valign="top">
-         <%-- Shelf --%>
-         <td>
-            <%@ include file="../parts/shelf.jsp" %>
-         </td>
-         
-         <%-- Work Area --%>
-         <td width="100%">
-            <table cellspacing="0" cellpadding="0" width="100%">
-               <%-- Breadcrumb --%>
-               <%@ include file="../parts/breadcrumb.jsp" %>
-               
-               <%-- Status and Actions --%>
-               <tr>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
-                  <td bgcolor="#EEEEEE">
-                     
-                     <%-- Status and Actions inner contents table --%>
-                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
-                     <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr>
-                           <td width="32">
-                              <h:graphicImage url="/images/icons/delete_large.gif"/>
-                           </td>
-                           <td>
-                              <div class="mainTitle"><h:outputText value="#{msg.delete_space}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
-                              <div class="mainSubText"><h:outputText value="#{msg.delete_space_info}" /></div>
-                           </td>
-                        </tr>
-                     </table>
-                     
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with gradient shadow --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
-               </tr>
-               
-               <%-- Details --%>
-               <tr valign=top>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
-                  <td>
-                     <table cellspacing="0" cellpadding="4" border="0" width="100%">
-                        <tr>
-                           
-                           <td width="100%" valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
-                              <table cellpadding="2" cellspacing="2" border="0">
-                                 <a:panel id="delete-panel" rendered="#{BrowseBean.deleteMessage != null}">
-                                 <tr>
-                                    <td width="100%" valign="top">
-                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
-                                       <table cellpadding="0" cellspacing="0" border="0" width="100%">
-                                          <tr>
-                                             <td valign=top style="padding-top:2px" width=20><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/></td>
-                                             <td class="mainSubText">
-                                                <h:outputText value="#{BrowseBean.deleteMessage}" />
-                                             </td>
-                                          </tr>
-                                       </table>
-                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
-                                    </td>
-                                 </tr>
-                                 </a:panel>
-                                 <tr>
-                                    <td class="mainSubTitle">
-                                       <h:outputFormat value="#{msg.delete_space_confirm}">
-                                          <f:param value="#{BrowseBean.actionSpace.name}"/>
-                                       </h:outputFormat>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td>
-                                       <%-- Error Messages --%>
-                                       <%-- messages tag to show messages not handled by other specific message tags --%>
-                                       <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
-                                    <td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
-                           </td>
-                           
-                           <td valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <table cellpadding="1" cellspacing="1" border="0">
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.yes}" action="#{BrowseBean.deleteSpaceOK}" styleClass="dialogControls" />
-                                    </td>
-                                 </tr>
-                                 <tr><td class="dialogButtonSpacing"></td></tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.no}" action="dialog:close" styleClass="dialogControls" />
-                                    </td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                        </tr>
-                     </table>
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with bottom panel graphics --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
-                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
-               </tr>
-               
-            </table>
-          </td>
-       </tr>
-    </table>
-    
-    </h:form>
-    
-</f:view>
-
-</r:page>
diff --git a/source/web/jsp/dialog/delete.jsp b/source/web/jsp/dialog/delete.jsp
new file mode 100644
index 0000000000..d14067c888
--- /dev/null
+++ b/source/web/jsp/dialog/delete.jsp
@@ -0,0 +1,26 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+               
+<h:outputText value="#{DialogManager.bean.confirmMessage}" styleClass="mainSubTitle" />
\ No newline at end of file
diff --git a/source/web/jsp/forums/delete-forum.jsp b/source/web/jsp/forums/delete-forum.jsp
deleted file mode 100644
index 289f18acff..0000000000
--- a/source/web/jsp/forums/delete-forum.jsp
+++ /dev/null
@@ -1,173 +0,0 @@
-<%--
-  Copyright (C) 2005 Alfresco, Inc.
- 
-  Licensed under the Mozilla Public License version 1.1 
-  with a permitted attribution clause. You may obtain a
-  copy of the License at
- 
-    http://www.alfresco.org/legal/license.txt
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-  either express or implied. See the License for the specific
-  language governing permissions and limitations under the
-  License.
---%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
-<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
-
-<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
-<%@ page isELIgnored="false" %>
-<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
-
-<r:page titleId="title_delete_forum_space">
-
-<f:view>
-   
-   <%-- load a bundle of properties with I18N strings --%>
-   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
-   
-   <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="delete-forum-space">
-   
-   <%-- Main outer table --%>
-   <table cellspacing="0" cellpadding="2">
-      
-      <%-- Title bar --%>
-      <tr>
-         <td colspan="2">
-            <%@ include file="../parts/titlebar.jsp" %>
-         </td>
-      </tr>
-      
-      <%-- Main area --%>
-      <tr valign="top">
-         <%-- Shelf --%>
-         <td>
-            <%@ include file="../parts/shelf.jsp" %>
-         </td>
-         
-         <%-- Work Area --%>
-         <td width="100%">
-            <table cellspacing="0" cellpadding="0" width="100%">
-               <%-- Breadcrumb --%>
-               <%@ include file="../parts/breadcrumb.jsp" %>
-               
-               <%-- Status and Actions --%>
-               <tr>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
-                  <td bgcolor="#EEEEEE">
-                     
-                     <%-- Status and Actions inner contents table --%>
-                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
-                     <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr>
-                           <td width="32">
-                              <h:graphicImage url="/images/icons/delete_forum_large.gif"/>
-                           </td>
-                           <td>
-                              <div class="mainTitle"><h:outputText value="#{msg.delete_forum}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
-                              <div class="mainSubText"><h:outputText value="#{msg.delete_forum_info}" /></div>
-                           </td>
-                        </tr>
-                     </table>
-                     
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with gradient shadow --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
-               </tr>
-               
-               <%-- Details --%>
-               <tr valign=top>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
-                  <td>
-                     <table cellspacing="0" cellpadding="4" border="0" width="100%">
-                        <tr>
-                           
-                           <td width="100%" valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
-                              <table cellpadding="2" cellspacing="2" border="0">
-                                 <a:panel id="delete-panel" rendered="#{BrowseBean.deleteMessage != null}">
-                                 <tr>
-                                    <td width="100%" valign="top">
-                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
-                                       <table cellpadding="0" cellspacing="0" border="0" width="100%">
-                                          <tr>
-                                             <td valign=top style="padding-top:2px" width=20><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/></td>
-                                             <td class="mainSubText">
-                                                <h:outputText value="#{BrowseBean.deleteMessage}" />
-                                             </td>
-                                          </tr>
-                                       </table>
-                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
-                                    </td>
-                                 </tr>
-                                 </a:panel>
-                                 <tr>
-                                    <td class="mainSubTitle">
-                                       <h:outputFormat value="#{msg.delete_forum_confirm}">
-                                          <f:param value="#{BrowseBean.actionSpace.name}"/>
-                                       </h:outputFormat>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td>
-                                       <%-- Error Messages --%>
-                                       <%-- messages tag to show messages not handled by other specific message tags --%>
-                                       <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
-                                    <td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
-                           </td>
-                           
-                           <td valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <table cellpadding="1" cellspacing="1" border="0">
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.yes}" action="#{ForumsBean.deleteForumOK}" styleClass="dialogControls" />
-                                    </td>
-                                 </tr>
-                                 <tr><td class="dialogButtonSpacing"></td></tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.no}" action="dialog:close" styleClass="dialogControls" />
-                                    </td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                        </tr>
-                     </table>
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with bottom panel graphics --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
-                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
-               </tr>
-               
-            </table>
-          </td>
-       </tr>
-    </table>
-    
-    </h:form>
-    
-</f:view>
-
-</r:page>
diff --git a/source/web/jsp/forums/delete-forums.jsp b/source/web/jsp/forums/delete-forums.jsp
deleted file mode 100644
index b8784137a0..0000000000
--- a/source/web/jsp/forums/delete-forums.jsp
+++ /dev/null
@@ -1,173 +0,0 @@
-<%--
-  Copyright (C) 2005 Alfresco, Inc.
- 
-  Licensed under the Mozilla Public License version 1.1 
-  with a permitted attribution clause. You may obtain a
-  copy of the License at
- 
-    http://www.alfresco.org/legal/license.txt
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-  either express or implied. See the License for the specific
-  language governing permissions and limitations under the
-  License.
---%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
-<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
-
-<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
-<%@ page isELIgnored="false" %>
-<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
-
-<r:page titleId="title_delete_forums_space">
-
-<f:view>
-   
-   <%-- load a bundle of properties with I18N strings --%>
-   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
-   
-   <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="delete-forums-space">
-   
-   <%-- Main outer table --%>
-   <table cellspacing="0" cellpadding="2">
-      
-      <%-- Title bar --%>
-      <tr>
-         <td colspan="2">
-            <%@ include file="../parts/titlebar.jsp" %>
-         </td>
-      </tr>
-      
-      <%-- Main area --%>
-      <tr valign="top">
-         <%-- Shelf --%>
-         <td>
-            <%@ include file="../parts/shelf.jsp" %>
-         </td>
-         
-         <%-- Work Area --%>
-         <td width="100%">
-            <table cellspacing="0" cellpadding="0" width="100%">
-               <%-- Breadcrumb --%>
-               <%@ include file="../parts/breadcrumb.jsp" %>
-               
-               <%-- Status and Actions --%>
-               <tr>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
-                  <td bgcolor="#EEEEEE">
-                     
-                     <%-- Status and Actions inner contents table --%>
-                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
-                     <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr>
-                           <td width="32">
-                              <h:graphicImage url="/images/icons/delete_forums_large.gif"/>
-                           </td>
-                           <td>
-                              <div class="mainTitle"><h:outputText value="#{msg.delete_forums}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
-                              <div class="mainSubText"><h:outputText value="#{msg.delete_forums_info}" /></div>
-                           </td>
-                        </tr>
-                     </table>
-                     
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with gradient shadow --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
-               </tr>
-               
-               <%-- Details --%>
-               <tr valign=top>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
-                  <td>
-                     <table cellspacing="0" cellpadding="4" border="0" width="100%">
-                        <tr>
-                           
-                           <td width="100%" valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
-                              <table cellpadding="2" cellspacing="2" border="0">
-                                 <a:panel id="delete-panel" rendered="#{BrowseBean.deleteMessage != null}">
-                                 <tr>
-                                    <td width="100%" valign="top">
-                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
-                                       <table cellpadding="0" cellspacing="0" border="0" width="100%">
-                                          <tr>
-                                             <td valign=top style="padding-top:2px" width=20><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/></td>
-                                             <td class="mainSubText">
-                                                <h:outputText value="#{BrowseBean.deleteMessage}" />
-                                             </td>
-                                          </tr>
-                                       </table>
-                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
-                                    </td>
-                                 </tr>
-                                 </a:panel>
-                                 <tr>
-                                    <td class="mainSubTitle">
-                                       <h:outputFormat value="#{msg.delete_space_confirm}">
-                                          <f:param value="#{BrowseBean.actionSpace.name}"/>
-                                       </h:outputFormat>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td>
-                                       <%-- Error Messages --%>
-                                       <%-- messages tag to show messages not handled by other specific message tags --%>
-                                       <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
-                                    <td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
-                           </td>
-                           
-                           <td valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <table cellpadding="1" cellspacing="1" border="0">
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.yes}" action="#{ForumsBean.deleteForumsOK}" styleClass="dialogControls" />
-                                    </td>
-                                 </tr>
-                                 <tr><td class="dialogButtonSpacing"></td></tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.no}" action="dialog:close" styleClass="dialogControls" />
-                                    </td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                        </tr>
-                     </table>
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with bottom panel graphics --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
-                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
-               </tr>
-               
-            </table>
-          </td>
-       </tr>
-    </table>
-    
-    </h:form>
-    
-</f:view>
-
-</r:page>
diff --git a/source/web/jsp/forums/delete-post.jsp b/source/web/jsp/forums/delete-post.jsp
deleted file mode 100644
index 8c14341e65..0000000000
--- a/source/web/jsp/forums/delete-post.jsp
+++ /dev/null
@@ -1,173 +0,0 @@
-<%--
-  Copyright (C) 2005 Alfresco, Inc.
- 
-  Licensed under the Mozilla Public License version 1.1 
-  with a permitted attribution clause. You may obtain a
-  copy of the License at
- 
-    http://www.alfresco.org/legal/license.txt
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-  either express or implied. See the License for the specific
-  language governing permissions and limitations under the
-  License.
---%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
-<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
-
-<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
-<%@ page isELIgnored="false" %>
-<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
-
-<r:page titleId="title_delete_post">
-
-<f:view>
-   
-   <%-- load a bundle of properties with I18N strings --%>
-   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
-   
-   <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="delete-post">
-   
-   <%-- Main outer table --%>
-   <table cellspacing="0" cellpadding="2">
-      
-      <%-- Title bar --%>
-      <tr>
-         <td colspan="2">
-            <%@ include file="../parts/titlebar.jsp" %>
-         </td>
-      </tr>
-      
-      <%-- Main area --%>
-      <tr valign="top">
-         <%-- Shelf --%>
-         <td>
-            <%@ include file="../parts/shelf.jsp" %>
-         </td>
-         
-         <%-- Work Area --%>
-         <td width="100%">
-            <table cellspacing="0" cellpadding="0" width="100%">
-               <%-- Breadcrumb --%>
-               <%@ include file="../parts/breadcrumb.jsp" %>
-               
-               <%-- Status and Actions --%>
-               <tr>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
-                  <td bgcolor="#EEEEEE">
-                     
-                     <%-- Status and Actions inner contents table --%>
-                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
-                     <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr>
-                           <td width="32">
-                              <h:graphicImage url="/images/icons/delete_large.gif"/>
-                           </td>
-                           <td>
-                              <div class="mainTitle"><h:outputText value="#{msg.delete_post}" /></div>
-                              <div class="mainSubText"><h:outputText value="#{msg.delete_post_info}" /></div>
-                           </td>
-                        </tr>
-                     </table>
-                     
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with gradient shadow --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
-               </tr>
-               
-               <%-- Details --%>
-               <tr valign=top>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
-                  <td>
-                     <table cellspacing="0" cellpadding="4" border="0" width="100%">
-                        <tr>
-                           
-                           <td width="100%" valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
-                              <table cellpadding="2" cellspacing="2" border="0">
-                                 <a:panel id="delete-panel" rendered="#{BrowseBean.deleteMessage != null}">
-                                 <tr>
-                                    <td width="100%" valign="top">
-                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
-                                       <table cellpadding="0" cellspacing="0" border="0" width="100%">
-                                          <tr>
-                                             <td valign=top style="padding-top:2px" width=20><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/></td>
-                                             <td class="mainSubText">
-                                                <h:outputText value="#{BrowseBean.deleteMessage}" />
-                                             </td>
-                                          </tr>
-                                       </table>
-                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
-                                    </td>
-                                 </tr>
-                                 </a:panel>
-                                 <tr>
-                                    <td class="mainSubTitle">
-                                       <h:outputFormat value="#{msg.delete_post_confirm}">
-                                          <f:param value="#{BrowseBean.document.properties.creator}"/>
-                                       </h:outputFormat>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td>
-                                       <%-- Error Messages --%>
-                                       <%-- messages tag to show messages not handled by other specific message tags --%>
-                                       <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
-                                    <td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
-                           </td>
-                           
-                           <td valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <table cellpadding="1" cellspacing="1" border="0">
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.yes}" action="#{ForumsBean.deletePostOK}" styleClass="dialogControls" />
-                                    </td>
-                                 </tr>
-                                 <tr><td class="dialogButtonSpacing"></td></tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.no}" action="dialog:close" styleClass="dialogControls" />
-                                    </td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                        </tr>
-                     </table>
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with bottom panel graphics --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
-                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
-               </tr>
-               
-            </table>
-          </td>
-       </tr>
-    </table>
-    
-    </h:form>
-    
-</f:view>
-
-</r:page>
diff --git a/source/web/jsp/forums/delete-topic.jsp b/source/web/jsp/forums/delete-topic.jsp
deleted file mode 100644
index 33b24b1aa1..0000000000
--- a/source/web/jsp/forums/delete-topic.jsp
+++ /dev/null
@@ -1,173 +0,0 @@
-<%--
-  Copyright (C) 2005 Alfresco, Inc.
- 
-  Licensed under the Mozilla Public License version 1.1 
-  with a permitted attribution clause. You may obtain a
-  copy of the License at
- 
-    http://www.alfresco.org/legal/license.txt
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-  either express or implied. See the License for the specific
-  language governing permissions and limitations under the
-  License.
---%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
-<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
-
-<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
-<%@ page isELIgnored="false" %>
-<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
-
-<r:page titleId="title_delete_topic_space">
-
-<f:view>
-   
-   <%-- load a bundle of properties with I18N strings --%>
-   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
-   
-   <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="delete-topic-space">
-   
-   <%-- Main outer table --%>
-   <table cellspacing="0" cellpadding="2">
-      
-      <%-- Title bar --%>
-      <tr>
-         <td colspan="2">
-            <%@ include file="../parts/titlebar.jsp" %>
-         </td>
-      </tr>
-      
-      <%-- Main area --%>
-      <tr valign="top">
-         <%-- Shelf --%>
-         <td>
-            <%@ include file="../parts/shelf.jsp" %>
-         </td>
-         
-         <%-- Work Area --%>
-         <td width="100%">
-            <table cellspacing="0" cellpadding="0" width="100%">
-               <%-- Breadcrumb --%>
-               <%@ include file="../parts/breadcrumb.jsp" %>
-               
-               <%-- Status and Actions --%>
-               <tr>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
-                  <td bgcolor="#EEEEEE">
-                     
-                     <%-- Status and Actions inner contents table --%>
-                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
-                     <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr>
-                           <td width="32">
-                              <h:graphicImage url="/images/icons/delete_topic_large.gif"/>
-                           </td>
-                           <td>
-                              <div class="mainTitle"><h:outputText value="#{msg.delete_topic}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
-                              <div class="mainSubText"><h:outputText value="#{msg.delete_topic_info}" /></div>
-                           </td>
-                        </tr>
-                     </table>
-                     
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with gradient shadow --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
-               </tr>
-               
-               <%-- Details --%>
-               <tr valign=top>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
-                  <td>
-                     <table cellspacing="0" cellpadding="4" border="0" width="100%">
-                        <tr>
-                           
-                           <td width="100%" valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
-                              <table cellpadding="2" cellspacing="2" border="0">
-                                 <a:panel id="delete-panel" rendered="#{BrowseBean.deleteMessage != null}">
-                                 <tr>
-                                    <td width="100%" valign="top">
-                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
-                                       <table cellpadding="0" cellspacing="0" border="0" width="100%">
-                                          <tr>
-                                             <td valign=top style="padding-top:2px" width=20><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/></td>
-                                             <td class="mainSubText">
-                                                <h:outputText value="#{BrowseBean.deleteMessage}" />
-                                             </td>
-                                          </tr>
-                                       </table>
-                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
-                                    </td>
-                                 </tr>
-                                 </a:panel>
-                                 <tr>
-                                    <td class="mainSubTitle">
-                                       <h:outputFormat value="#{msg.delete_topic_confirm}">
-                                          <f:param value="#{BrowseBean.actionSpace.name}"/>
-                                       </h:outputFormat>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td>
-                                       <%-- Error Messages --%>
-                                       <%-- messages tag to show messages not handled by other specific message tags --%>
-                                       <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
-                                    <td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
-                           </td>
-                           
-                           <td valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <table cellpadding="1" cellspacing="1" border="0">
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.yes}" action="#{ForumsBean.deleteTopicOK}" styleClass="dialogControls" />
-                                    </td>
-                                 </tr>
-                                 <tr><td class="dialogButtonSpacing"></td></tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.no}" action="dialog:close" styleClass="dialogControls" />
-                                    </td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                        </tr>
-                     </table>
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with bottom panel graphics --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
-                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
-               </tr>
-               
-            </table>
-          </td>
-       </tr>
-    </table>
-    
-    </h:form>
-    
-</f:view>
-
-</r:page>
diff --git a/source/web/jsp/wizard/add-content/properties.jsp b/source/web/jsp/wizard/add-content/properties.jsp
deleted file mode 100644
index cc7736519d..0000000000
--- a/source/web/jsp/wizard/add-content/properties.jsp
+++ /dev/null
@@ -1,267 +0,0 @@
-<%--
-  Copyright (C) 2005 Alfresco, Inc.
- 
-  Licensed under the Mozilla Public License version 1.1 
-  with a permitted attribution clause. You may obtain a
-  copy of the License at
- 
-    http://www.alfresco.org/legal/license.txt
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-  either express or implied. See the License for the specific
-  language governing permissions and limitations under the
-  License.
---%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
-<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
-
-<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
-<%@ page isELIgnored="false" %>
-<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
-
-<r:page titleId="title_add_content_props">
-
-<script language="JavaScript1.2">
-
-   window.onload = pageLoaded;
-   
-   function pageLoaded()
-   {
-      document.getElementById("add-content-properties:file-name").focus();
-      checkButtonState();
-   }
-
-   function checkButtonState()
-   {
-      if (document.getElementById("add-content-properties:file-name").value.length == 0 ||
-          document.getElementById("add-content-properties:title").value.length == 0)
-      {
-         document.getElementById("add-content-properties:next-button").disabled = true;
-         document.getElementById("add-content-properties:finish-button").disabled = true;
-      }
-      else
-      {
-         document.getElementById("add-content-properties:next-button").disabled = false;
-         document.getElementById("add-content-properties:finish-button").disabled = false;
-      }
-   }
-</script>
-
-<f:view>
-   
-   <%-- load a bundle of properties with I18N strings --%>
-   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
-   
-   <h:form acceptCharset="UTF-8" id="add-content-properties">
-   
-   <%-- Main outer table --%>
-   <table cellspacing="0" cellpadding="2">
-      
-      <%-- Title bar --%>
-      <tr>
-         <td colspan="2">
-            <%@ include file="../../parts/titlebar.jsp" %>
-         </td>
-      </tr>
-      
-      <%-- Main area --%>
-      <tr valign="top">
-         <%-- Shelf --%>
-         <td>
-            <%@ include file="../../parts/shelf.jsp" %>
-         </td>
-         
-         <%-- Work Area --%>
-         <td width="100%">
-            <table cellspacing="0" cellpadding="0" width="100%">
-               <%-- Breadcrumb --%>
-               <%@ include file="../../parts/breadcrumb.jsp" %>
-               
-               <%-- Status and Actions --%>
-               <tr>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
-                  <td bgcolor="#EEEEEE">
-                  
-                     <%-- Status and Actions inner contents table --%>
-                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
-                     <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr>
-                           <td width="32">
-                              <h:graphicImage id="wizard-logo" url="/images/icons/add_content_large.gif" />
-                           </td>
-                           <td>
-                              <div class="mainTitle"><h:outputText value="#{AddContentWizard.wizardTitle}" /></div>
-                              <div class="mainSubText"><h:outputText value="#{AddContentWizard.wizardDescription}" /></div>
-                           </td>
-                        </tr>
-                     </table>
-                     
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with gradient shadow --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
-               </tr>
-               
-               <%-- Details --%>
-               <tr valign=top>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
-                  <td>
-                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
-                        <tr>
-                           <td width="20%" valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
-                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
-                                    value="2" disabled="true">
-                                 <a:listItem value="1" label="1. #{msg.upload_document}" />
-                                 <a:listItem value="2" label="2. #{msg.properties}" />
-                                 <a:listItem value="3" label="3. #{msg.summary}" />
-                              </a:modeList>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                           <td width="100%" valign="top">
-                              
-                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
-                              
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
-                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
-                                 <tr>
-                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{AddContentWizard.stepTitle}" /></td>
-                                 </tr>
-                                 <tr>
-                                    <td colspan="2" class="mainSubText"><h:outputText value="#{AddContentWizard.stepDescription}" /></td>
-                                 </tr>
-                                 <tr><td colspan="2" class="paddingRow"></td></tr>
-                                 <tr>
-                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.general}"/></td>
-                                 </tr>
-                                 <tr>
-                                    <td><h:outputText value="#{msg.file_name}"/>:</td>
-                                    <td width="85%">
-                                       <h:inputText id="file-name" value="#{AddContentWizard.fileName}" size="35" maxlength="1024" 
-                                                    onkeyup="javascript:checkButtonState();" />&nbsp;*
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td><h:outputText value="#{msg.type}"/>:</td>
-                                    <td>
-                                       <h:selectOneMenu value="#{AddContentWizard.objectType}">
-                                          <f:selectItems value="#{AddContentWizard.objectTypes}" />
-                                       </h:selectOneMenu>&nbsp;*
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td><h:outputText value="#{msg.content_type}"/>:</td>
-                                    <td>
-                                       <h:selectOneMenu value="#{AddContentWizard.contentType}">
-                                          <f:selectItems value="#{AddContentWizard.contentTypes}" />
-                                       </h:selectOneMenu>&nbsp;*
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td><h:outputText value="#{msg.title}"/>:</td>
-                                    <td>
-                                       <h:inputText id="title" value="#{AddContentWizard.title}" size="35" maxlength="1024"
-                                                    onkeyup="javascript:checkButtonState();" />&nbsp;*
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td><h:outputText value="#{msg.description}"/>:</td>
-                                    <td>
-                                       <h:inputText value="#{AddContentWizard.description}" size="35" maxlength="1024" />
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td><h:outputText value="#{msg.author}"/>:</td>
-                                    <td>
-                                       <h:inputText value="#{AddContentWizard.author}" size="35" maxlength="1024" />
-                                    </td>
-                                 </tr>
-                                 <tr><td class="paddingRow"></td></tr>
-                                 <tr>
-                                    <td></td>
-                                    <td><table cellspacing=0 cellpadding=0>
-                                          <tr>
-                                             <td><h:selectBooleanCheckbox value="#{AddContentWizard.inlineEdit}" /></td>
-                                             <td width=100%><nobr>&nbsp;<h:outputText value="#{msg.inline_editable}"/></nobr></td>
-                                          </tr>
-                                          <tr>
-                                             <td colspan=2>
-                                                <div id="info" style="padding-left: 2px; padding-top: 2px;">
-                                                   <h:graphicImage alt="" value="/images/icons/info_icon.gif" style="vertical-align: middle;" />&nbsp;
-                                                   <h:outputText value="#{msg.warning_inline}" />
-                                                </div>
-                                             </td>
-                                          </tr>
-                                       </table></td>
-                                 </tr>
-                                 <tr><td class="paddingRow"></td></tr>
-                                 <tr>
-                                    <td colspan="2"><h:outputText value="#{AddContentWizard.stepInstructions}" /></td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
-                           </td>
-                           
-                           <td valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <table cellpadding="1" cellspacing="1" border="0">
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton id="next-button" value="#{msg.next_button}" action="#{AddContentWizard.next}" 
-                                                        styleClass="wizardButton" disabled="#{AddContentWizard.nextFinishDisabled}" />
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.back_button}" action="#{AddContentWizard.back}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton id="finish-button" value="#{msg.finish_button}" action="#{AddContentWizard.finish}" 
-                                                        styleClass="wizardButton" disabled="#{AddContentWizard.nextFinishDisabled}" />
-                                    </td>
-                                 </tr>
-                                 <tr><td class="wizardButtonSpacing"></td></tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.cancel_button}" action="#{AddContentWizard.cancel}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                        </tr>
-                     </table>
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with bottom panel graphics --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
-                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
-               </tr>
-               
-            </table>
-          </td>
-       </tr>
-    </table>
-    
-    </h:form>
-    
-</f:view>
-
-</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/add-content/summary.jsp b/source/web/jsp/wizard/add-content/summary.jsp
deleted file mode 100644
index c788f0189b..0000000000
--- a/source/web/jsp/wizard/add-content/summary.jsp
+++ /dev/null
@@ -1,173 +0,0 @@
-<%--
-  Copyright (C) 2005 Alfresco, Inc.
- 
-  Licensed under the Mozilla Public License version 1.1 
-  with a permitted attribution clause. You may obtain a
-  copy of the License at
- 
-    http://www.alfresco.org/legal/license.txt
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-  either express or implied. See the License for the specific
-  language governing permissions and limitations under the
-  License.
---%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
-<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
-
-<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
-<%@ page isELIgnored="false" %>
-<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
-
-<r:page titleId="title_add_content_summary">
-
-<f:view>
-   
-   <%-- load a bundle of properties with I18N strings --%>
-   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
-
-   <h:form acceptCharset="UTF-8" id="add-content-summary">
-   
-   <%-- Main outer table --%>
-   <table cellspacing="0" cellpadding="2">
-      
-      <%-- Title bar --%>
-      <tr>
-         <td colspan="2">
-            <%@ include file="../../parts/titlebar.jsp" %>
-         </td>
-      </tr>
-      
-      <%-- Main area --%>
-      <tr valign="top">
-         <%-- Shelf --%>
-         <td>
-            <%@ include file="../../parts/shelf.jsp" %>
-         </td>
-         
-         <%-- Work Area --%>
-         <td width="100%">
-            <table cellspacing="0" cellpadding="0" width="100%">
-               <%-- Breadcrumb --%>
-               <%@ include file="../../parts/breadcrumb.jsp" %>
-               
-               <%-- Status and Actions --%>
-               <tr>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
-                  <td bgcolor="#EEEEEE">
-                  
-                     <%-- Status and Actions inner contents table --%>
-                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
-                     <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr>
-                           <td width="32">
-                              <h:graphicImage id="wizard-logo" url="/images/icons/add_content_large.gif" />
-                           </td>
-                           <td>
-                              <div class="mainTitle"><h:outputText value="#{AddContentWizard.wizardTitle}" /></div>
-                              <div class="mainSubText"><h:outputText value="#{AddContentWizard.wizardDescription}" /></div>
-                           </td>
-                        </tr>
-                     </table>
-                     
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with gradient shadow --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
-               </tr>
-               
-               <%-- Details --%>
-               <tr valign=top>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
-                  <td>
-                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
-                        <tr>
-                           <td width="20%" valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
-                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
-                                    value="3" disabled="true">
-                                 <a:listItem value="1" label="1. #{msg.upload_document}" />
-                                 <a:listItem value="2" label="2. #{msg.properties}" />
-                                 <a:listItem value="3" label="3. #{msg.summary}" />
-                              </a:modeList>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                           
-                           <td width="100%" valign="top">
-                              
-                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
-                              
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
-                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
-                                 <tr>
-                                    <td class="mainSubTitle"><h:outputText value="#{AddContentWizard.stepTitle}" /></td>
-                                 </tr>
-                                 <tr>
-                                    <td class="mainSubText"><h:outputText value="#{AddContentWizard.stepDescription}" /></td>
-                                 </tr>
-                                 <tr>
-                                    <td><h:outputText value="#{AddContentWizard.summary}" escape="false" /></td>
-                                 </tr>
-                                 <tr>
-                                    <td><h:outputText value="#{AddContentWizard.stepInstructions}" escape="false" /></td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
-                           </td>
-                           
-                           <td valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <table cellpadding="1" cellspacing="1" border="0">
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.finish_button}" action="#{AddContentWizard.finish}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.back_button}" action="#{AddContentWizard.back}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                                 <tr><td class="wizardButtonSpacing"></td></tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.cancel_button}" action="#{AddContentWizard.cancel}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                        </tr>
-                     </table>
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with bottom panel graphics --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
-                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
-               </tr>
-               
-            </table>
-          </td>
-       </tr>
-    </table>
-    
-    </h:form>
-    
-</f:view>
-
-</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/add-content/upload.jsp b/source/web/jsp/wizard/add-content/upload.jsp
deleted file mode 100644
index 3dbb6aa678..0000000000
--- a/source/web/jsp/wizard/add-content/upload.jsp
+++ /dev/null
@@ -1,212 +0,0 @@
-<%--
-  Copyright (C) 2005 Alfresco, Inc.
- 
-  Licensed under the Mozilla Public License version 1.1 
-  with a permitted attribution clause. You may obtain a
-  copy of the License at
- 
-    http://www.alfresco.org/legal/license.txt
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-  either express or implied. See the License for the specific
-  language governing permissions and limitations under the
-  License.
---%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
-<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
-
-<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
-<%@ page isELIgnored="false" %>
-<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
-<%@ page import="org.alfresco.web.bean.wizard.AddContentWizard" %>
-<%@ page import="org.alfresco.web.app.Application" %>
-<%@ page import="org.alfresco.web.app.servlet.FacesHelper" %>
-<%@ page import="javax.faces.context.FacesContext" %>
-
-<r:page titleId="title_add_content_upload">
-
-<f:view>
-   
-   <%-- load a bundle of properties with I18N strings --%>
-   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
-   
-   <h:form acceptCharset="UTF-8" id="add-content-upload-start">
-   
-   <%-- Main outer table --%>
-   <table cellspacing="0" cellpadding="2">
-      
-      <%-- Title bar --%>
-      <tr>
-         <td colspan="2">
-            <%@ include file="../../parts/titlebar.jsp" %>
-         </td>
-      </tr>
-      
-      <%-- Main area --%>
-      <tr valign="top">
-         <%-- Shelf --%>
-         <td>
-            <%@ include file="../../parts/shelf.jsp" %>
-         </td>
-         
-         <%-- Work Area --%>
-         <td width="100%">
-            <table cellspacing="0" cellpadding="0" width="100%">
-               <%-- Breadcrumb --%>
-               <%@ include file="../../parts/breadcrumb.jsp" %>
-               
-               <%-- Status and Actions --%>
-               <tr>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
-                  <td bgcolor="#EEEEEE">
-                  
-                     <%-- Status and Actions inner contents table --%>
-                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
-                     <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr>
-                           <td width="32">
-                              <h:graphicImage id="wizard-logo" url="/images/icons/add_content_large.gif" />
-                           </td>
-                           <td>
-                              <div class="mainTitle"><h:outputText value="#{AddContentWizard.wizardTitle}" /></div>
-                              <div class="mainSubText"><h:outputText value="#{AddContentWizard.wizardDescription}" /></div>
-                           </td>
-                        </tr>
-                     </table>
-                     
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with gradient shadow --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
-               </tr>
-                              
-               <%-- Details --%>
-               <tr valign=top>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
-                  <td>
-                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
-                        <tr>
-                           <td width="20%" valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
-                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
-                                          value="1" disabled="true">
-                                <a:listItem value="1" label="1. #{msg.upload_document}" />
-                                 <a:listItem value="2" label="2. #{msg.properties}" />
-                                 <a:listItem value="3" label="3. #{msg.summary}" />
-                              </a:modeList>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>   
-                           
-                           </h:form>
-                        
-                           <td width="100%" valign="top">
-                              
-                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
-                              
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
-                              <table cellpadding="2" cellspacing="2" border="0">
-                                 <tr>
-                                    <td class="mainSubTitle"><h:outputText value="#{AddContentWizard.stepTitle}" /></td>
-                                 </tr>
-                                 <tr>
-                                    <td class="mainSubText"><h:outputText value="#{AddContentWizard.stepDescription}" /></td>
-                                 </tr>
-                                 <tr><td class="paddingRow"></td></tr>
-                                 <tr>
-                                    <td class="mainSubText">1. <h:outputText value="#{msg.locate_document}"/></td>
-                                 </tr>
-                                 <tr><td class="paddingRow"></td></tr>
-                                 
-                                 <r:uploadForm>
-                                 <tr>
-                                    <td>
-                                       <h:outputText value="#{msg.content_location}"/>:<input style="margin-left:12px;" type="file" size="50" name="alfFileInput"/>
-                                    </td>
-                                 </tr>
-                                 <tr><td class="paddingRow"></td></tr>
-                                 <tr>
-                                    <td class="mainSubText">2. <h:outputText value="#{msg.click_upload}"/></td>
-                                 </tr>
-                                 <tr>
-                                    <td>
-                                       <input style="margin-left:12px;" type="submit" value="<%=Application.getMessage(FacesContext.getCurrentInstance(), "upload")%>" />
-                                    </td>
-                                 </tr>
-                                 </r:uploadForm>
-                                 
-                                 <h:form acceptCharset="UTF-8" id="add-content-upload-end">
-                                 <tr><td class="paddingRow">===TEST JSP===</td></tr>
-                                 <%
-                                 AddContentWizard wiz = (AddContentWizard)FacesHelper.getManagedBean(FacesContext.getCurrentInstance(), "AddContentWizard");
-                                 if (wiz != null && wiz.getFileName() != null) {
-                                 %>
-                                    <tr>
-                                       <td>
-                                          <img alt="" align="absmiddle" src="<%=request.getContextPath()%>/images/icons/info_icon.gif" />
-                                          <%=wiz.getFileUploadSuccessMsg()%>
-                                       </td>
-                                    </tr>
-                                 <% } %>
-                                 <tr><td class="paddingRow"></td></tr>
-                                 <tr>
-                                    <td><h:outputText value="#{AddContentWizard.stepInstructions}" escape="false" /></td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
-                           </td>
-                           <td valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <table cellpadding="1" cellspacing="1" border="0">
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.next_button}" action="#{AddContentWizard.next}" styleClass="wizardButton" disabled="#{AddContentWizard.fileName == null}" />
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.finish_button}" action="#{AddContentWizard.finish}" styleClass="wizardButton" disabled="true" />
-                                    </td>
-                                 </tr>
-                                 <tr><td class="wizardButtonSpacing"></td></tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.cancel_button}" action="#{AddContentWizard.cancel}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                        </tr>
-                     </table>
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with bottom panel graphics --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
-                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
-               </tr>
-               
-            </table>
-          </td>
-       </tr>
-    </table>
-    
-  </h:form>
-    
-</f:view>
-
-</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-content/create-html.jsp b/source/web/jsp/wizard/create-content/create-html.jsp
deleted file mode 100644
index 8b7e82f0c0..0000000000
--- a/source/web/jsp/wizard/create-content/create-html.jsp
+++ /dev/null
@@ -1,208 +0,0 @@
-<%--
-  Copyright (C) 2005 Alfresco, Inc.
- 
-  Licensed under the Mozilla Public License version 1.1 
-  with a permitted attribution clause. You may obtain a
-  copy of the License at
- 
-    http://www.alfresco.org/legal/license.txt
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-  either express or implied. See the License for the specific
-  language governing permissions and limitations under the
-  License.
---%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
-<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
-
-<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
-<%@ page isELIgnored="false" %>
-<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
-
-<r:page titleId="title_create_content">
-
-<script language="javascript" type="text/javascript" src="<%=request.getContextPath()%>/scripts/tiny_mce/tiny_mce.js"></script>
-<script language="javascript" type="text/javascript">
-
-   <%-- Init the Tiny MCE in-line HTML editor --%>
-   tinyMCE.init({
-   	theme : "advanced",
-   	mode : "exact",
-   	elements : "editor",
-   	save_callback : "saveContent",
-		plugins : "table",
-		theme_advanced_toolbar_location : "top",
-		theme_advanced_toolbar_align : "left",
-		theme_advanced_buttons1_add : "fontselect,fontsizeselect",
-		theme_advanced_buttons2_add : "separator,forecolor,backcolor",
-		theme_advanced_buttons3_add_before : "tablecontrols,separator",
-		theme_advanced_disable: "styleselect",
-		extended_valid_elements : "a[href|target|name],font[face|size|color|style],span[class|align|style]"
-   });
-   
-   function saveContent(id, content)
-   {
-      document.forms['create-html']['create-html:editorOutput'].value = content;
-   }
-   
-   var isIE = (document.all);
-   
-</script>
-
-
-<f:view>
-   
-   <%-- load a bundle of properties with I18N strings --%>
-   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
-   
-   <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="create-html">
-   
-   <%-- Main outer table --%>
-   <table cellspacing="0" cellpadding="2">
-      
-      <%-- Title bar --%>
-      <tr>
-         <td colspan="2">
-            <%@ include file="../../parts/titlebar.jsp" %>
-         </td>
-      </tr>
-      
-      <%-- Main area --%>
-      <tr valign="top">
-         <%-- Shelf --%>
-         <td>
-            <%@ include file="../../parts/shelf.jsp" %>
-         </td>
-         
-         <%-- Work Area --%>
-         <td width="100%">
-            <table cellspacing="0" cellpadding="0" width="100%">
-               <%-- Breadcrumb --%>
-               <%@ include file="../../parts/breadcrumb.jsp" %>
-               
-               <%-- Status and Actions --%>
-               <tr>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
-                  <td bgcolor="#EEEEEE">
-                  
-                     <%-- Status and Actions inner contents table --%>
-                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
-                     <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr>
-                           <td width="32">
-                              <h:graphicImage id="wizard-logo" url="/images/icons/new_content_large.gif" />
-                           </td>
-                           <td>
-                              <div class="mainTitle"><h:outputText value="#{CreateContentWizard.wizardTitle}" /></div>
-                              <div class="mainSubText"><h:outputText value="#{CreateContentWizard.wizardDescription}" /></div>
-                           </td>
-                        </tr>
-                     </table>
-                     
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with gradient shadow --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
-               </tr>
-               
-               <%-- Details --%>
-               <tr valign=top>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
-                  <td height="100%">
-                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
-                        <tr>
-                           <td width="20%" valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
-                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
-                                    value="2" disabled="true">
-                                 <a:listItem value="1" label="1. #{msg.select_type}" />
-                                 <a:listItem value="2" label="2. #{msg.enter_content}" />
-                                 <a:listItem value="3" label="3. #{msg.properties}" />
-                                 <a:listItem value="4" label="4. #{msg.summary}" />
-                              </a:modeList>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                           
-                           <td width="100%" valign="top" height="100%">
-                              
-                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
-                              
-                              <div id='editor' style='width:100%; height:360px'>
-                                 <h:outputText value="#{CreateContentWizard.content}" escape="false" />
-                              </div>
-                              <h:inputHidden id="editorOutput" value="#{CreateContentWizard.content}" />
-                              
-                           </td>
-                           
-                           <td valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <table cellpadding="1" cellspacing="1" border="0">
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.next_button}" action="#{CreateContentWizard.next}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.back_button}" action="#{CreateContentWizard.back}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.finish_button}" action="#{CreateContentWizard.finish}" styleClass="wizardButton" disabled="true" />
-                                    </td>
-                                 </tr>
-                                 <tr><td class="wizardButtonSpacing"></td></tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.cancel_button}" action="#{CreateContentWizard.cancel}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                        </tr>
-                     </table>
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- Error Messages --%>
-               <tr valign="top">
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
-                  <td>
-                     <%-- messages tag to show messages not handled by other specific message tags --%>
-                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with bottom panel graphics --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
-                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
-               </tr>
-               
-            </table>
-          </td>
-       </tr>
-    </table>
-    
-    </h:form>
-    
-</f:view>
-
-</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-content/create-text.jsp b/source/web/jsp/wizard/create-content/create-text.jsp
deleted file mode 100644
index 564def1d9e..0000000000
--- a/source/web/jsp/wizard/create-content/create-text.jsp
+++ /dev/null
@@ -1,176 +0,0 @@
-<%--
-  Copyright (C) 2005 Alfresco, Inc.
- 
-  Licensed under the Mozilla Public License version 1.1 
-  with a permitted attribution clause. You may obtain a
-  copy of the License at
- 
-    http://www.alfresco.org/legal/license.txt
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-  either express or implied. See the License for the specific
-  language governing permissions and limitations under the
-  License.
---%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
-<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
-
-<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
-<%@ page isELIgnored="false" %>
-<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
-
-<r:page titleId="title_create_content">
-
-<f:view>
-   
-   <%-- load a bundle of properties with I18N strings --%>
-   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
-   
-   <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="create-text">
-   
-   <%-- Main outer table --%>
-   <table cellspacing="0" cellpadding="2">
-      
-      <%-- Title bar --%>
-      <tr>
-         <td colspan="2">
-            <%@ include file="../../parts/titlebar.jsp" %>
-         </td>
-      </tr>
-      
-      <%-- Main area --%>
-      <tr valign="top">
-         <%-- Shelf --%>
-         <td>
-            <%@ include file="../../parts/shelf.jsp" %>
-         </td>
-         
-         <%-- Work Area --%>
-         <td width="100%">
-            <table cellspacing="0" cellpadding="0" width="100%">
-               <%-- Breadcrumb --%>
-               <%@ include file="../../parts/breadcrumb.jsp" %>
-               
-               <%-- Status and Actions --%>
-               <tr>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
-                  <td bgcolor="#EEEEEE">
-                  
-                     <%-- Status and Actions inner contents table --%>
-                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
-                     <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr>
-                           <td width="32">
-                              <h:graphicImage id="wizard-logo" url="/images/icons/new_content_large.gif" />
-                           </td>
-                           <td>
-                              <div class="mainTitle"><h:outputText value="#{CreateContentWizard.wizardTitle}" /></div>
-                              <div class="mainSubText"><h:outputText value="#{CreateContentWizard.wizardDescription}" /></div>
-                           </td>
-                        </tr>
-                     </table>
-                     
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with gradient shadow --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
-               </tr>
-               
-               <%-- Details --%>
-               <tr valign=top>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
-                  <td height="100%">
-                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
-                        <tr>
-                           <td width="20%" valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
-                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
-                                    value="2" disabled="true">
-                                 <a:listItem value="1" label="1. #{msg.select_type}" />
-                                 <a:listItem value="2" label="2. #{msg.enter_content}" />
-                                 <a:listItem value="3" label="3. #{msg.properties}" />
-                                 <a:listItem value="4" label="4. #{msg.summary}" />
-                              </a:modeList>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                           
-                           <td width="100%" valign="top" height="100%">
-                              
-                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
-                              
-                              <h:inputTextarea id="textArea" rows="24" cols="112" value="#{CreateContentWizard.content}" />
-                              
-                           </td>
-                           
-                           <td valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <table cellpadding="1" cellspacing="1" border="0">
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.next_button}" action="#{CreateContentWizard.next}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.back_button}" action="#{CreateContentWizard.back}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.finish_button}" action="#{CreateContentWizard.finish}" styleClass="wizardButton" disabled="true" />
-                                    </td>
-                                 </tr>
-                                 <tr><td class="wizardButtonSpacing"></td></tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.cancel_button}" action="#{CreateContentWizard.cancel}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                        </tr>
-                     </table>
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- Error Messages --%>
-               <tr valign="top">
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
-                  <td>
-                     <%-- messages tag to show messages not handled by other specific message tags --%>
-                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with bottom panel graphics --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
-                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
-               </tr>
-               
-            </table>
-          </td>
-       </tr>
-    </table>
-    
-    </h:form>
-    
-</f:view>
-
-</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-content/properties.jsp b/source/web/jsp/wizard/create-content/properties.jsp
deleted file mode 100644
index af92e807f2..0000000000
--- a/source/web/jsp/wizard/create-content/properties.jsp
+++ /dev/null
@@ -1,251 +0,0 @@
-<%--
-  Copyright (C) 2005 Alfresco, Inc.
- 
-  Licensed under the Mozilla Public License version 1.1 
-  with a permitted attribution clause. You may obtain a
-  copy of the License at
- 
-    http://www.alfresco.org/legal/license.txt
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-  either express or implied. See the License for the specific
-  language governing permissions and limitations under the
-  License.
---%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
-<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
-
-<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
-<%@ page isELIgnored="false" %>
-<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
-
-<r:page titleId="title_create_content_props">
-
-<script language="JavaScript1.2">
-
-   window.onload = pageLoaded;
-   
-   function pageLoaded()
-   {
-      document.getElementById("create-content-props:file-name").focus();
-      checkButtonState();
-   }
-   
-   function checkButtonState()
-   {
-      if (document.getElementById("create-content-props:file-name").value.length == 0 ||
-          document.getElementById("create-content-props:title").value.length == 0)
-      {
-         document.getElementById("create-content-props:next-button").disabled = true;
-         document.getElementById("create-content-props:finish-button").disabled = true;
-      }
-      else
-      {
-         document.getElementById("create-content-props:next-button").disabled = false;
-         document.getElementById("create-content-props:finish-button").disabled = false;
-      }
-   }
-</script>
-
-<f:view>
-   
-   <%-- load a bundle of properties with I18N strings --%>
-   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
-   
-   <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="create-content-props">
-   
-   <%-- Main outer table --%>
-   <table cellspacing="0" cellpadding="2">
-      
-      <%-- Title bar --%>
-      <tr>
-         <td colspan="2">
-            <%@ include file="../../parts/titlebar.jsp" %>
-         </td>
-      </tr>
-      
-      <%-- Main area --%>
-      <tr valign="top">
-         <%-- Shelf --%>
-         <td>
-            <%@ include file="../../parts/shelf.jsp" %>
-         </td>
-         
-         <%-- Work Area --%>
-         <td width="100%">
-            <table cellspacing="0" cellpadding="0" width="100%">
-               <%-- Breadcrumb --%>
-               <%@ include file="../../parts/breadcrumb.jsp" %>
-               
-               <%-- Status and Actions --%>
-               <tr>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
-                  <td bgcolor="#EEEEEE">
-                  
-                     <%-- Status and Actions inner contents table --%>
-                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
-                     <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr>
-                           <td width="32">
-                              <h:graphicImage id="wizard-logo" url="/images/icons/new_content_large.gif" />
-                           </td>
-                           <td>
-                              <div class="mainTitle"><h:outputText value="#{CreateContentWizard.wizardTitle}" /></div>
-                              <div class="mainSubText"><h:outputText value="#{CreateContentWizard.wizardDescription}" /></div>
-                           </td>
-                        </tr>
-                     </table>
-                     
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with gradient shadow --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
-               </tr>
-               
-               <%-- Details --%>
-               <tr valign=top>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
-                  <td>
-                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
-                        <tr>
-                           <td width="20%" valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
-                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
-                                    value="3" disabled="true">
-                                 <a:listItem value="1" label="1. #{msg.select_type}" />
-                                 <a:listItem value="2" label="2. #{msg.enter_content}" />
-                                 <a:listItem value="3" label="3. #{msg.properties}" />
-                                 <a:listItem value="4" label="4. #{msg.summary}" />
-                              </a:modeList>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                           <td width="100%" valign="top">
-                              
-                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
-                              
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
-                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
-                                 <tr>
-                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{CreateContentWizard.stepTitle}" /></td>
-                                 </tr>
-                                 <tr>
-                                    <td colspan="2" class="mainSubText"><h:outputText value="#{CreateContentWizard.stepDescription}" /></td>
-                                 </tr>
-                                 <tr><td colspan="2" class="paddingRow"></td></tr>
-                                 <tr>
-                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.general}"/></td>
-                                 </tr>
-                                 <tr>
-                                    <td><h:outputText value="#{msg.file_name}"/>:</td>
-                                    <td width="85%">
-                                       <h:inputText id="file-name" value="#{CreateContentWizard.fileName}" size="35" maxlength="1024" onkeyup="javascript:checkButtonState();" />&nbsp;*
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td><h:outputText value="#{msg.type}"/>:</td>
-                                    <td>
-                                       <h:selectOneMenu value="#{CreateContentWizard.objectType}">
-                                          <f:selectItems value="#{CreateContentWizard.objectTypes}" />
-                                       </h:selectOneMenu>&nbsp;*
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td><h:outputText value="#{msg.content_type}"/>:</td>
-                                    <td>
-                                       <h:selectOneMenu value="#{CreateContentWizard.contentType}">
-                                          <f:selectItems value="#{CreateContentWizard.contentTypes}" />
-                                       </h:selectOneMenu>&nbsp;*
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td><h:outputText value="#{msg.title}"/>:</td>
-                                    <td>
-                                       <h:inputText id="title" value="#{CreateContentWizard.title}" size="35" maxlength="1024" onkeyup="javascript:checkButtonState();" />&nbsp;*
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td><h:outputText value="#{msg.description}"/>:</td>
-                                    <td>
-                                       <h:inputText value="#{CreateContentWizard.description}" size="35" maxlength="1024" />
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td><h:outputText value="#{msg.author}"/>:</td>
-                                    <td>
-                                       <h:inputText value="#{CreateContentWizard.author}" size="35" maxlength="1024" />
-                                    </td>
-                                 </tr>
-                                 <tr><td class="paddingRow"></td></tr>
-                                 <tr>
-                                    <td colspan="2"><h:outputText value="#{CreateContentWizard.stepInstructions}" /></td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
-                           </td>
-                           
-                           <td valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <table cellpadding="1" cellspacing="1" border="0">
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton id="next-button" value="#{msg.next_button}" action="#{CreateContentWizard.next}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.back_button}" action="#{CreateContentWizard.back}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton id="finish-button" value="#{msg.finish_button}" action="#{CreateContentWizard.finish}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                                 <tr><td class="wizardButtonSpacing"></td></tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.cancel_button}" action="#{CreateContentWizard.cancel}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                        </tr>
-                     </table>
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with bottom panel graphics --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
-                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
-               </tr>
-               
-            </table>
-          </td>
-       </tr>
-    </table>
-    
-    </h:form>
-    
-</f:view>
-
-<script>
-   checkButtonState();
-</script>
-
-</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-content/select-type.jsp b/source/web/jsp/wizard/create-content/select-type.jsp
deleted file mode 100644
index b0776acecf..0000000000
--- a/source/web/jsp/wizard/create-content/select-type.jsp
+++ /dev/null
@@ -1,191 +0,0 @@
-<%--
-  Copyright (C) 2005 Alfresco, Inc.
- 
-  Licensed under the Mozilla Public License version 1.1 
-  with a permitted attribution clause. You may obtain a
-  copy of the License at
- 
-    http://www.alfresco.org/legal/license.txt
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-  either express or implied. See the License for the specific
-  language governing permissions and limitations under the
-  License.
---%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
-<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
-
-<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
-<%@ page isELIgnored="false" %>
-<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
-
-<r:page titleId="title_create_content">
-
-<f:view>
-   
-   <%-- load a bundle of properties with I18N strings --%>
-   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
-   
-   <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="select-type">
-   
-   <%-- Main outer table --%>
-   <table cellspacing="0" cellpadding="2">
-      
-      <%-- Title bar --%>
-      <tr>
-         <td colspan="2">
-            <%@ include file="../../parts/titlebar.jsp" %>
-         </td>
-      </tr>
-      
-      <%-- Main area --%>
-      <tr valign="top">
-         <%-- Shelf --%>
-         <td>
-            <%@ include file="../../parts/shelf.jsp" %>
-         </td>
-         
-         <%-- Work Area --%>
-         <td width="100%">
-            <table cellspacing="0" cellpadding="0" width="100%">
-               <%-- Breadcrumb --%>
-               <%@ include file="../../parts/breadcrumb.jsp" %>
-               
-               <%-- Status and Actions --%>
-               <tr>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
-                  <td bgcolor="#EEEEEE">
-                  
-                     <%-- Status and Actions inner contents table --%>
-                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
-                     <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr>
-                           <td width="32">
-                              <h:graphicImage id="wizard-logo" url="/images/icons/new_content_large.gif" />
-                           </td>
-                           <td>
-                              <div class="mainTitle"><h:outputText value="#{CreateContentWizard.wizardTitle}" /></div>
-                              <div class="mainSubText"><h:outputText value="#{CreateContentWizard.wizardDescription}" /></div>
-                           </td>
-                        </tr>
-                     </table>
-                     
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with gradient shadow --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
-               </tr>
-               
-               <%-- Details --%>
-               <tr valign=top>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
-                  <td height="100%">
-                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
-                        <tr>
-                           <td width="20%" valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
-                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
-                                    value="1" disabled="true">
-                                 <a:listItem value="1" label="1. #{msg.select_type}" />
-                                 <a:listItem value="2" label="2. #{msg.enter_content}" />
-                                 <a:listItem value="3" label="3. #{msg.properties}" />
-                                 <a:listItem value="4" label="4. #{msg.summary}" />
-                              </a:modeList>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                           
-                           <td width="100%" valign="top" height="100%">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
-                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
-                              
-                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
-                                 <tr>
-                                    <td class="mainSubTitle"><h:outputText value="#{CreateContentWizard.stepTitle}" /></td>
-                                 </tr>
-                                 <tr>
-                                    <td class="mainSubText"><h:outputText value="#{CreateContentWizard.stepDescription}" /></td>
-                                 </tr>
-                                 <tr><td class="paddingRow"></td></tr>
-                                 <tr>
-                                    <td>
-                                       <h:selectOneRadio value="#{CreateContentWizard.createType}" layout="pageDirection" valueChangeListener="#{CreateContentWizard.createContentChanged}">
-                                          <f:selectItem itemValue="html" itemLabel="#{msg.html_content}" />
-                                          <f:selectItem itemValue="txt" itemLabel="#{msg.text_content}" />
-                                       </h:selectOneRadio>
-                                    </td>
-                                 </tr>
-                                 <tr><td class="paddingRow"></td></tr>
-                                 <tr>
-                                    <td><h:outputText value="#{CreateContentWizard.stepInstructions}" /></td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
-                           </td>
-                           
-                           <td valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <table cellpadding="1" cellspacing="1" border="0">
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.next_button}" action="#{CreateContentWizard.next}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.finish_button}" action="#{CreateContentWizard.finish}" styleClass="wizardButton" disabled="true" />
-                                    </td>
-                                 </tr>
-                                 <tr><td class="wizardButtonSpacing"></td></tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.cancel_button}" action="#{CreateContentWizard.cancel}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                        </tr>
-                     </table>
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- Error Messages --%>
-               <tr valign="top">
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
-                  <td>
-                     <%-- messages tag to show messages not handled by other specific message tags --%>
-                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with bottom panel graphics --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
-                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
-               </tr>
-               
-            </table>
-          </td>
-       </tr>
-    </table>
-    
-    </h:form>
-    
-</f:view>
-
-</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-content/summary.jsp b/source/web/jsp/wizard/create-content/summary.jsp
deleted file mode 100644
index 3c4a883ecb..0000000000
--- a/source/web/jsp/wizard/create-content/summary.jsp
+++ /dev/null
@@ -1,177 +0,0 @@
-<%--
-  Copyright (C) 2005 Alfresco, Inc.
- 
-  Licensed under the Mozilla Public License version 1.1 
-  with a permitted attribution clause. You may obtain a
-  copy of the License at
- 
-    http://www.alfresco.org/legal/license.txt
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-  either express or implied. See the License for the specific
-  language governing permissions and limitations under the
-  License.
---%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
-<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
-
-<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
-<%@ page isELIgnored="false" %>
-<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
-
-<r:page titleId="title_create_content_summary">
-
-<f:view>
-   
-   <%-- load a bundle of properties with I18N strings --%>
-   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
-   
-   <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="create-content-summary">
-   
-   <%-- Main outer table --%>
-   <table cellspacing="0" cellpadding="2">
-      
-      <%-- Title bar --%>
-      <tr>
-         <td colspan="2">
-            <%@ include file="../../parts/titlebar.jsp" %>
-         </td>
-      </tr>
-      
-      <%-- Main area --%>
-      <tr valign="top">
-         <%-- Shelf --%>
-         <td>
-            <%@ include file="../../parts/shelf.jsp" %>
-         </td>
-         
-         <%-- Work Area --%>
-         <td width="100%">
-            <table cellspacing="0" cellpadding="0" width="100%">
-               <%-- Breadcrumb --%>
-               <%@ include file="../../parts/breadcrumb.jsp" %>
-               
-               <%-- Status and Actions --%>
-               <tr>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
-                  <td bgcolor="#EEEEEE">
-                  
-                     <%-- Status and Actions inner contents table --%>
-                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
-                     <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr>
-                           <td width="32">
-                              <h:graphicImage id="wizard-logo" url="/images/icons/new_content_large.gif" />
-                           </td>
-                           <td>
-                              <div class="mainTitle"><h:outputText value="#{CreateContentWizard.wizardTitle}" /></div>
-                              <div class="mainSubText"><h:outputText value="#{CreateContentWizard.wizardDescription}" /></div>
-                           </td>
-                        </tr>
-                     </table>
-                     
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with gradient shadow --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
-               </tr>
-               
-               <%-- Details --%>
-               <tr valign=top>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
-                  <td>
-                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
-                        <tr>
-                           <td width="20%" valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
-                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
-                                    value="4" disabled="true">
-                                 <a:listItem value="1" label="1. #{msg.select_type}" />
-                                 <a:listItem value="2" label="2. #{msg.enter_content}" />
-                                 <a:listItem value="3" label="3. #{msg.properties}" />
-                                 <a:listItem value="4" label="4. #{msg.summary}" />
-                              </a:modeList>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                           
-                           <td width="100%" valign="top">
-                              
-                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
-                              
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
-                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
-                                 <tr>
-                                    <td class="mainSubTitle"><h:outputText value="#{CreateContentWizard.stepTitle}" /></td>
-                                 </tr>
-                                 <tr>
-                                    <td class="mainSubText"><h:outputText value="#{CreateContentWizard.stepDescription}" /></td>
-                                 </tr>
-                                 <tr><td class="paddingRow"></td></tr>
-                                 <tr>
-                                    <td><h:outputText value="#{CreateContentWizard.summary}" escape="false" /></td>
-                                 </tr>
-                                 <tr><td class="paddingRow"></td></tr>
-                                 <tr>
-                                    <td><h:outputText value="#{CreateContentWizard.stepInstructions}" escape="false" /></td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
-                           </td>
-                           
-                           <td valign="top">
-                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <table cellpadding="1" cellspacing="1" border="0">
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.finish_button}" action="#{CreateContentWizard.finish}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.back_button}" action="#{CreateContentWizard.back}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                                 <tr><td class="wizardButtonSpacing"></td></tr>
-                                 <tr>
-                                    <td align="center">
-                                       <h:commandButton value="#{msg.cancel_button}" action="#{CreateContentWizard.cancel}" styleClass="wizardButton" />
-                                    </td>
-                                 </tr>
-                              </table>
-                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
-                           </td>
-                        </tr>
-                     </table>
-                  </td>
-                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
-               </tr>
-               
-               <%-- separator row with bottom panel graphics --%>
-               <tr>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
-                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
-                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
-               </tr>
-               
-            </table>
-          </td>
-       </tr>
-    </table>
-    
-    </h:form>
-    
-</f:view>
-
-</r:page>
\ No newline at end of file