From 116858df782b61319aa6db05786452e7253dc420 Mon Sep 17 00:00:00 2001 From: David Caruana Date: Fri, 11 May 2007 15:23:38 +0000 Subject: [PATCH] Merge Content Launch Date (as developed by Gav) from BRANCHES/DEV/WCM_TIMERS git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/webclient.properties | 1 + config/alfresco/web-client-config.xml | 15 ++++++--------- .../web/bean/wcm/AVMWorkflowUtil.java | 1 + .../alfresco/web/bean/wcm/SubmitDialog.java | 19 +++++++++++++++++++ source/web/WEB-INF/alfresco.tld | 7 +++++++ source/web/css/main.css | 10 ++++++++++ source/web/jsp/wcm/submit-dialog.jsp | 12 ++++++++++++ 7 files changed, 56 insertions(+), 9 deletions(-) diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties index c766f44221..7bb5f94f15 100644 --- a/config/alfresco/messages/webclient.properties +++ b/config/alfresco/messages/webclient.properties @@ -1045,6 +1045,7 @@ deploy_status_partial=PARTIAL FAILURE reason=Reason snapshot=Snapshot deploy_to_help=A comma separated list of servers to deploy the website to.

Each entry can be a host name or an IP address and may also contain an RMI port number. If an RMI port number is not specified the default of {0} will be used.

Example: liveserver1, liveserver2:50900

+content_launch_date=Content Launch Date # New User Wizard messages new_user_title=New User Wizard diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml index bc7aff4add..a1a1d59527 100644 --- a/config/alfresco/web-client-config.xml +++ b/config/alfresco/web-client-config.xml @@ -210,17 +210,14 @@ jsp="/jsp/workflow/pooled-tasks-todo-dashlet.jsp" allow-narrow="false" /> - - - + + + false diff --git a/source/java/org/alfresco/web/bean/wcm/AVMWorkflowUtil.java b/source/java/org/alfresco/web/bean/wcm/AVMWorkflowUtil.java index 3c90ac53d0..eae0925158 100644 --- a/source/java/org/alfresco/web/bean/wcm/AVMWorkflowUtil.java +++ b/source/java/org/alfresco/web/bean/wcm/AVMWorkflowUtil.java @@ -82,6 +82,7 @@ public class AVMWorkflowUtil extends WorkflowUtil private static final String WCM_WORKFLOW_MODEL_1_0_URI = "http://www.alfresco.org/model/wcmworkflow/1.0"; public static final QName PROP_FROM_PATH = QName.createQName(WCM_WORKFLOW_MODEL_1_0_URI, "fromPath"); public static final QName PROP_LABEL = QName.createQName(WCM_WORKFLOW_MODEL_1_0_URI, "label"); + public static final QName PROP_LAUNCH_DATE = QName.createQName(WCM_WORKFLOW_MODEL_1_0_URI, "launchDate"); // cached configured lists private static List configuredWorkflowDefs = null; diff --git a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java index 23d8f3e6e6..6b909dd884 100644 --- a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java @@ -91,6 +91,7 @@ public class SubmitDialog extends BaseDialogBean private String comment; private String label; private String[] workflowSelectedValue; + private Date launchDate; private List submitItems; private List warningItems; @@ -181,6 +182,7 @@ public class SubmitDialog extends BaseDialogBean this.workflowItems = null; this.workflows = new HashSet(4); this.workflowSelectedValue = null; + this.launchDate = null; // walk all the web forms attached the website, and lookup the workflow defaults for each NodeRef websiteRef = this.avmBrowseBean.getWebsite().getNodeRef(); @@ -307,6 +309,7 @@ public class SubmitDialog extends BaseDialogBean params.put(WorkflowModel.PROP_WORKFLOW_DESCRIPTION, getComment()); params.put(AVMWorkflowUtil.PROP_LABEL, getLabel()); params.put(AVMWorkflowUtil.PROP_FROM_PATH, AVMUtil.buildStoreRootPath(this.avmBrowseBean.getSandbox())); + params.put(AVMWorkflowUtil.PROP_LAUNCH_DATE, this.launchDate); // update start task with submit parameters this.workflowService.updateTask(startTask.id, params, null, null); @@ -441,6 +444,22 @@ public class SubmitDialog extends BaseDialogBean this.workflowSelectedValue = workflowSelectedValue; } + /** + * @return Returns the content launch date + */ + public Date getLaunchDate() + { + return this.launchDate; + } + + /** + * @param launchDate The content launch date + */ + public void setLaunchDate(Date launchDate) + { + this.launchDate = launchDate; + } + /** * @return List of UIListItem object representing the available workflows for the website */ diff --git a/source/web/WEB-INF/alfresco.tld b/source/web/WEB-INF/alfresco.tld index 0029cd7fc8..c826ba413b 100644 --- a/source/web/WEB-INF/alfresco.tld +++ b/source/web/WEB-INF/alfresco.tld @@ -74,6 +74,13 @@ The number of years to display in the list + + showTime + false + true + Determines whether to show the time + + initialiseIfNull false diff --git a/source/web/css/main.css b/source/web/css/main.css index c760c6971e..1d8984726f 100644 --- a/source/web/css/main.css +++ b/source/web/css/main.css @@ -677,3 +677,13 @@ a.sidebarButtonLink, a.sidebarButtonLink:link, a.sidebarButtonLink:visited _background: url(../images/parts/spacer.gif) no-repeat bottom right !important; _padding: 0px 10px 10px 0px; } + +.rightHandColumn +{ + width: 100%; +} + +.noBrColumn +{ + white-space: nowrap; +} diff --git a/source/web/jsp/wcm/submit-dialog.jsp b/source/web/jsp/wcm/submit-dialog.jsp index 98a7d48263..cd83bac9d4 100644 --- a/source/web/jsp/wcm/submit-dialog.jsp +++ b/source/web/jsp/wcm/submit-dialog.jsp @@ -103,6 +103,18 @@ + + + + + + + + +