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

@@ -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.<p>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.</p><p>Example: liveserver1, liveserver2:50900</p>
+content_launch_date=Content Launch Date
 
 # New User Wizard messages
 new_user_title=New User Wizard

config/alfresco/web-client-config.xml

@@ -210,17 +210,14 @@
                   jsp="/jsp/workflow/pooled-tasks-todo-dashlet.jsp" allow-narrow="false" />
             <dashlet id="tasks-completed" label-id="my_tasks_completed_title" description-id="my_tasks_completed_desc"
                   jsp="/jsp/workflow/tasks-completed-dashlet.jsp" allow-narrow="false" />
-            <dashlet id="my-docs-template" label-id="dashlet_mydocuments"
-                  description-id="dashlet_mydocuments_desc"
-                  jsp="/jsp/dashboards/dashlets/my-docs.jsp" allow-narrow="true" />
-            <dashlet id="content-checkedout" label-id="dashlet_checkedoutdocs"
-                  description-id="dashlet_checkedoutdocs_desc"
-                  jsp="/jsp/dashboards/dashlets/checkedout-docs.jsp" allow-narrow="false" />
-            <dashlet id="my-images" label-id="dashlet_myimages"
-                  description-id="dashlet_myimages_desc"
-                  jsp="/jsp/dashboards/dashlets/my-images.jsp" allow-narrow="false" />
             <dashlet id="opensearch" label-id="opensearch" description-id="opensearch_desc"
                   jsp="/jsp/dashboards/dashlets/opensearch.jsp" />
+            <dashlet id="doclist-webscript" label="Document List" description="Document List WebScript"
+                  jsp="/jsp/dashboards/dashlets/doclist-webscript.jsp" />
+            <dashlet id="mytasks-webscript" label="My Tasks" description="My Tasks WebScript"
+                  jsp="/jsp/dashboards/dashlets/mytasks-webscript.jsp" />
+            <dashlet id="mywebforms-webscript" label="My Web Forms" description="My Web Forms WebScript"
+                  jsp="/jsp/dashboards/dashlets/mywebforms-webscript.jsp" />                  
          </dashlets>
          <!-- set true allow the Guest user to configure the dashboard view - false by default -->
          <allow-guest-config>false</allow-guest-config>

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<WorkflowDefinition> configuredWorkflowDefs = null;

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<ItemWrapper> submitItems;
    private List<ItemWrapper> warningItems;
@@ -181,6 +182,7 @@ public class SubmitDialog extends BaseDialogBean
       this.workflowItems = null;
       this.workflows = new HashSet<FormWorkflowWrapper>(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
     */

source/web/WEB-INF/alfresco.tld

@@ -74,6 +74,13 @@
          <description>The number of years to display in the list</description>
       </attribute>
       
+      <attribute>
+         <name>showTime</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>Determines whether to show the time</description>
+      </attribute>
+      
       <attribute>
          <name>initialiseIfNull</name>
          <required>false</required>

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;
+}

source/web/jsp/wcm/submit-dialog.jsp

@@ -103,6 +103,18 @@
    </h:panelGroup>
 </h:panelGrid>
 
+<h:panelGrid columns="1" cellpadding="2" style="padding-top:16px;padding-bottom:4px;"
+      width="100%" rowClasses="wizardSectionHeading">
+   <h:outputText value="&nbsp;#{msg.content_launch_date}" escape="false" />
+</h:panelGrid>
+
+<h:panelGrid columns="2" cellpadding="2" cellpadding="2" width="100%" style="margin-left:8px"
+             columnClasses=",rightHandColumn">
+   <h:outputText value="#{msg.date}:"/>
+   <a:inputDatePicker id="launch-date" value="#{DialogManager.bean.launchDate}" 
+                      initialiseIfNull="false" style="margin-right: 7px;" showTime="true" />
+</h:panelGrid>
+
 <h:panelGrid columns="1" cellpadding="2" style="padding-top:16px;padding-bottom:4px;"
       width="100%" rowClasses="wizardSectionHeading">
    <h:outputText value="&nbsp;#{msg.modified_items}" escape="false" />