From a55abcc3e07efd7aa2f3749d9cf8d525f546c72d Mon Sep 17 00:00:00 2001 From: Ariel Backenroth Date: Thu, 30 Nov 2006 00:36:28 +0000 Subject: [PATCH] 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 --- .../web/bean/wcm/CreateFormWizard.java | 97 +++++++++++++------ .../configure-rendering-engines.jsp | 68 ++++++++----- .../jsp/wcm/create-form-wizard/summary.jsp | 62 ++++++------ .../wcm/create-web-content-wizard/summary.jsp | 46 ++++++--- 4 files changed, 178 insertions(+), 95 deletions(-) diff --git a/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java index d7ba4f3e06..3a9fdfa94b 100644 --- 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(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(); 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 diff --git a/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp b/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp index 614b894474..cf00b6c421 100644 --- 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}"/> + + + + + + + + - - + - + - - - - - - - - - - - - - - - - - - - + + + + + + + +
+ + +
+ + +
+ + +
+ + +
+ + - + diff --git a/source/web/jsp/wcm/create-form-wizard/summary.jsp b/source/web/jsp/wcm/create-form-wizard/summary.jsp index 90035e045c..8013af22ac 100644 --- a/source/web/jsp/wcm/create-form-wizard/summary.jsp +++ b/source/web/jsp/wcm/create-form-wizard/summary.jsp @@ -31,14 +31,20 @@ - - - - - - - - + + + +
${WizardManager.bean.formDescription}
+
${msg.schema_root_element_name}: ${WizardManager.bean.schemaRootElementName}
+ + + - - - - ${ret.fileName} -<%-- - - ${ret.title} - - ${ret.description} ---%> - - ${ret.renderingEngine.name} - - ${ret.outputPathPatternForRendition} - - ${ret.mimetypeForRendition} - + + + + + +
${msg.description}: ${ret.description}
+
${msg.rendering_engine_type}: ${ret.renderingEngine.name}
+
${msg.output_path_pattern}: ${ret.outputPathPatternForRendition}
+
${msg.mimetype_for_renditions}: ${ret.mimetypeForRendition}
+ + + + - + - + diff --git a/source/web/jsp/wcm/create-web-content-wizard/summary.jsp b/source/web/jsp/wcm/create-web-content-wizard/summary.jsp index 0d164ef3d5..10198ec8d3 100644 --- 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(); } - - @@ -47,17 +44,36 @@ - - - - ${rendition.name} - - ${rendition.webappRelativePath} - + + + + + + + + + Rendered by ${rendition.renderingEngineTemplate.name} into ${rendition.webappRelativePath} + + + + - + + + + + +