- Another workflow checkpoint

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3596 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

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

@@ -32,19 +32,21 @@
          border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
    
    <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">
-   
-      <%-- Primary column for details view mode --%>
-      <a:column primary="true" width="200" style="padding:2px;text-align:left">
+      
+      <%-- Name column --%>
+      <a:column primary="true" width="200" style="padding:2px; text-align:left">
          <f:facet name="header">
             <a:sortLink label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
          </f:facet>
          <f:facet name="small-icon">
-            <h:graphicImage url="/images/icons/post.gif" />
+               <a:actionLink value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType16}" 
+                             showLink="false" styleClass="inlineAction" />
          </f:facet>
-         <h:outputText value="#{r.name}" />
+         <a:actionLink value="#{r.name}" href="#{r.url}" target="new" />
       </a:column>
       
       <%-- Description column --%>
@@ -60,19 +62,51 @@
          <f:facet name="header">
             <a:sortLink label="#{msg.path}" value="path" styleClass="header"/>
          </f:facet>
-         <h:outputText value="#{r.path}" />
+         <r:nodePath value="#{r.path}" />
       </a:column>
       
+      <%-- Created Date column --%>
+      <a:column style="text-align:left">
+         <f:facet name="header">
+            <a:sortLink label="#{msg.created}" value="created" styleClass="header"/>
+         </f:facet>
+         <h:outputText value="#{r.created}">
+            <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+         </h:outputText>
+      </a:column>
+      
+      <%-- Modified Date column --%>
+      <a:column style="text-align:left">
+         <f:facet name="header">
+            <a:sortLink label="#{msg.modified}" value="modified" styleClass="header"/>
+         </f:facet>
+         <h:outputText value="#{r.modified}">
+            <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+         </h:outputText>
+      </a:column>
+                        
       <%-- Actions column --%>
       <a:column actions="true" style="text-align:left">
          <f:facet name="header">
             <h:outputText value="#{msg.actions}"/>
          </f:facet>
-         
-         <%-- actions are configured in web-client-config-actions.xml --%>
-         <r:actions id="actions-col-actions" value="workflow_actions" context="#{r}" showLink="false" styleClass="inlineAction" />
+         <r:actions id="actions-col-actions" value="workflow_item_collection_actions" 
+                    context="#{r}" showLink="false" styleClass="inlineAction" />
       </a:column>
       
-      <a:dataPager styleClass="pager" />
+      <%-- 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>
-</a:panel>
+   
+   <%-- Put the package actions here --%>
+   
+</a:panel>

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

@@ -37,8 +37,10 @@
    </f:verbatim>
 </h:panelGroup>
 
-<h:panelGroup rendered="#{not empty WizardManager.bean.taskMetadataNode}">
+<a:panel id="props-panel" label="#{msg.properties}" rendered="#{not empty WizardManager.bean.taskMetadataNode}"
+      border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
+      
    <r:propertySheetGrid id="task-props" value="#{WizardManager.bean.taskMetadataNode}" 
                         var="taskProps" columns="1" externalConfig="true" />
-</h:panelGroup>
+</a:panel>
          

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

@@ -35,6 +35,14 @@
       <h:outputText value="#{r.type}" />
    </a:column>
    
+   <%-- Source column --%>
+   <a:column style="text-align:left">
+      <f:facet name="header">
+         <a:sortLink label="#{msg.source}" value="sourceSpaceName" styleClass="header"/>
+      </f:facet>
+      <h:outputText value="#{r.sourceSpaceName}" />
+   </a:column>
+   
    <%-- Completed date column --%>
    <a:column style="text-align:left">
       <f:facet name="header">
@@ -48,31 +56,19 @@
    <%-- Outcome column --%>
    <a:column style="text-align:left">
       <f:facet name="header">
-         <a:sortLink label="#{msg.outcome}" value="bpm:status" styleClass="header"/>
+         <a:sortLink label="#{msg.outcome}" value="outcome" styleClass="header"/>
       </f:facet>
-      <h:outputText value="#{r['bpm:status']}" />
+      <h:outputText value="#{r.outcome}" />
    </a:column>
    
    <%-- Actions column --%>
-   <%--
    <a:column actions="true" style="text-align:left">
       <f:facet name="header">
          <h:outputText value="#{msg.actions}"/>
       </f:facet>
-      <a:booleanEvaluator value="#{r.local}">
-         <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" 
-                       styleClass="inlineAction"
-                       actionListener="#{RulesBean.setupRuleAction}" action="deleteRule">
-            <f:param name="id" value="#{r.id}" />
-         </a:actionLink>
-         <a:actionLink value="#{msg.change_details}" image="/images/icons/change_rule.gif" 
-                       showLink="false" styleClass="inlineAction"
-                       actionListener="#{RulesBean.setupRuleAction}" action="wizard:editRule">
-            <f:param name="id" value="#{r.id}" />
-         </a:actionLink>
-      </a:booleanEvaluator>
+      <r:actions value="completed_workitem_actions" context="#{r}" showLink="false" 
+                 styleClass="inlineAction" />
    </a:column>
-   --%>
    
    <a:dataPager styleClass="pager" />
 </a:richList>

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

@@ -43,6 +43,14 @@
       <h:outputText value="#{r.type}" />
    </a:column>
    
+   <%-- Source column --%>
+   <a:column style="text-align:left">
+      <f:facet name="header">
+         <a:sortLink label="#{msg.source}" value="sourceSpaceName" styleClass="header"/>
+      </f:facet>
+      <h:outputText value="#{r.sourceSpaceName}" />
+   </a:column>
+   
    <%-- Due date column --%>
    <a:column style="text-align:left">
       <f:facet name="header">
@@ -61,26 +69,22 @@
       <h:outputText value="#{r['bpm:status']}" />
    </a:column>
    
+   <%-- Priority column --%>
+   <a:column style="text-align:left">
+      <f:facet name="header">
+         <a:sortLink label="#{msg.priority}" value="bpm:priority" styleClass="header"/>
+      </f:facet>
+      <h:outputText value="#{r['bpm:priority']}" />
+   </a:column>
+   
    <%-- Actions column --%>
-   <%--
    <a:column actions="true" style="text-align:left">
       <f:facet name="header">
          <h:outputText value="#{msg.actions}"/>
       </f:facet>
-      <a:booleanEvaluator value="#{r.local}">
-         <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" 
-                       styleClass="inlineAction"
-                       actionListener="#{RulesBean.setupRuleAction}" action="deleteRule">
-            <f:param name="id" value="#{r.id}" />
-         </a:actionLink>
-         <a:actionLink value="#{msg.change_details}" image="/images/icons/change_rule.gif" 
-                       showLink="false" styleClass="inlineAction"
-                       actionListener="#{RulesBean.setupRuleAction}" action="wizard:editRule">
-            <f:param name="id" value="#{r.id}" />
-         </a:actionLink>
-      </a:booleanEvaluator>
+      <r:actions value="manage_workitem_actions" context="#{r}" showLink="false" 
+                 styleClass="inlineAction" />
    </a:column>
-   --%>
    
    <a:dataPager styleClass="pager" />
 </a:richList>