ui cleanup to summary screens and configure rendering engine templates screen.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4466 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-08-07 17:49:17 +00:00 · 2006-11-30 00:36:28 +00:00
parent 201c1df23d
commit a55abcc3e0
4 changed files with 178 additions and 95 deletions
--- a/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java
@@ -79,18 +79,24 @@ public class CreateFormWizard
   {
      private final String fileName;
      private final File file;
+      private final String title;
+      private final String description;
      private final String mimetypeForRendition;
      private final String outputPathPatternForRendition;
      private final RenderingEngine renderingEngine;

      public RenderingEngineTemplateData(final String fileName, 
                                         final File file,
+                                         final String title,
+                                         final String description,
                                         final String outputPathPatternForRendition,
                                         final String mimetypeForRendition,
                                         final RenderingEngine renderingEngine)
      {
         this.fileName = fileName;
         this.file = file;
+         this.title = title;
+         this.description = description;
         this.outputPathPatternForRendition = outputPathPatternForRendition;
         this.mimetypeForRendition = mimetypeForRendition;
         this.renderingEngine = renderingEngine;
@@ -116,6 +122,16 @@ public class CreateFormWizard
         return this.file;
      }

+      public String getTitle()
+      {
+         return this.title;
+      }
+
+      public String getDescription()
+      {
+         return this.description;
+      }
+
      public RenderingEngine getRenderingEngine()
      {
         return this.renderingEngine;
@@ -145,6 +161,8 @@ public class CreateFormWizard
   private String formName = null;
   private String formTitle = null;
   private String formDescription = null;
+   private String renderingEngineTemplateTitle = null;
+   private String renderingEngineTemplateDescription = null;
   private String defaultWorkflowName = null;
   private RenderingEngine renderingEngine = null;
   protected ContentService contentService;
@@ -250,6 +268,14 @@ public class CreateFormWizard
            this.nodeService.addAspect(renderingEngineTemplateNodeRef, 
                                       WCMAppModel.ASPECT_RENDERING_ENGINE_TEMPLATE, 
                                       props);
+
+            // apply the titled aspect - title and description
+            props = new HashMap<QName, Serializable>(2, 1.0f);
+            props.put(ContentModel.PROP_TITLE, retd.getTitle());
+            props.put(ContentModel.PROP_DESCRIPTION, retd.getDescription());
+            this.nodeService.addAspect(renderingEngineTemplateNodeRef, 
+                                       ContentModel.ASPECT_TITLED, 
+                                       props);
         }

         LOGGER.debug("adding rendition properties to " + renderingEngineTemplateNodeRef);
@@ -279,6 +305,8 @@ public class CreateFormWizard
      this.formName = null;
      this.formTitle = null;
      this.formDescription = null;
+      this.renderingEngineTemplateTitle = null;
+      this.renderingEngineTemplateDescription = null; 
      this.renderingEngine = null;
      this.renderingEngineTemplates = new ArrayList<RenderingEngineTemplateData>();
      this.outputPathPatternForFormInstanceData = null;
@@ -331,11 +359,9 @@ public class CreateFormWizard
    */
   public String getOutputPathPatternForRendition()
   {
-      if (this.outputPathPatternForRendition == null)
-      {
-         this.outputPathPatternForRendition = "${name}.${extension}";
-      }
-      return this.outputPathPatternForRendition;
+      return (this.outputPathPatternForRendition == null
+              ? "${name}.${extension}"
+              : this.outputPathPatternForRendition);
   }

   /**
@@ -375,6 +401,8 @@ public class CreateFormWizard
      final RenderingEngineTemplateData data = 
         this.new RenderingEngineTemplateData(this.getRenderingEngineTemplateFileName(),
                                              this.getRenderingEngineTemplateFile(),
+                                              this.getRenderingEngineTemplateTitle(),
+                                              this.getRenderingEngineTemplateDescription(),
                                              this.getOutputPathPatternForRendition(),
                                              this.getMimetypeForRendition(),
                                              this.renderingEngine);
@@ -383,6 +411,8 @@ public class CreateFormWizard
      this.renderingEngine = null;
      this.outputPathPatternForRendition = null;
      this.mimetypeForRendition = null;
+      this.renderingEngineTemplateTitle = null;
+      this.renderingEngineTemplateDescription = null;
   }
   
   /**
@@ -712,6 +742,40 @@ public class CreateFormWizard
      return this.formDescription;
   }

+   /**
+    * Sets the title for this renderingEngineTemplate.
+    */
+   public void setRenderingEngineTemplateTitle(final String renderingEngineTemplateTitle)
+   {
+      this.renderingEngineTemplateTitle = renderingEngineTemplateTitle;
+   }
+
+   /**
+    * @return the title for this renderingEngineTemplate.
+    */
+   public String getRenderingEngineTemplateTitle()
+   {
+      return (this.renderingEngineTemplateTitle == null && this.getRenderingEngineTemplateFileName() != null
+              ? this.getRenderingEngineTemplateFileName().replaceAll("(.+)\\..*", "$1")
+              : this.renderingEngineTemplateTitle);
+   }
+
+   /**
+    * Sets the description for this renderingEngineTemplate.
+    */
+   public void setRenderingEngineTemplateDescription(final String renderingEngineTemplateDescription)
+   {
+      this.renderingEngineTemplateDescription = renderingEngineTemplateDescription;
+   }
+
+   /**
+    * @return the description for this renderingEngineTemplate.
+    */
+   public String getRenderingEngineTemplateDescription()
+   {
+      return this.renderingEngineTemplateDescription;
+   }
+
   public void setDefaultWorkflowName(final String[] defaultWorkflowName)
   {
      assert defaultWorkflowName.length == 1;
@@ -764,29 +828,6 @@ public class CreateFormWizard
      return result;
   }

-   
-   /**
-    * @return Returns the summary data for the wizard.
-    */
-   public String getSummary()
-   {
-      final ResourceBundle bundle = Application.getBundle(FacesContext.getCurrentInstance());
-      final String[] labels = new String[1 + this.renderingEngineTemplates.size()];
-      final String[] values = new String[1 + this.renderingEngineTemplates.size()];
-      labels[0] = "Schema File";
-      values[0] = this.getSchemaFileName();
-      for (int i = 0; i < this.renderingEngineTemplates.size(); i++)
-      {
-         final RenderingEngineTemplateData retd = this.renderingEngineTemplates.get(i);
-         labels[1 + i] = ("RenderingEngine for " + retd.getOutputPathPatternForRendition() +
-                          " mimetype " + retd.getMimetypeForRendition());
-         values[1 + i] = retd.getFileName();
-      }
-
-      return this.buildSummary(labels, values);
-   }
-   
-   
   // ------------------------------------------------------------------------------
   // Service Injection
   
--- a/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp
+++ b/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp
@@ -105,6 +105,22 @@ else
 		    value="#{WizardManager.bean.renderingEngineChoices}"/>
    </h:selectOneRadio>

+    <h:outputText id="no_graphic_image_title" value=""/>
+    <h:outputText id="title-output-text"
+                  value="#{msg.title}:"/>
+    <h:inputText id="title" 
+		 value="#{WizardManager.bean.renderingEngineTemplateTitle}"
+                 maxlength="1024" 
+		 size="35"/>
+
+    <h:outputText id="no_graphic_image_description" value=""/>
+    <h:outputText id="description-output-text"
+                  value="#{msg.description}:"/>
+    <h:inputText id="description" 
+		 value="#{WizardManager.bean.renderingEngineTemplateDescription}"
+                 maxlength="1024" 
+		 style="width:100%"/>
+
    <h:graphicImage id="required-image-mimetype"
                    value="/images/icons/required_field.gif" alt="Required Field" />
    <h:outputText id="mimetype-output-text"
@@ -133,9 +149,6 @@ else
 		     styleClass="wizardButton" 
 		     disabled="#{WizardManager.bean.addToListDisabled}" />
  </h:panelGroup>
-  <h:outputText id="selected-rendering-engine-templates-output-text"
-                styleClass="mainSubText" 
-		value="#{msg.selected_rendering_engine_templates}" />
  <h:panelGroup id="data-table-panel-group">
    <h:dataTable id="rendering-engine-template-data-table"
                 value="#{WizardManager.bean.renderingEngineTemplatesDataModel}" 
@@ -145,30 +158,34 @@ else
 		 headerClass="selectedItemsHeader"
                 cellspacing="0" 
 		 cellpadding="4" 
+		 width="100%"
                 rendered="#{WizardManager.bean.renderingEngineTemplatesDataModel.rowCount != 0}">
-      <h:column id="data-table-column-1">
+      <h:column id="data-table-column-0">
        <f:facet name="header">
-          <h:outputText id="data-table-name-1" value="#{msg.file_name}" />
+          <h:outputText id="data-table-name-0" value="#{msg.selected_rendering_engine_templates}" />
        </f:facet>
-        <h:outputText id="data-table-value-1" value="#{row.fileName}" />
-      </h:column>
-      <h:column id="data-table-column-2">
-        <f:facet name="header">
-          <h:outputText id="data-table-name-2" value="#{msg.type}" />
-        </f:facet>
-        <h:outputText id="data-table-value-2" value="#{row.renderingEngine.name}" />
-      </h:column>
-      <h:column id="data-table-column-3">
-        <f:facet name="header">
-          <h:outputText id="data-table-name-3" value="#{msg.output_path_pattern}" />
-        </f:facet>
-        <h:outputText id="data-table-value-3" value="#{row.outputPathPatternForRendition}" />
-      </h:column>
-      <h:column id="data-table-column-4">
-        <f:facet name="header">
-          <h:outputText id="data-table-name-4" value="#{msg.mimetype}" />
-        </f:facet>
-        <h:outputText id="data-table-value-4" value="#{row.mimetypeForRendition}" />
+	<f:verbatim>
+	  <span style="float:left">
+	    <img src="<%= request.getContextPath() %>/images/icons/template_large.gif"/>
+	  </span>
+	</f:verbatim>
+	<h:outputText id="data-table-name-0-type" value="#{msg.type}: " />
+	<h:outputText id="data-table-value-0-type" value="#{row.renderingEngine.name}" />
+	<f:verbatim><br/></f:verbatim>
+	<h:outputText id="data-table-name-0-name" value="#{msg.file_name}: " />
+	<h:outputText id="data-table-value-0-name" value="#{row.fileName}" />
+	<f:verbatim><br/></f:verbatim>
+	<h:outputText id="data-table-name-0-title" value="#{msg.title}: " />
+	<h:outputText id="data-table-value-0-title" value="#{row.title}" />
+	<f:verbatim><br clear="all"/></f:verbatim>
+	<h:outputText id="data-table-name-0-description" value="#{msg.description}: " />
+	<h:outputText id="data-table-value-0-description" value="#{row.description}" />
+	<f:verbatim><br clear="all"/></f:verbatim>
+	<h:outputText id="data-table-name-0-mimetype" value="#{msg.mimetype_for_renditions}: " />
+	<h:outputText id="data-table-value-0-mimetype" value="#{row.mimetypeForRendition}" />
+	<f:verbatim><br clear="all"/></f:verbatim>
+	<h:outputText id="data-table-name-0-opp" value="#{msg.output_path_pattern}: " />
+	<h:outputText id="data-table-value-0-opp" value="#{row.outputPathPatternForRendition}" />
      </h:column>
      <h:column id="data-table-column-5">
        <a:actionLink id="remove-select-rendering-engine-action-link"
@@ -183,8 +200,9 @@ else
 		   columns="1" 
 		   cellpadding="2" 
 		   styleClass="selectedItems" 
+		   width="100%"
 		   rowClasses="selectedItemsHeader,selectedItemsRow">
-        <h:outputText id="no-items-name" value="#{msg.name}" />
+        <h:outputText id="no-items-name" value="#{msg.selected_rendering_engine_templates}" />
        <h:outputText styleClass="selectedItemsRow" id="no-items-msg" value="#{msg.no_selected_items}" />
      </h:panelGrid>
    </a:panel>
--- a/source/web/jsp/wcm/create-form-wizard/summary.jsp
+++ b/source/web/jsp/wcm/create-form-wizard/summary.jsp
@@ -31,14 +31,20 @@
 </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}"/>
+  <a:selectList id="form-list" 
+		multiSelect="false"
+		activeSelect="true" 
+		style="width:100%" 
+		itemStyleClass="selectListItem">
+    <a:listItem label="${WizardManager.bean.formTitle}"
+		value="${WizardManager.bean.formName}"
+                image="/images/icons/webform_large.gif">
+      <jsp:attribute name="description">
+	<div>${WizardManager.bean.formDescription}</div>
+	<div>${msg.schema_root_element_name}: ${WizardManager.bean.schemaRootElementName}</div>
+      </jsp:attribute>
+    </a:listItem>
+  </a:selectList>
 </h:panelGrid>

 <h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
@@ -46,23 +52,25 @@
  <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 columns="1" cellpadding="3" cellspacing="3" border="0">
+  <a:selectList id="rendering-engine-template-list" 
+		multiSelect="false"
+		activeSelect="true" 
+		style="width:100%" 
+		itemStyleClass="selectListItem">
+    <c:forEach items="${WizardManager.bean.renderingEngineTemplates}" var="ret">
+      <a:listItem label="${ret.title}"
+		  value="${ret.fileName}"
+                  image="/images/icons/template_large.gif">
+	<jsp:attribute name="description">
+	  <div>${msg.description}: ${ret.description}</div>
+	  <div>${msg.rendering_engine_type}: ${ret.renderingEngine.name}</div>
+	  <div>${msg.output_path_pattern}: ${ret.outputPathPatternForRendition}</div>
+	  <div>${msg.mimetype_for_renditions}: ${ret.mimetypeForRendition}</div>
+	</jsp:attribute>
+      </a:listItem>
+    </c:forEach>
+  </a:selectList>
 </h:panelGrid>

 <h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
@@ -73,14 +81,14 @@
 <h:panelGrid columns="2" cellpadding="3" cellspacing="3" border="0">
  <h:outputText value="#{msg.apply_default_workflow}:"/>
  <c:choose>
-    <c:when test="${WizardManager.bean.defaultWorkflowName != null}">
+    <c:when test="${WizardManager.bean.defaultWorkflowDefinition != null}">
      <h:outputText value="#{msg.yes}"/>
    </c:when>
    <c:otherwise>
      <h:outputText value="#{msg.no}"/>
    </c:otherwise>
  </c:choose>
-  <c:if test="${WizardManager.bean.defaultWorkflowName != null}">
+  <c:if test="${WizardManager.bean.defaultWorkflowDefinition != null}">
    <h:outputText value="#{msg.name}:"/>
    <h:outputText value="#{WizardManager.bean.defaultWorkflowDefinition.name}"/>
    <h:outputText value="#{msg.description}:"/>
--- a/source/web/jsp/wcm/create-web-content-wizard/summary.jsp
+++ b/source/web/jsp/wcm/create-web-content-wizard/summary.jsp
@@ -24,9 +24,6 @@
  window.onload = function() { document.getElementById("wizard:finish-button").focus(); }
 </script>

-<h:selectBooleanCheckbox id="startWorkflow"
-			 value="#{WizardManager.bean.startWorkflow}"/>
-<h:outputText value="&nbsp;#{msg.create_web_content_summary_submit_message}" escape="false" />

 <h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
             width="100%" rowClasses="wizardSectionHeading">
@@ -47,17 +44,36 @@
  <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">
-  <c:forEach items="${WizardManager.bean.renditions}" var="rendition">
-    <h:outputText value="#{msg.name}:"/>
-    <a:actionLink value="${rendition.name}" 
-		  image="/images/icons/preview_website.gif" 
-		  showLink="true" 
-		  href="${rendition.url}" 
-		  target="new">${rendition.name}</a:actionLink>
-    <h:outputText value="#{msg.location}:"/>
-    <f:verbatim>${rendition.webappRelativePath}</f:verbatim>
-  </c:forEach>
+<h:panelGrid columns="2" cellpadding="3" cellspacing="3" border="0" width="100%">
+  <a:selectList id="rendition-list" 
+		multiSelect="false"
+		activeSelect="true" 
+		style="width:100%" 
+		itemStyleClass="selectListItem">
+    <c:forEach items="${WizardManager.bean.renditions}" var="rendition">
+      <a:listItem label="${rendition.name}"
+		  value="${rendition.name}"
+                  image="/images/icons/template_large.gif">
+	<jsp:attribute name="description">
+	  <span style="float:right">
+	    <a:actionLink value="${rendition.name}" 
+			  image="/images/icons/preview_website.gif"
+			  showLink="false" 
+			  href="${rendition.url}" 
+			  target="new"/>
+	  </span>
+	  Rendered by ${rendition.renderingEngineTemplate.name} into ${rendition.webappRelativePath}
+	</jsp:attribute>
+      </a:listItem>
+    </c:forEach>
+  </a:selectList>
 </h:panelGrid>

-
+<h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
+             width="100%">
+  <h:column>
+    <h:selectBooleanCheckbox id="startWorkflow"
+			     value="#{WizardManager.bean.startWorkflow}"/>
+    <h:outputText value="&nbsp;#{msg.create_web_content_summary_submit_message}" escape="false" />
+  </h:column>
+</h:panelGrid>