Scarab commit: svn commit: r10744 - trunk/src: java/org/tigris/scarab/notification webapp/WEB-INF/templates/email/notification

Author: dabbous
Date: 2009-05-31 13:51:11-0700
New Revision: 10744

Modified:
   trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java
   trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm

Log:
SCB2953: First attempt to imprve the text based email notification template

Modified: trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java?view=diff&pathrev=10744&r1=10743&r2=10744
==============================================================================
--- trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java	(original)
+++ trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java	2009-05-31 13:51:11-0700
@@ -294,6 +294,7 @@
                     ectx.put("firstNotification", firstNotification);
                     ectx.put("lastNotification", lastNotification);
                     ectx.put("changeHint",getChangeHint(mostRelevantNotification, issue));
+                    ectx.put("cr", "\n"); // for email template to get a reliable Carriage return
 
                     Map groupedActivities = (Map) issueActivities.get(user);
                     if(groupedActivities == null)

Modified: trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm?view=diff&pathrev=10744&r1=10743&r2=10744
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm	2009-05-31 13:51:11-0700
@@ -15,59 +15,58 @@
  * o $multipleActivity: "true" or "false", depending on the notification scoping
  *   several activities or just one.
 *#
-#set ($issueURL = "$link.getIssueIdLink($issue)")
-#set ($user = $issue.ModifiedBy)
+#set ($issueURL    = "$link.getIssueIdLink($issue)")
+#set ($user        = $issue.ModifiedBy)
 #set ($defaultText = $issue.DefaultText)
-#set ($module = $issue.Module)
+#set ($module      = $issue.Module)
 #set ($issueType   = $issue.issueType)
 #set ($rmit        = $module.getRModuleIssueType($issueType))
-$l10n.ActivityReportOn
-
-  #markup('b')$rmit.displayName $issue.UniqueId - $issue.DefaultText#markup('b')
-
-
-  $l10n.ScarabLink: $issueURL
-  $l10n.CapModule: $module.Name
-
-
+#markup('b') $issue.UniqueId ($rmit.displayName) - $issue.DefaultText #markup('b')$cr
+-------------------------------------------------------------------------------$cr
+$cr
 #if ($multipleActivity)
-  $l10n.ActivityGeneratedBy
+$l10n.ActivitiesGeneratedBy
 #foreach ($creat in $creators)
   - $creat.Name ($creat.Email)
 #end
   $l10n.ActivityBetween $firstNotification.getActivityCreationDate($l10n) $l10n.ActivityAnd $lastNotification.getActivityCreationDate($l10n).
 #else
-  ${l10n.ActivityGeneratedBy}#foreach ($creat in $creators) $creat.Name ($creat.Email)#end $l10n.ActivityAt $firstNotification.getActivityCreationDate($l10n)
+${l10n.ActivityGeneratedBy}
+#foreach ($creat in $creators) $creat.Name ($creat.Email)#end $l10n.ActivityAt $firstNotification.getActivityCreationDate($l10n)
 #end
 
-#if ($ActivityReasons)
-  #markup('b')$l10n.ActivityReasons#markup('b')
-
+#if ($ActivityReasons && $ActivityReasons.size > 0 )
+$cr
+-------------------------------------------------------------------------------$cr
+#markup('b')$l10n.ActivityReasons#markup('b')$cr
+-------------------------------------------------------------------------------$cr
+$cr
 #foreach ($reason in $ActivityReasons)
   - $reason
 #end
 #end
-
-
 #if ($ActivityIssue)
+
 #foreach ($not in $ActivityIssue)
-  ** $not.Activity.getDescription($l10n) **
+** $not.Activity.getDescription($l10n) **
 #end
-
--------------------------------------------------------------------------------
 #end
 #if ($ActivityPersonnelChanges)
-  #markup('b')$l10n.ActivityPersonnelChanges#markup('b')
-
+$cr
+-------------------------------------------------------------------------------$cr
+#markup('b')$l10n.ActivityPersonnelChanges#markup('b')$cr
+-------------------------------------------------------------------------------$cr
+$cr
 #foreach ($not in $ActivityPersonnelChanges)
   - $not.Activity.getDescription($l10n)
 #end
-
--------------------------------------------------------------------------------
 #end
 #if ($ActivityAttributeChanges)
-  #markup('b')$l10n.ActivityAttributeChanges#markup('b')
-
+$cr
+-------------------------------------------------------------------------------$cr
+#markup('b')$l10n.ActivityAttributeChanges#markup('b')$cr
+-------------------------------------------------------------------------------$cr
+$cr
 #foreach ($not in $ActivityAttributeChanges)
 #if ($not.Activity.Attribute.AttributeType.Name == "long-string")
   - $l10n.format("AttributeSetTo", $not.Activity.DisplayName):
@@ -76,32 +75,39 @@
   - $not.Activity.getDescription($l10n)
 #end
 #end
-
--------------------------------------------------------------------------------
 #end
 #if ($ActivityAssociatedInfo)
-  #markup('b')$l10n.ActivityAssociatedInfo#markup('b')
-
+$cr
+-------------------------------------------------------------------------------$cr
+#markup('b')$l10n.ActivityAssociatedInfo#markup('b')$cr
+-------------------------------------------------------------------------------$cr
+$cr
 #foreach ($not in $ActivityAssociatedInfo)
   - $not.Activity.getDescription($l10n)
 #end
-
--------------------------------------------------------------------------------
 #end
 #if ($ActivityDependencies)
-  #markup('b')$l10n.ActivityDependencies#markup('b')
-
+$cr
+-------------------------------------------------------------------------------$cr
+#markup('b')$l10n.ActivityDependencies#markup('b')$cr
+-------------------------------------------------------------------------------$cr
+$cr
 #foreach ($not in $ActivityDependencies)
   - $not.Activity.getDescription($l10n)
 #end
-
--------------------------------------------------------------------------------
 #end
 #if ($ActivityComments)
-  #markup('b')$l10n.ActivityComments#markup('b')
+$cr
+-------------------------------------------------------------------------------$cr
+#markup('b')$l10n.ActivityComments#markup('b')$cr
+-------------------------------------------------------------------------------$cr
+$cr
 #foreach ($not in $ActivityComments)
-
-  - $l10n.By $not.Creator.Name - $not.getActivityCreationDate($l10n) ---
-  "$not.Activity.Attachment.Data"
+$not.Activity.Attachment.Data
+($not.Creator.Name)
+$cr
 #end
 #end
+$cr
+-------------------------------------------------------------------------------$cr
+[$module.Name]: $issueURL
\ No newline at end of file

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2357332