inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated documents section of workflow email notification template to match Linton's styling and fixed task edit/details URLs

Browse Source 
NOTE: You'll need to start with a clean database to see these changes.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2011-08-15 20:44:17 +00:00
parent 1259950719
commit 4dd7311c98
3 changed files with 99 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
config/alfresco/bootstrap/notification/wf-email.html.ftl
View File

@@ -1,6 +1,4 @@
<html> <html>
<head> <head>
<style type="text/css"><!-- <style type="text/css"><!--
body body
@@ -60,7 +58,7 @@
</#if> </#if>
</p> </p>
<p><b>"${args.workflowDescription}"</b></p> <p><b>"${args.workflowTitle}"</b></p>
<p> <p>
<#if (args.workflowDueDate)??>Due:&nbsp;&nbsp;<b>${args.workflowDueDate?date?string.full}</b><br></#if> <#if (args.workflowDueDate)??>Due:&nbsp;&nbsp;<b>${args.workflowDueDate?date?string.full}</b><br></#if>
@@ -79,30 +77,48 @@
</p> </p>
<#if (args.workflowDocuments)??> <#if (args.workflowDocuments)??>
<table cellpadding=0 callspacing=0 border=0> <table cellpadding="0" callspacing="0" border="0" bgcolor="#eeeeee" style="padding:10px; border: 1px solid #aaaaaa;">
<#list args.workflowDocuments as doc> <#list args.workflowDocuments as doc>
<tr><td><table cellpadding=0 cellspacing=0 border=0><tr> <tr>
<td><img src="${shareUrl}/res/components/images/generic-file.png" alt="" width="64" height="64" border="0" style="padding-right: 20px;" /></td> <td>
<td><table cellpadding=0 cellspacing=0 border=0> <table cellpadding="0" cellspacing="0" border="0">
<tr><td><b>${doc.name}</b></td></tr> <tr>
<tr><td>Click on this link to download the document:</td></tr> <td valign="top">
<tr><td> <img src="${shareUrl}/res/components/images/generic-file.png" alt="" width="64" height="64" border="0" style="padding-right: 10px;" />
</td>
<td>
<table cellpadding="2" cellspacing="0" border="0">
<tr>
<td><b>${doc.name}</b></td>
</tr>
<tr>
<td>Click on this link to download the document:</td>
</tr>
<tr>
<td>
<a href="${shareUrl}/proxy/alfresco/api/node/content/workspace/SpacesStore/${doc.id}/${doc.name}?a=true"> <a href="${shareUrl}/proxy/alfresco/api/node/content/workspace/SpacesStore/${doc.id}/${doc.name}?a=true">
${shareUrl}/proxy/alfresco/api/node/content/workspace/SpacesStore/${doc.id}/${doc.name}?a=true ${shareUrl}/proxy/alfresco/api/node/content/workspace/SpacesStore/${doc.id}/${doc.name}?a=true</a>
</a> </td>
</td></tr> </tr>
</table></td> </table>
</tr></table></td></tr> </td>
</tr>
</table>
</td>
</tr>
<#if doc_has_next>
<tr><td><div style="border-top: 1px solid #aaaaaa; margin:12px;"></div></td></tr>
</#if>
</#list> </#list>
</table> </table>
</#if> </#if>
<#if args.workflowPooled == true> <#if args.workflowPooled == true>
<p>Click this link to view the task:</p> <p>Click this link to view the task:</p>
<p><a href="${shareUrl}/page/task-view?taskId=${args.workflowId}">${shareUrl}/page/task-view?taskId=${args.workflowId}</a> <p><a href="${shareUrl}/page/task-details?taskId=${args.workflowId}">${shareUrl}/page/task-details?taskId=${args.workflowId}</a>
<#else> <#else>
<p>Click this link to edit the task:</p> <p>Click this link to edit the task:</p>
<p><a href="${shareUrl}/page/task-details?taskId=${args.workflowId}">${shareUrl}/page/task-edit?taskId=${args.workflowId}</a> <p><a href="${shareUrl}/page/task-edit?taskId=${args.workflowId}">${shareUrl}/page/task-edit?taskId=${args.workflowId}</a>
</#if> </#if>
<p>Sincerely,<br /> <p>Sincerely,<br />

19
source/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java
View File

@@ -1,5 +1,20 @@
/** /*
* Copyright (C) 2005-2011 Alfresco Software Limited.
* *
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.alfresco.repo.workflow; package org.alfresco.repo.workflow;
@@ -22,8 +37,6 @@ import org.springframework.extensions.surf.util.I18NUtil;
/** /**
* Utility class containing methods to help when sending workflow notifications. * Utility class containing methods to help when sending workflow notifications.
* *
* TODO? Move to workflow serivce??
*
* @author Roy Wetherall * @author Roy Wetherall
*/ */
public abstract class WorkflowNotificationUtils public abstract class WorkflowNotificationUtils