Task resources list now populated in My Tasks template.

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

config/alfresco/templates/client/task_resource_panel.ftl

@@ -1,27 +1,14 @@
 <table cellpadding='2' cellspacing='0'>
+   <#list task.packageResources as res>
    <tr>
-      <td>ICON</td>
-      <td>Document NAME</td>
-      <td>Something</td>
-   </tr>
-   <tr>
-      <td>ICON</td>
-      <td>Document NAME</td>
-      <td>Something</td>
-   </tr>
-   <tr>
-      <td>ICON</td>
-      <td>Document NAME</td>
-      <td>Something</td>
-   </tr>
-   <tr>
-      <td>ICON</td>
-      <td>Document NAME</td>
-      <td>Something</td>
-   </tr>
-   <tr>
-      <td>ICON</td>
-      <td>Document NAME</td>
-      <td>Something</td>
+      <td><a href="${url.context}${res.url}" target="new"><img src="${url.context}${res.icon16}" border=0></a></td>
+      <td>
+         <#if res.isDocument>
+            <a class="resourceLink" href="${url.context}${res.url}" target="new">${res.name}</a>
+         <#else>
+            <span class="resourceLink">${res.name}</span>
+         </#if>
+      </td>
    </tr>
+   </#list>
 </table>

config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks_get_html.ftl

@@ -80,7 +80,7 @@
             </div>
             <div class="taskDetail">
                <div style="float:left">
-                  <table cellpadding='2' cellspacing='0' style="margin-left:32px;margin-top:20px">
+                  <table cellpadding='2' cellspacing='0' style="margin-left:32px;margin-top:16px">
                      <tr><td class="taskMetaprop">Status:</td><td class="taskMetadata">${t.properties["bpm:status"]}</td>
                      <tr><td class="taskMetaprop">Priority:</td><td class="taskMetadata">${t.properties["bpm:priority"]}</td>
                      <tr><td class="taskMetaprop">Start Date:</td><td class="taskMetadata">${t.startDate?date}</td></tr>
@@ -92,7 +92,11 @@
    	         <div class="taskResources"></div>
    	         <div>
       	         <table class="taskActions" style="padding-left:16px">
-      	            <tr><td>Approve</td><td style="padding-left:64px">Reject</td></tr>
+      	            <tr>
+      	               <#list t.transitions as wt>
+      	               <td><a class="taskAction" href="${url.context}/command/task/end/${t.id}/${wt.id}">${wt.label}</a></td>
+      	               </#list>
+      	            </tr>
       	         </table>
       	      </div>
             </div>
@@ -233,7 +237,7 @@ a.filterLinkSelected:link, a.filterLinkSelected:visited
    border-top: 1px solid #0092DD;
    border-bottom: 1px solid #CCD4DB;
    border-right: 1px solid #CCD4DB;
-   background-color: #F8FCFD;
+   background-color: #FEF8BC;
    margin: 4px 0px 0px 16px;
    width: 400px;
    height: 80px;
@@ -249,18 +253,45 @@ a.filterLinkSelected:link, a.filterLinkSelected:visited
    display: inline;
 }
 
-.taskResources td
+a.resourceLink:link, a.resourceLink:visited
+{
+   color: #5A5741;
+   font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
+}
+
+.resourceLink
 {
    color: #5A5741;
    font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
 }
 
 .taskActions td
+{
+   padding: 4px;
+}
+
+a.taskAction:link, a.taskAction:visited
 {
    color: #5A5741;
-   font-size: 14px;
+   font-size: 13px;
    font-weight: bold;
    font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
+   border: 1px solid #F6F1BA;
+   padding-left: 4px;
+   padding-right: 4px;
+}
+
+a.taskAction:hover
+{
+   font-size: 13px;
+   font-weight: bold;
+   font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
+   border: 1px solid #F6F1BA;
+   padding-left: 4px;
+   padding-right: 4px;
+   color: #FFFFFF;
+   background-color: #FDB64F;
+   text-decoration: none;
 }
 
 .taskMetadata

config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms_get_html.ftl

@@ -16,6 +16,7 @@
       <#list wp.childAssocs["wca:webuser"] as user>
          <#if user.properties["wca:username"] = person.properties.userName>
             <#assign projectcount=projectcount+1>
+            <#-- construct the sandbox name based on the webproject and current username -->
             <#assign sandbox=wp.properties["wca:avmstore"] + "--" + person.properties.userName>
             <div class="webProjectRow">
                <div class="webProjectTitle">

source/web/scripts/ajax/doclist.js

@@ -83,7 +83,7 @@ var MyDocs = {
          detail.setStyle('height', detail.defHeight);
          info.setStyle('opacity', 0);
          img.defSrc = img.src;
-         img.bigSrc = img.src.replace(/filetypes\//, 'filetypes64/').replace(/.gif/, '.png');
+         img.bigSrc = img.src.replace(/filetypes\//, 'filetypes64/').replace(/.gif$/, '.png');
          resource.defHeight = 1;
          resource.setStyle('height', resource.defHeight);
 

source/web/scripts/ajax/mytasks.js

@@ -157,7 +157,7 @@ var MyTasks = {
 
                // slide and fade in the details panel
                animDetail[i] = {
-                  'height': [detailHeight, detail.defHeight + 140],
+                  'height': [detailHeight, detail.defHeight + 132],
                   'opacity': [detail.getStyle('opacity'), 1]};
 
                // close other open tasks and toggle this one if it's already open