Merged V1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3925 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3965 . git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-08-07 17:49:17 +00:00 · 2006-09-29 07:45:33 +00:00
parent d4c5c3562a
commit cba5171884
23 changed files with 386 additions and 197 deletions
--- a/source/web/jsp/workflow/manage-task-dialog.jsp
+++ b/source/web/jsp/workflow/manage-task-dialog.jsp
@@ -41,7 +41,7 @@
               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>
@@ -54,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>
@@ -62,7 +62,7 @@
      </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>
@@ -71,7 +71,7 @@
      </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>
@@ -81,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>
@@ -91,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">
--- a/source/web/jsp/workflow/tasks-completed-dashlet.jsp
+++ b/source/web/jsp/workflow/tasks-completed-dashlet.jsp
@@ -14,7 +14,7 @@
   <%-- 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['bpm:description']}" image="/images/icons/completed_workflow_task.gif" showLink="false"
@@ -28,67 +28,67 @@
      </a:actionLink>
   </a:column>

-   <%-- Task id column --%>
+   <%-- 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>
   
-   <%-- Task type --%>   
-   <a:column id="col2a" style="padding:2px;text-align:left">
+   <%-- Task id column --%>
+   <a:column id="col3" style="padding:2px;text-align:left">
      <f:facet name="header">
-         <a:sortLink id="col2a-sort" label="#{msg.type}" value="name" mode="case-insensitive" styleClass="header"/>
+         <a:sortLink id="col3-sort" label="#{msg.id}" value="bpm:taskId" styleClass="header"/>
      </f:facet>
-      <h:outputText id="col2a-txt" value="#{r.name}" />
+      <h:outputText id="col3-txt" value="#{r['bpm:taskId']}" />
   </a:column>
      
   <%-- Source column --%>
-   <a:column id="col3" style="padding:2px;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>
-      <a:actionLink id="col3-act1" 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="col4" style="padding:2px;text-align:left">
+   <a:column id="col5" style="padding:2px;text-align:left">
      <f:facet name="header">
-         <a:sortLink id="col4-sort" label="#{msg.created}" value="created" styleClass="header"/>
+         <a:sortLink id="col5-sort" label="#{msg.created}" value="created" styleClass="header"/>
      </f:facet>
-      <h:outputText id="col4-txt" value="#{r.created}">
+      <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="col5" style="padding:2px;text-align:left">
+   <a:column id="col6" style="padding:2px;text-align:left">
      <f:facet name="header">
-         <a:sortLink id="col5-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="col5-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="col6" style="padding:2px;text-align:left">
+   <a:column id="col7" style="padding:2px;text-align:left">
      <f:facet name="header">
-         <a:sortLink id="col6-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="col6-txt" value="#{r.outcome}" />
+      <h:outputText id="col7-txt" value="#{r.outcome}" />
   </a:column>
   
   <%-- Actions column --%>
-   <a:column id="col7" actions="true" style="padding:2px;text-align:left">
+   <a:column id="col8" actions="true" style="padding:2px;text-align:left">
      <f:facet name="header">
-         <h:outputText id="col7-txt" value="#{msg.actions}"/>
+         <h:outputText id="col8-txt" value="#{msg.actions}"/>
      </f:facet>
-      <r:actions id="col7-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>
   
--- a/source/web/jsp/workflow/tasks-todo-dashlet.jsp
+++ b/source/web/jsp/workflow/tasks-todo-dashlet.jsp
@@ -14,7 +14,7 @@
   <%-- 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['bpm:description']}" image="/images/icons/workflow_task.gif" showLink="false"
@@ -28,75 +28,75 @@
      </a:actionLink>
   </a:column>

-   <%-- Task id column --%>
+   <%-- 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>
-
-   <%-- Task type --%>   
-   <a:column id="col2a" style="padding:2px;text-align:left">
+   
+   <%-- Task id column --%>
+   <a:column id="col3" style="padding:2px;text-align:left">
      <f:facet name="header">
-         <a:sortLink id="col2a-sort" label="#{msg.type}" value="name" mode="case-insensitive" styleClass="header"/>
+         <a:sortLink id="col3-sort" label="#{msg.id}" value="bpm:taskId" styleClass="header"/>
      </f:facet>
-      <h:outputText id="col2a-txt" value="#{r.name}" />
+      <h:outputText id="col3-txt" value="#{r['bpm:taskId']}" />
   </a:column>
   
   <%-- Source column --%>
-   <a:column id="col3" style="padding:2px;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>
-      <a:actionLink id="col3-act1" 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="col4" style="padding:2px;text-align:left">
+   <a:column id="col5" style="padding:2px;text-align:left">
      <f:facet name="header">
-         <a:sortLink id="col4-sort" label="#{msg.created}" value="created" styleClass="header"/>
+         <a:sortLink id="col5-sort" label="#{msg.created}" value="created" styleClass="header"/>
      </f:facet>
-      <h:outputText id="col4-txt" value="#{r.created}">
+      <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="col5" style="padding:2px;text-align:left">
+   <a:column id="col6" style="padding:2px;text-align:left">
      <f:facet name="header">
-         <a:sortLink id="col5-sort" label="#{msg.due_date}" value="bpm:dueDate" styleClass="header"/>
+         <a:sortLink id="col6-sort" label="#{msg.due_date}" value="bpm:dueDate" styleClass="header"/>
      </f:facet>
-      <h:outputText id="col5-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="col6" style="padding:2px;text-align:left">
+   <a:column id="col7" style="padding:2px;text-align:left">
      <f:facet name="header">
-         <a:sortLink id="col6-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="col6-txt" value="#{r['bpm:status']}" />
+      <h:outputText id="col7-txt" value="#{r['bpm:status']}" />
   </a:column>
   
   <%-- Priority column --%>
-   <a:column id="col7" style="padding:2px;text-align:left">
+   <a:column id="col8" style="padding:2px;text-align:left">
      <f:facet name="header">
-         <a:sortLink id="col7-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="col7-txt" value="#{r['bpm:priority']}" />
+      <h:outputText id="col8-txt" value="#{r['bpm:priority']}" />
   </a:column>
   
   <%-- Actions column --%>
-   <a:column id="col8" actions="true" style="padding:2px;text-align:left">
+   <a:column id="col9" actions="true" style="padding:2px;text-align:left">
      <f:facet name="header">
-         <h:outputText id="col8-txt" value="#{msg.actions}"/>
+         <h:outputText id="col9-txt" value="#{msg.actions}"/>
      </f:facet>
-      <r:actions id="col8-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>
   
--- a/source/web/jsp/workflow/view-completed-task-dialog.jsp
+++ b/source/web/jsp/workflow/view-completed-task-dialog.jsp
@@ -41,7 +41,7 @@
               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>
@@ -54,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>
@@ -62,7 +62,7 @@
      </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>
@@ -71,7 +71,7 @@
      </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>
@@ -81,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>