- first pass at summary screen for create form.

- making workflowdefinition immutable and adding getters so i can access bean properties from jsps.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4391 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/messages/webclient.properties

@@ -651,15 +651,16 @@ create_form_configure_rendering_engine_templates_title=Step Two - Configure Rend
 create_form_configure_rendering_engine_templates_desc=Enter information about the rendering engine templates you want to use for this form.
 create_form_select_default_workflow_title=Stop Three - Select default workflow
 create_form_select_default_workflow_desc=Select the workflow you want to be used by default for this form.
-create_form_summary_desc=The wizard has successfully created the content and all renditions.
-create_form_summary_content_details=Content Details
-create_form_summary_rendition_details=Rendition Details
-create_form_summary_submit_message=Submit {0} when wizard finishes.
-selected_rendering_engines=Selected Rendering Engines
-create_form_configure_rendering_engines_title=Configure Rendering Engines
-create_form_configure_rendering_engines_step1_desc=Upload rendering engine template and specify the extension to use for its renditions.
-rendering_engine_file=Rendering Engine Template File
-rendering_engine_type=Rendering Engine Type
+create_web_content_summary_desc=The wizard has successfully created the content and all renditions.
+create_web_content_summary_content_details=Content Details
+create_web_content_summary_rendition_details=Rendition Details
+create_web_content_summary_submit_message=Submit {0} when wizard finishes.
+
+apply_default_workflow=Apply default workflow
+rendering_engine_templates=Rendering Engine Templates
+selected_rendering_engine_templates=Selected Rendering Engines
+rendering_engine_template_file=Rendering Engine Template File
+rendering_engine=Rendering Engine
 output_path_pattern=Output path pattern
 mimetype_for_renditions=Mimetype for renditions
 file_extension=Extension
@@ -1097,6 +1098,7 @@ doc_not_in_simple_workflow=This document is not part of a simple workflow.
 space_not_in_simple_workflow=This space is not part of a simple workflow.
 doc_not_in_advanced_workflow=This document is not part of any advanced workflows.
 space_not_in_advanced_workflow=This space is not part of any advanced workflows.
+default_workflow=Default Workflow
 simple_workflow=Simple Workflow
 advanced_workflows=Advanced Workflows
 document_action=The document will be {0} to ''{1}'' if the ''{2}'' action is taken.

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

@@ -232,7 +232,7 @@
             <step name="summary" title-id="summary" description-id="summary_step_description">
                <page path="/jsp/wcm/create-web-content-wizard/summary.jsp"
                      title-id="summary"
-                     description-id="create_form_summary_desc"
+                     description-id="create_web_content_summary_desc"
                      instruction-id="content_finish_instruction" />
             </step>
          </wizard>
@@ -268,7 +268,7 @@
                      instruction-id="default_instruction" />
             </step>
             <step name="summary" title-id="summary" description-id="summary_step_description">
-               <page path="/jsp/wizard/summary.jsp"
+               <page path="/jsp/wcm/create-form-wizard/summary.jsp"
                      title-id="summary"
                      description-id="summary_desc"
                      instruction-id="content_finish_instruction" />

source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java

@@ -448,6 +448,14 @@ public class CreateFormWizard
       
       return this.renderingEngineTemplatesDataModel;
    }
+
+   /**
+    * Returns all configured rendering engine templates.
+    */
+   public List<RenderingEngineTemplateData> getRenderingEngineTemplates()
+   {
+      return this.renderingEngineTemplates;
+   }
    
    /**
     * @return Returns the mime type currenty selected
@@ -710,6 +718,12 @@ public class CreateFormWizard
                                   : defaultWorkflowId[0]);
    }
 
+   public WorkflowDefinition getDefaultWorkflowDefinition()
+   {
+      return (this.defaultWorkflowId == null
+              ? null
+              : this.workflowService.getDefinitionById(this.defaultWorkflowId));
+   }
 
    public String[] getDefaultWorkflowId()
    {
@@ -740,9 +754,9 @@ public class CreateFormWizard
       for (WorkflowDefinition workflowDef : workflowDefs)
       {
          item = new UIListItem();
-         item.setValue(workflowDef.id);
-         item.setLabel(workflowDef.title);
-         item.setDescription(workflowDef.description);
+         item.setValue(workflowDef.getId());
+         item.setLabel(workflowDef.getTitle());
+         item.setDescription(workflowDef.getDescription());
          item.setImage(WebResources.IMAGE_WORKFLOW_32);
          result.add(item);
       }

source/java/org/alfresco/web/forms/Form.java

@@ -37,6 +37,9 @@ public interface Form
    /** the name of the form, which must be unique within the FormsService */
    public String getName();
 
+   /** the title of the form */
+   public String getTitle();
+
    /** the description of the form */
    public String getDescription();
 

source/java/org/alfresco/web/forms/FormImpl.java

@@ -70,6 +70,13 @@ class FormImpl
    }
 
    public String getName()
+   {
+      final NodeService nodeService = this.getServiceRegistry().getNodeService();
+      return (String)nodeService.getProperty(this.folderNodeRef, 
+                                             ContentModel.PROP_NAME);
+   }
+
+   public String getTitle()
    {
       final NodeService nodeService = this.getServiceRegistry().getNodeService();
       return (String)nodeService.getProperty(this.folderNodeRef, 

source/java/org/alfresco/web/forms/RenderingEngineTemplate.java

@@ -32,10 +32,13 @@ import org.w3c.dom.Document;
 public interface RenderingEngineTemplate
    extends Serializable
 {
-   /** the name of the form, which must be unique within the FormsService */
+   /** the name of the rendering engine template */
    public String getName();
 
-   /** the description of the form */
+   /** the title of the rendering engine template */
+   public String getTitle();
+
+   /** the description of the rendering engine template */
    public String getDescription();
 
    /** the output path pattern for renditions */

source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java

@@ -73,6 +73,12 @@ public class RenderingEngineTemplateImpl
       return (String)nodeService.getProperty(this.nodeRef, ContentModel.PROP_NAME);
    }
 
+   public String getTitle()
+   {
+      final NodeService nodeService = this.getServiceRegistry().getNodeService();
+      return (String)nodeService.getProperty(this.nodeRef, ContentModel.PROP_TITLE);
+   }
+
    public String getDescription()
    {
       final NodeService nodeService = this.getServiceRegistry().getNodeService();

source/web/jsp/wcm/create-form-wizard/summary.jsp

@@ -0,0 +1,88 @@
+<%--
+    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 isELIgnored="false" %>
+<script type="text/javascript">
+  window.onload = function() { document.getElementById("wizard:finish-button").focus(); }
+</script>
+
+<h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
+             width="100%" rowClasses="wizardSectionHeading">
+  <h:outputText value="&nbsp;#{msg.general_properties}" escape="false" />
+</h:panelGrid>
+
+<h:panelGrid columns="2" cellpadding="3" cellspacing="3" border="0">
+  <h:outputText value="#{msg.name}:"/>
+  <h:outputText value="#{WizardManager.bean.formName}"/>
+  <h:outputText value="#{msg.title}:"/>
+  <h:outputText value="#{WizardManager.bean.formTitle}"/>
+  <h:outputText value="#{msg.description}:"/>
+  <h:outputText value="#{WizardManager.bean.formDescription}"/>
+  <h:outputText value="#{msg.schema_root_element_name}:"/>
+  <h:outputText value="#{WizardManager.bean.schemaRootElementName}"/>
+</h:panelGrid>
+
+<h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
+             width="100%" rowClasses="wizardSectionHeading">
+  <h:outputText value="&nbsp;#{msg.rendering_engine_templates}" escape="false" />
+</h:panelGrid>
+
+<h:panelGrid columns="2" cellpadding="3" cellspacing="3" border="0">
+  <c:forEach items="${WizardManager.bean.renderingEngineTemplates}" var="ret">
+    <h:outputText value="#{msg.name}:"/>
+    <f:verbatim>${ret.fileName}</f:verbatim>
+<%--
+    <h:outputText value="#{msg.title}:"/>
+    <f:verbatim>${ret.title}</f:verbatim>
+    <h:outputText value="#{msg.description}:"/>
+    <f:verbatim>${ret.description}</f:verbatim>
+--%>
+    <h:outputText value="#{msg.rendering_engine_type}:"/>
+    <f:verbatim>${ret.renderingEngine.name}</f:verbatim>
+    <h:outputText value="#{msg.output_path_pattern}:"/>
+    <f:verbatim>${ret.outputPathPatternForRendition}</f:verbatim>
+    <h:outputText value="#{msg.mimetype_for_renditions}:"/>
+    <f:verbatim>${ret.mimetypeForRendition}</f:verbatim>
+  </c:forEach>
+</h:panelGrid>
+
+<h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
+             width="100%" rowClasses="wizardSectionHeading">
+  <h:outputText value="&nbsp;#{msg.default_workflow}" escape="false" />
+</h:panelGrid>
+
+<h:panelGrid columns="2" cellpadding="3" cellspacing="3" border="0">
+  <h:outputText value="#{msg.apply_default_workflow}:"/>
+  <c:choose>
+    <c:when test="${WizardManager.bean.defaultWorkflowId != null}">
+      <h:outputText value="#{msg.yes}"/>
+    </c:when>
+    <c:otherwise>
+      <h:outputText value="#{msg.no}"/>
+    </c:otherwise>
+  </c:choose>
+  <c:if test="${WizardManager.bean.defaultWorkflowId != null}">
+    <h:outputText value="#{msg.name}:"/>
+    <h:outputText value="#{WizardManager.bean.defaultWorkflowDefinition.name}"/>
+    <h:outputText value="#{msg.description}:"/>
+    <h:outputText value="#{WizardManager.bean.defaultWorkflowDefinition.description}"/>
+  </c:if>
+</h:panelGrid>

source/web/jsp/wcm/create-web-content-wizard/summary.jsp

@@ -26,7 +26,7 @@
 
 <h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
              width="100%" rowClasses="wizardSectionHeading">
-  <h:outputText value="&nbsp;#{msg.create_form_summary_content_details}" escape="false" />
+  <h:outputText value="&nbsp;#{msg.create_web_content_summary_content_details}" escape="false" />
 </h:panelGrid>
 
 <h:panelGrid columns="2" cellpadding="3" cellspacing="3" border="0">
@@ -40,7 +40,7 @@
 
 <h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
              width="100%" rowClasses="wizardSectionHeading">
-  <h:outputText value="&nbsp;#{msg.create_form_summary_rendition_details}" escape="false" />
+  <h:outputText value="&nbsp;#{msg.create_web_content_summary_rendition_details}" escape="false" />
 </h:panelGrid>
 
 <h:panelGrid columns="2" cellpadding="3" cellspacing="3" border="0">
@@ -52,4 +52,4 @@
   </c:forEach>
 </h:panelGrid>
 
-<h:outputText value="&nbsp;#{msg.create_form_summary_submit_message}" escape="false" />
+<h:outputText value="&nbsp;#{msg.create_web_content_summary_submit_message}" escape="false" />