Heinous merge from HEAD. Seems to basically work. Be on guard however.

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

source/web/jsp/workflow/manage-task-dialog.jsp

@@ -31,14 +31,17 @@
 <a:panel id="resources-panel" label="#{msg.resources}"
          border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
    
+   <h:outputText value="#{msg.no_resources}" rendered="#{empty DialogManager.bean.resources}" />
+   
    <a:richList id="resources-list" viewMode="details" value="#{DialogManager.bean.resources}" var="r"
                binding="#{DialogManager.bean.packageItemsRichList}"
                styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" 
                altRowStyleClass="recordSetRowAlt" width="100%" pageSize="10"
-               initialSortColumn="name" initialSortDescending="true">
+               initialSortColumn="name" initialSortDescending="true"
+               rendered="#{not empty DialogManager.bean.resources}">
       
       <%-- Name column --%>
-      <a:column id="col1" primary="true" width="200" style="padding:2px; text-align:left">
+      <a:column id="col1" primary="true" width="200" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col1-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
          </f:facet>
@@ -51,7 +54,7 @@
       </a:column>
       
       <%-- Description column --%>
-      <a:column id="col2" style="text-align:left">
+      <a:column id="col2" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col2-sort" label="#{msg.description}" value="description" styleClass="header"/>
          </f:facet>
@@ -59,15 +62,16 @@
       </a:column>
       
       <%-- Path column --%>
-      <a:column id="col3" style="text-align:left">
+      <a:column id="col3" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col3-sort" label="#{msg.path}" value="path" styleClass="header"/>
          </f:facet>
-         <r:nodePath id="col3-path" value="#{r.path}" />
+         <r:nodePath id="col3-path" value="#{r.path}" action="dialog:close:browse" 
+                     actionListener="#{BrowseBean.clickSpacePath}" />
       </a:column>
       
       <%-- Created Date column --%>
-      <a:column id="col4" style="text-align:left">
+      <a:column id="col4" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col4-sort" label="#{msg.created}" value="created" styleClass="header"/>
          </f:facet>
@@ -77,7 +81,7 @@
       </a:column>
       
       <%-- Modified Date column --%>
-      <a:column id="col5" style="text-align:left">
+      <a:column id="col5" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col5-sort" label="#{msg.modified}" value="modified" styleClass="header"/>
          </f:facet>
@@ -87,25 +91,13 @@
       </a:column>
                         
       <%-- Actions column --%>
-      <a:column id="col6" actions="true" style="text-align:left">
+      <a:column id="col6" actions="true" style="padding:2px;text-align:left">
          <f:facet name="header">
             <h:outputText id="col6-txt" value="#{msg.actions}"/>
          </f:facet>
          <r:actions id="col6-actions" value="#{DialogManager.bean.packageItemActionGroup}" 
                     context="#{r}" showLink="false" styleClass="inlineAction" />
       </a:column>
-      
-      <%-- Completed column --%>
-      <%--
-      <a:column style="text-align:left">
-         <f:facet name="header">
-            <h:outputText value="#{msg.completed}" />
-         </f:facet>
-         <a:actionLink value="#{r.completed}" actionListener="#{DialogManager.bean.togglePackageItemComplete}">
-            <f:param name="id" value="#{r.id}" />
-         </a:actionLink>
-      </a:column>
-      --%>
    </a:richList>
 
    <h:panelGrid id="package-actions-group" columns="1" styleClass="paddingRow">

source/web/jsp/workflow/start-workflow-wizard/workflow-options.jsp

@@ -42,7 +42,8 @@
          titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
    
    <r:propertySheetGrid id="task-props" value="#{WizardManager.bean.taskMetadataNode}" 
-                        var="taskProps" columns="1" externalConfig="true" />
+                        var="taskProps" columns="1" externalConfig="true" 
+                        nextButtonId="next-button" />
 </a:panel>
    
 <h:outputText id="padding" styleClass="paddingRow" value="&nbsp;" escape="false" />
@@ -57,7 +58,7 @@
                initialSortColumn="name" initialSortDescending="true">
       
       <%-- Name column --%>
-      <a:column id="col1" primary="true" width="200" style="padding:2px; text-align:left">
+      <a:column id="col1" primary="true" width="200" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col1-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
          </f:facet>
@@ -69,7 +70,7 @@
       </a:column>
       
       <%-- Description column --%>
-      <a:column id="col2" style="text-align:left">
+      <a:column id="col2" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col2-sort" label="#{msg.description}" value="description" styleClass="header"/>
          </f:facet>
@@ -77,15 +78,15 @@
       </a:column>
       
       <%-- Path column --%>
-      <a:column id="col3" style="text-align:left">
+      <a:column id="col3" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col3-sort" label="#{msg.path}" value="path" styleClass="header"/>
          </f:facet>
-         <r:nodePath id="col3-path" value="#{r.path}" />
+         <r:nodePath id="col3-path" value="#{r.path}" disabled="true" />
       </a:column>
       
       <%-- Created Date column --%>
-      <a:column id="col4" style="text-align:left">
+      <a:column id="col4" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col4-sort" label="#{msg.created}" value="created" styleClass="header"/>
          </f:facet>
@@ -95,7 +96,7 @@
       </a:column>
       
       <%-- Modified Date column --%>
-      <a:column id="col5" style="text-align:left">
+      <a:column id="col5" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col5-sort" label="#{msg.modified}" value="modified" styleClass="header"/>
          </f:facet>
@@ -105,7 +106,7 @@
       </a:column>
                         
       <%-- Actions column --%>
-      <a:column id="col6" actions="true" style="text-align:left">
+      <a:column id="col6" actions="true" style="padding:2px;text-align:left">
          <f:facet name="header">
             <h:outputText id="col6-txt" value="#{msg.actions}"/>
          </f:facet>

source/web/jsp/workflow/tasks-completed-dashlet.jsp

@@ -3,68 +3,92 @@
 <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
+<h:outputText value="#{msg.no_tasks}" rendered="#{empty WorkflowBean.tasksCompleted}" />
+
 <a:richList id="tasks-completed-list" viewMode="details" value="#{WorkflowBean.tasksCompleted}" var="r"
             styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" 
             altRowStyleClass="recordSetRowAlt" width="100%" pageSize="10"
-            initialSortColumn="name" initialSortDescending="true">
+            initialSortColumn="bpm:completionDate" initialSortDescending="true"
+            rendered="#{not empty WorkflowBean.tasksCompleted}">
 
    <%-- Primary column for details view mode --%>
    <a:column id="col1" primary="true" width="200" style="padding:2px;text-align:left">
       <f:facet name="header">
-         <a:sortLink id="col1-sort" label="#{msg.title}" value="name" mode="case-insensitive" styleClass="header"/>
+         <a:sortLink id="col1-sort" label="#{msg.description}" value="name" mode="case-insensitive" styleClass="header"/>
       </f:facet>
       <f:facet name="small-icon">
-         <a:actionLink id="col1-act1" value="#{r.name}" image="/images/icons/completed_workflow_task.gif" showLink="false"
+         <a:actionLink id="col1-act1" value="#{r['bpm:description']}" image="/images/icons/completed_workflow_task.gif" showLink="false"
                        actionListener="#{DialogManager.setupParameters}" action="dialog:viewCompletedTask">
             <f:param name="id" value="#{r.id}" />
          </a:actionLink>
       </f:facet>
-      <a:actionLink id="col1-act2" value="#{r.name}" actionListener="#{DialogManager.setupParameters}" 
+      <a:actionLink id="col1-act2" value="#{r['bpm:description']}" actionListener="#{DialogManager.setupParameters}" 
                     action="dialog:viewCompletedTask">
          <f:param name="id" value="#{r.id}" />
       </a:actionLink>
    </a:column>
-   
-   <%-- Task id column --%>
-   <a:column id="col2" style="text-align:left">
+
+   <%-- Task type --%>   
+   <a:column id="col2" style="padding:2px;text-align:left">
       <f:facet name="header">
-         <a:sortLink id="col2-sort" label="#{msg.id}" value="bpm:taskId" styleClass="header"/>
+         <a:sortLink id="col2-sort" label="#{msg.type}" value="name" mode="case-insensitive" styleClass="header"/>
       </f:facet>
-      <h:outputText id="col2-txt" value="#{r['bpm:taskId']}" />
+      <h:outputText id="col2-txt" value="#{r.name}" />
    </a:column>
    
-   <%-- Source column --%>
-   <a:column id="col3" style="text-align:left">
+   <%-- Task id column --%>
+   <a:column id="col3" style="padding:2px;text-align:left">
       <f:facet name="header">
-         <a:sortLink id="col3-sort" label="#{msg.source}" value="sourceSpaceName" styleClass="header"/>
+         <a:sortLink id="col3-sort" label="#{msg.id}" value="bpm:taskId" styleClass="header"/>
       </f:facet>
-      <h:outputText id="col3-txt" value="#{r.sourceSpaceName}" />
+      <h:outputText id="col3-txt" value="#{r['bpm:taskId']}" />
+   </a:column>
+      
+   <%-- Source column --%>
+   <a:column id="col4" style="padding:2px;text-align:left">
+      <f:facet name="header">
+         <a:sortLink id="col4-sort" label="#{msg.source}" value="sourceSpaceName" styleClass="header"/>
+      </f:facet>
+      <a:actionLink id="col4-act1" value="#{r.sourceSpaceName}" 
+                    actionListener="#{BrowseBean.clickSpace}" action="browse">
+         <f:param name="id" value="#{r.sourceSpaceId}" />
+      </a:actionLink>
+   </a:column>
+   
+   <%-- Created Date column --%>
+   <a:column id="col5" style="padding:2px;text-align:left">
+      <f:facet name="header">
+         <a:sortLink id="col5-sort" label="#{msg.created}" value="created" styleClass="header"/>
+      </f:facet>
+      <h:outputText id="col5-txt" value="#{r.created}">
+         <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+      </h:outputText>
    </a:column>
    
    <%-- Completed date column --%>
-   <a:column id="col4" style="text-align:left">
+   <a:column id="col6" style="padding:2px;text-align:left">
       <f:facet name="header">
-         <a:sortLink id="col4-sort" label="#{msg.completed_on}" value="bpm:completionDate" styleClass="header"/>
+         <a:sortLink id="col6-sort" label="#{msg.completed_on}" value="bpm:completionDate" styleClass="header"/>
       </f:facet>
-      <h:outputText id="col4-txt" value="#{r['bpm:completionDate']}">
+      <h:outputText id="col6-txt" value="#{r['bpm:completionDate']}">
          <a:convertXMLDate type="both" pattern="#{msg.date_pattern}" />
       </h:outputText>
    </a:column>
    
    <%-- Outcome column --%>
-   <a:column id="col5" style="text-align:left">
+   <a:column id="col7" style="padding:2px;text-align:left">
       <f:facet name="header">
-         <a:sortLink id="col5-sort" label="#{msg.outcome}" value="outcome" styleClass="header"/>
+         <a:sortLink id="col7-sort" label="#{msg.outcome}" value="outcome" styleClass="header"/>
       </f:facet>
-      <h:outputText id="col5-txt" value="#{r.outcome}" />
+      <h:outputText id="col7-txt" value="#{r.outcome}" />
    </a:column>
    
    <%-- Actions column --%>
-   <a:column id="col6" actions="true" style="text-align:left">
+   <a:column id="col8" actions="true" style="padding:2px;text-align:left">
       <f:facet name="header">
-         <h:outputText id="col6-txt" value="#{msg.actions}"/>
+         <h:outputText id="col8-txt" value="#{msg.actions}"/>
       </f:facet>
-      <r:actions id="col6-actions" value="dashlet_completed_actions" context="#{r}" showLink="false" 
+      <r:actions id="col8-actions" value="dashlet_completed_actions" context="#{r}" showLink="false" 
                  styleClass="inlineAction" />
    </a:column>
    

source/web/jsp/workflow/tasks-todo-dashlet.jsp

@@ -3,76 +3,100 @@
 <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
+<h:outputText value="#{msg.no_tasks}" rendered="#{empty WorkflowBean.tasksToDo}" />
+
 <a:richList id="tasks-todo-list" viewMode="details" value="#{WorkflowBean.tasksToDo}" var="r"
             styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" 
             altRowStyleClass="recordSetRowAlt" width="100%" pageSize="10"
-            initialSortColumn="name" initialSortDescending="true">
-
+            initialSortColumn="created" initialSortDescending="true" 
+            rendered="#{not empty WorkflowBean.tasksToDo}">
+   
    <%-- Primary column for details view mode --%>
    <a:column id="col1" primary="true" width="200" style="padding:2px;text-align:left">
       <f:facet name="header">
-         <a:sortLink id="col1-sort" label="#{msg.title}" value="name" mode="case-insensitive" styleClass="header"/>
+         <a:sortLink id="col1-sort" label="#{msg.description}" value="name" mode="case-insensitive" styleClass="header"/>
       </f:facet>
       <f:facet name="small-icon">
-         <a:actionLink id="col1-act1" value="#{r.name}" image="/images/icons/workflow_task.gif" showLink="false"
+         <a:actionLink id="col1-act1" value="#{r['bpm:description']}" image="/images/icons/workflow_task.gif" showLink="false"
                        actionListener="#{DialogManager.setupParameters}" action="dialog:manageTask">
             <f:param name="id" value="#{r.id}" />
          </a:actionLink>
       </f:facet>
-      <a:actionLink id="col1-act2" value="#{r.name}" actionListener="#{DialogManager.setupParameters}" 
+      <a:actionLink id="col1-act2" value="#{r['bpm:description']}" actionListener="#{DialogManager.setupParameters}" 
                     action="dialog:manageTask">
          <f:param name="id" value="#{r.id}" />
       </a:actionLink>
    </a:column>
+
+   <%-- Task type --%>   
+   <a:column id="col2" style="padding:2px;text-align:left">
+      <f:facet name="header">
+         <a:sortLink id="col2-sort" label="#{msg.type}" value="name" mode="case-insensitive" styleClass="header"/>
+      </f:facet>
+      <h:outputText id="col2-txt" value="#{r.name}" />
+   </a:column>
    
    <%-- Task id column --%>
-   <a:column id="col2" style="text-align:left">
+   <a:column id="col3" style="padding:2px;text-align:left">
       <f:facet name="header">
-         <a:sortLink id="col2-sort" label="#{msg.id}" value="bpm:taskId" styleClass="header"/>
+         <a:sortLink id="col3-sort" label="#{msg.id}" value="bpm:taskId" styleClass="header"/>
       </f:facet>
-      <h:outputText id="col2-txt" value="#{r['bpm:taskId']}" />
+      <h:outputText id="col3-txt" value="#{r['bpm:taskId']}" />
    </a:column>
    
    <%-- Source column --%>
-   <a:column id="col3" style="text-align:left">
+   <a:column id="col4" style="padding:2px;text-align:left">
       <f:facet name="header">
-         <a:sortLink id="col3-sort" label="#{msg.source}" value="sourceSpaceName" styleClass="header"/>
+         <a:sortLink id="col4-sort" label="#{msg.source}" value="sourceSpaceName" styleClass="header"/>
       </f:facet>
-      <h:outputText id="col3-txt" value="#{r.sourceSpaceName}" />
+      <a:actionLink id="col4-act1" value="#{r.sourceSpaceName}" 
+                    actionListener="#{BrowseBean.clickSpace}" action="browse">
+         <f:param name="id" value="#{r.sourceSpaceId}" />
+      </a:actionLink>
+   </a:column>
+   
+   <%-- Created Date column --%>
+   <a:column id="col5" style="padding:2px;text-align:left">
+      <f:facet name="header">
+         <a:sortLink id="col5-sort" label="#{msg.created}" value="created" styleClass="header"/>
+      </f:facet>
+      <h:outputText id="col5-txt" value="#{r.created}">
+         <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+      </h:outputText>
    </a:column>
    
    <%-- Due date column --%>
-   <a:column id="col4" style="text-align:left">
+   <a:column id="col6" style="padding:2px;text-align:left">
       <f:facet name="header">
-         <a:sortLink id="col4-sort" label="#{msg.due_date}" value="bpm:startDate" styleClass="header"/>
+         <a:sortLink id="col6-sort" label="#{msg.due_date}" value="bpm:dueDate" styleClass="header"/>
       </f:facet>
-      <h:outputText id="col4-txt" value="#{r['bpm:dueDate']}">
+      <h:outputText id="col6-txt" value="#{r['bpm:dueDate']}">
          <a:convertXMLDate type="both" pattern="#{msg.date_pattern}" />
       </h:outputText>
    </a:column>
    
    <%-- Status column --%>
-   <a:column id="col5" style="text-align:left">
+   <a:column id="col7" style="padding:2px;text-align:left">
       <f:facet name="header">
-         <a:sortLink id="col5-sort" label="#{msg.status}" value="bpm:status" styleClass="header"/>
+         <a:sortLink id="col7-sort" label="#{msg.status}" value="bpm:status" styleClass="header"/>
       </f:facet>
-      <h:outputText id="col5-txt" value="#{r['bpm:status']}" />
+      <h:outputText id="col7-txt" value="#{r['bpm:status']}" />
    </a:column>
    
    <%-- Priority column --%>
-   <a:column id="col6" style="text-align:left">
+   <a:column id="col8" style="padding:2px;text-align:left">
       <f:facet name="header">
-         <a:sortLink id="col6-sort" label="#{msg.priority}" value="bpm:priority" styleClass="header"/>
+         <a:sortLink id="col8-sort" label="#{msg.priority}" value="bpm:priority" styleClass="header"/>
       </f:facet>
-      <h:outputText id="col6-txt" value="#{r['bpm:priority']}" />
+      <h:outputText id="col8-txt" value="#{r['bpm:priority']}" />
    </a:column>
    
    <%-- Actions column --%>
-   <a:column id="col7" actions="true" style="text-align:left">
+   <a:column id="col9" actions="true" style="padding:2px;text-align:left">
       <f:facet name="header">
-         <h:outputText id="col7-txt" value="#{msg.actions}"/>
+         <h:outputText id="col9-txt" value="#{msg.actions}"/>
       </f:facet>
-      <r:actions id="col7-actions" value="dashlet_todo_actions" context="#{r}" showLink="false" 
+      <r:actions id="col9-actions" value="dashlet_todo_actions" context="#{r}" showLink="false" 
                  styleClass="inlineAction" />
    </a:column>
    

source/web/jsp/workflow/view-completed-task-dialog.jsp

@@ -31,14 +31,17 @@
 <a:panel id="resources-panel" label="#{msg.resources}"
          border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
    
+   <h:outputText value="#{msg.no_resources}" rendered="#{empty DialogManager.bean.resources}" />
+   
    <a:richList id="resources-list" viewMode="details" value="#{DialogManager.bean.resources}" var="r"
                binding="#{DialogManager.bean.packageItemsRichList}"
                styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" 
                altRowStyleClass="recordSetRowAlt" width="100%" pageSize="10"
-               initialSortColumn="name" initialSortDescending="true">
+               initialSortColumn="name" initialSortDescending="true"
+               rendered="#{not empty DialogManager.bean.resources}">
       
       <%-- Name column --%>
-      <a:column id="col1" primary="true" width="200" style="padding:2px; text-align:left">
+      <a:column id="col1" primary="true" width="200" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col1-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
          </f:facet>
@@ -51,7 +54,7 @@
       </a:column>
       
       <%-- Description column --%>
-      <a:column id="col2" style="text-align:left">
+      <a:column id="col2" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col2-sort" label="#{msg.description}" value="description" styleClass="header"/>
          </f:facet>
@@ -59,15 +62,16 @@
       </a:column>
       
       <%-- Path column --%>
-      <a:column id="col3" style="text-align:left">
+      <a:column id="col3" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col3-sort" label="#{msg.path}" value="path" styleClass="header"/>
          </f:facet>
-         <r:nodePath id="col3-path" value="#{r.path}" />
+         <r:nodePath id="col3-path" value="#{r.path}" action="dialog:close:browse" 
+                     actionListener="#{BrowseBean.clickSpacePath}" />
       </a:column>
       
       <%-- Created Date column --%>
-      <a:column id="col4" style="text-align:left">
+      <a:column id="col4" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col4-sort" label="#{msg.created}" value="created" styleClass="header"/>
          </f:facet>
@@ -77,7 +81,7 @@
       </a:column>
       
       <%-- Modified Date column --%>
-      <a:column id="col5" style="text-align:left">
+      <a:column id="col5" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col5-sort" label="#{msg.modified}" value="modified" styleClass="header"/>
          </f:facet>