Create Project action added to Projects folder Create menu (only for this folder). Create Project dialog. Config to wire in new action/evaluators and Create Project dialog. Project placeholder icons added. Project type removed from list of types in Advanced Space wizard.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7523 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/messages/webclient.properties

@@ -1816,7 +1816,7 @@ click_to_edit=click to edit
 # File Picker
 go_up=Go up
 
-#Category browsing
+# Category browsing
 category_browser_plugin_label=Categories
 category_browser_plugin_description=Category Browsing
 category_browser_plugin_include_subcategories=Browse items in sub-categories?
@@ -1831,4 +1831,7 @@ title_project=Project Space
 project_info=This view allows you to see the summary of the Project.
 title_project_details=Project Space Details
 modify_project_properties=Modify Project Space Properties
-edit_project_description=Modify the Project space properties then click OK.
+edit_project_description=Modify the Project space properties then click OK.
+create_project_title=Create Project Collaboration Space
+create_project_desc=This wizard helps you create a new space for Project Collaboration
+create_project=Create Project

config/alfresco/web-client-config-actions.xml

@@ -340,8 +340,7 @@
          </action>
 
          <!-- Add content -->
-
-        <action id="add_adm_content">
+         <action id="add_adm_content">
            <permissions>
                <permission allow="true">CreateChildren</permission>
            </permissions>
@@ -446,6 +445,14 @@
             <image>/images/icons/create_website.gif</image>
             <action>wizard:createWebsite</action>
          </action>
+         
+         <!-- Create Project -->
+         <action id="create_project">
+            <evaluator>org.alfresco.web.action.evaluator.CreateProjectEvaluator</evaluator>
+            <label-id>create_project</label-id>
+            <image>/images/icons/create_project.gif</image>
+            <action>dialog:createProject</action>
+         </action>
 
          <!-- Manage Space Users -->
          <action id="manage_space_users">
@@ -823,6 +830,7 @@
             <action idref="create_form" />
             <action idref="create_web_form" />      
             <action idref="create_website_wizard" />
+            <action idref="create_project" />
             <action idref="create_space" />
             <action idref="create_space_wizard" />
          </action-group>

config/alfresco/web-client-config-dialogs.xml

@@ -448,6 +448,10 @@
          
          <dialog name="showSystemInfo" page="/jsp/dialog/system-info.jsp" managed-bean="ShowSystemInfoDialog"
                  icon="/images/icons/file_large.gif" title-id="system_info" show-ok-button="false"/>
+         
+         <dialog name="createProject" page="/jsp/projects/create-project-details.jsp" managed-bean="CreateProjectDialog"
+                 icon="/images/icons/create_project_large.gif" title-id="create_project_title" 
+                 description-id="create_project_desc" />
       </dialogs>
    </config>
    

config/alfresco/web-client-config.xml

@@ -286,7 +286,6 @@
       <!-- The list of custom folder types to show in the advanced space wizard -->
       <folder-types>
          <type name="fm:forums" icon="/images/icons/forums.gif" description-id="forums_desc" />
-         <type name="app:projectfolder" icon="/images/icons/project.gif" description-id="projectfolder_desc" />
       </folder-types>
    </config>
    

source/java/org/alfresco/web/action/evaluator/CreateProjectEvaluator.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing"
+ */
+package org.alfresco.web.action.evaluator;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.servlet.FacesHelper;
+import org.alfresco.web.bean.NavigationBean;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+
+/**
+ * UI Action Evaluator - Create Project Collaboration Space in the Projects folder
+ * 
+ * @author Kevin Roast
+ */
+public class CreateProjectEvaluator extends BaseActionEvaluator
+{
+   /**
+    * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
+    */
+   public boolean evaluate(Node node)
+   {
+      FacesContext fc = FacesContext.getCurrentInstance();
+      ServiceRegistry services = Repository.getServiceRegistry(fc);
+      NavigationBean navigator = (NavigationBean)FacesHelper.getManagedBean(fc, NavigationBean.BEAN_NAME);
+      
+      // get the path to the current name - compare last element with the Website folder assoc name
+      Path path = navigator.getCurrentNode().getNodePath();
+      Path.Element element = path.get(path.size() - 1);
+      String endPath = element.getPrefixedString(services.getNamespaceService());
+      
+      if (Application.getProjectsFolderName(fc).equals(endPath))
+      {
+         // check we have the permission to create nodes in the Projects folder
+         return navigator.getCurrentNode().hasPermission(PermissionService.ADD_CHILDREN);
+      }
+      return false;
+   }
+}

source/java/org/alfresco/web/action/evaluator/CreateWebProjectEvaluator.java

@@ -36,7 +36,7 @@ import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.repository.Repository;
 
 /**
- * UI Action Evaluator - Create Web Project in the Websites folders
+ * UI Action Evaluator - Create Web Project in the Websites folder
  * 
  * @author Kevin Roast
  */
@@ -50,10 +50,12 @@ public class CreateWebProjectEvaluator extends BaseActionEvaluator
       FacesContext fc = FacesContext.getCurrentInstance();
       ServiceRegistry services = Repository.getServiceRegistry(fc);
       NavigationBean navigator = (NavigationBean)FacesHelper.getManagedBean(fc, NavigationBean.BEAN_NAME);
+      
       // get the path to the current name - compare last element with the Website folder assoc name
-      Path path = services.getNodeService().getPath(navigator.getCurrentNode().getNodeRef());
+      Path path = navigator.getCurrentNode().getNodePath();
       Path.Element element = path.get(path.size() - 1);
       String endPath = element.getPrefixedString(services.getNamespaceService());
+      
       if (Application.getWebsitesFolderName(fc).equals(endPath))
       {
          // check we have the permission to create nodes in that Website folder

source/java/org/alfresco/web/app/Application.java

@@ -88,6 +88,7 @@ public class Application
    private static String websitesFolderName;
    private static String webContentFormsFolderName;
    private static String contentFormsFolderName;
+   private static String projectsFolderName;
    
    private static Boolean isDynamicConfig = null;
    
@@ -553,6 +554,22 @@ public class Application
       return getContentFormsFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
    }
    
+   /**
+    * @return the Projects folder name
+    */
+   public static String getProjectsFolderName(ServletContext context)
+   {
+      return getProjectsFolderName(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
+   }
+   
+   /**
+    * @return the Projects folder name
+    */
+   public static String getProjectsFolderName(FacesContext context)
+   {
+      return getProjectsFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
+   }
+   
    /**
     * Set the language locale for the current user context
     * 
@@ -950,6 +967,24 @@ public class Application
       return websitesFolderName;
    }
    
+   /**
+    * Returns the Projects folder name
+    * 
+    * @param context The Spring context
+    * @return The Projects folder name
+    */
+   private static String getProjectsFolderName(WebApplicationContext context)
+   {
+      if (projectsFolderName == null)
+      {
+         ImporterBootstrap bootstrap = (ImporterBootstrap)context.getBean(BEAN_IMPORTER_BOOTSTRAP);
+         Properties configuration = bootstrap.getConfiguration();
+         projectsFolderName = configuration.getProperty("spaces.projects.childname");
+      }
+      
+      return projectsFolderName;
+   }
+   
    /**
     * Returns the WCM Content Forms folder name
     * 

source/java/org/alfresco/web/bean/projects/CreateProjectDialog.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing"
+ */
+package org.alfresco.web.bean.projects;
+
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.model.ApplicationModel;
+import org.alfresco.web.app.AlfrescoNavigationHandler;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.spaces.CreateSpaceWizard;
+
+/**
+ * Dialog bean to create a Project.
+ * 
+ * Uses the CreateSpaceWizard and overrides the space type, finish button label
+ * and the default outcomes.
+ * 
+ * @author Kevin Roast
+ */
+public class CreateProjectDialog extends CreateSpaceWizard
+{
+   // ------------------------------------------------------------------------------
+   // Wizard implementation
+   
+   @Override
+   public void init(Map<String, String> parameters)
+   {
+      super.init(parameters);
+      setSpaceType(ApplicationModel.TYPE_PROJECTSPACE.toString());
+      setIcon("project");
+   }
+
+   @Override
+   public String getFinishButtonLabel()
+   {
+      return Application.getMessage(FacesContext.getCurrentInstance(), "create_project");
+   }
+   
+   @Override
+   protected String getDefaultCancelOutcome()
+   {
+      return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME;
+   }
+
+   @Override
+   protected String getDefaultFinishOutcome()
+   {
+      return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME;
+   }
+}

source/web/WEB-INF/faces-config-beans.xml

@@ -5207,6 +5207,39 @@
          <value>#{SearchProperties}</value>
       </managed-property>
    </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Create Project Dialog
+      </description>
+      <managed-bean-name>CreateProjectDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.projects.CreateProjectDialog</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>namespaceService</property-name>
+         <value>#{NamespaceService}</value>
+      </managed-property>
+   </managed-bean>
 
    <managed-bean>
       <description>The bean for the Save Search Screen.</description>

source/web/jsp/projects/create-project-details.jsp

@@ -0,0 +1,95 @@
+<%--
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing"
+--%>
+<%@ 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" %>
+
+<f:verbatim>
+<script type="text/javascript" src="<%=request.getContextPath()%>/scripts/validation.js"> </script>
+
+<script type="text/javascript">
+   var finishButtonPressed = false;
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("dialog:dialog-body:name").focus();
+      document.getElementById("dialog").onsubmit = validate;
+      document.getElementById("dialog:finish-button").onclick = function() {finishButtonPressed = true; clear_dialog();}
+      checkButtonState();
+   }
+
+   function checkButtonState()
+   {
+      if (document.getElementById("dialog:dialog-body:name").value.length == 0)
+      {
+         document.getElementById("dialog:finish-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("dialog:finish-button").disabled = false;
+      }
+   }
+   
+   function validate()
+   {
+      if (finishButtonPressed)
+      {
+         finishButtonPressed = false;
+         return validateName(document.getElementById("dialog:dialog-body:name"), 
+                             '</f:verbatim><a:outputText value="#{msg.validation_invalid_character}" /><f:verbatim>',
+                             true);
+      }
+      else
+      {
+         return true;
+      }
+   }
+</script>
+</f:verbatim>
+
+<h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
+             width="100%" rowClasses="wizardSectionHeading">
+   <h:outputText value="&nbsp;#{msg.title_space_details}" escape="false" />
+</h:panelGrid>
+
+<h:panelGrid columns="3" cellpadding="2" cellspacing="2" width="100%">
+   <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
+   <h:outputText value="#{msg.name}:"/>
+   <h:inputText id="name" value="#{DialogManager.bean.name}" size="35" maxlength="1024" onkeyup="javascript:checkButtonState();" />
+   
+   <f:verbatim/>
+   <h:outputText value="#{msg.title}:" />
+   <h:inputText id="title" value="#{DialogManager.bean.title}" size="35" maxlength="1024" />
+   
+   <f:verbatim/>
+   <h:outputText value="#{msg.description}:"/>
+   <h:inputText id="description" value="#{DialogManager.bean.description}" size="35" maxlength="1024" />
+</h:panelGrid>

source/web/jsp/spaces/create-space-wizard/details.jsp

@@ -93,77 +93,34 @@
       }
    }
 </script>
+</f:verbatim>
 
-<table cellpadding="3" cellspacing="2" border="0" width="100%">
-   <tr>
-      <td colspan="3" class="wizardSectionHeading">
-         </f:verbatim>
-         <h:outputText value="#{msg.title_space_details}"/>
-         <f:verbatim>
-      </td>
-   </tr>
-   <tr>
-      <td align="middle">
-         </f:verbatim>
-         <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
-         <f:verbatim>
-      </td>
-      <td>
-         </f:verbatim>
-         <h:outputText value="#{msg.name}:"/>
-         <f:verbatim>
-      </td>
-      <td width="85%">
-         </f:verbatim>
-         <h:inputText id="name" value="#{WizardManager.bean.name}" size="35" maxlength="1024"
-                      onkeyup="javascript:checkButtonState();" />
-         <f:verbatim>
-      </td>
-   </tr>
-   <tr>
-      <td></td>
-      <td>
-         </f:verbatim>
-         <h:outputText value="#{msg.title}:" />
-         <f:verbatim>
-      </td>
-      <td>
-         </f:verbatim>
-         <h:inputText id="title" value="#{WizardManager.bean.title}" size="35" maxlength="1024" />
-         <f:verbatim>
-      </td>
-   </tr>
-   <tr>
-      <td></td>
-      <td>
-         </f:verbatim>
-         <h:outputText value="#{msg.description}:"/>
-         <f:verbatim>
-      </td>
-      <td>
-         </f:verbatim>
-         <h:inputText id="description" value="#{WizardManager.bean.description}" size="35" maxlength="1024" />
-         <f:verbatim>
-      </td>
-   </tr>
-   <tr>
-      <td></td>
-      <td>
-         </f:verbatim>
-         <h:outputText value="#{msg.icon}:"/>
-         <f:verbatim>
-      </td>
-      <td>
-         <table border="0" cellpadding="0" cellspacing="0"><tr><td>
-         </f:verbatim>
-         <a:imagePickerRadioPanel id="space-icon" columns="6" spacing="4" value="#{WizardManager.bean.icon}"
-                                  panelBorder="greyround" panelBgcolor="#F5F5F5">
-            <a:listItems value="#{WizardManager.bean.icons}" />
-         </a:imagePickerRadioPanel>
-         <f:verbatim>
-         </td></tr></table>
-      </td>
-   </tr>
+<h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
+             width="100%" rowClasses="wizardSectionHeading">
+   <h:outputText value="&nbsp;#{msg.title_space_details}" escape="false" />
+</h:panelGrid>
+
+<h:panelGrid columns="3" cellpadding="2" cellspacing="2" width="100%">
+   <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
+   <h:outputText value="#{msg.name}:"/>
+   <h:inputText id="name" value="#{WizardManager.bean.name}" size="35" maxlength="1024" onkeyup="javascript:checkButtonState();" />
+   
+   <f:verbatim/>
+   <h:outputText value="#{msg.title}:" />
+   <h:inputText id="title" value="#{WizardManager.bean.title}" size="35" maxlength="1024" />
+   
+   <f:verbatim/>
+   <h:outputText value="#{msg.description}:"/>
+   <h:inputText id="description" value="#{WizardManager.bean.description}" size="35" maxlength="1024" />
+
+   <f:verbatim/>
+   <h:outputText value="#{msg.icon}:"/>
+   <h:panelGrid columns="1" cellpadding="0" cellspacing="0">
+      <a:imagePickerRadioPanel id="space-icon" columns="6" spacing="4" value="#{WizardManager.bean.icon}"
+                               panelBorder="greyround" panelBgcolor="#F5F5F5">
+         <a:listItems value="#{WizardManager.bean.icons}" />
+      </a:imagePickerRadioPanel>
+   </h:panelGrid>
    <%--
    <tr>
       <td colspan="2">
@@ -182,5 +139,4 @@
       </td>
    </tr>
    --%>
-</table>
-</f:verbatim>
+</h:panelGrid>