Scarab commit: svn commit: r10223 - branches/release/b21/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm

Author: dabbous
Date: 2006-07-24 01:36:06-0700
New Revision: 10223

Modified:
   branches/release/b21/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm

Log:
changed the default email template for better readability.
i am not sure why several markups have been choosen in first
place. I tried to keep only the boldface markup and let everything else
as plain text. IMHO this modification looks cleaner and is better
readable (in the mozilla email viewer).


Modified: branches/release/b21/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm?view=diff&rev=10223&p1=branches/release/b21/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm&r1=10222&r2=10223
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm	(original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm	2006-07-24 01:36:06-0700
@@ -17,89 +17,87 @@
 #set ($user = $issue.ModifiedBy)
 #set ($defaultText = $issue.DefaultText)
 #set ($module = $issue.Module)
-===============================================================================
 $l10n.ActivityReportOn
 
-    #markup('u')$issue.UniqueId - $issue.DefaultText#markup('u')
+  #markup('b')$issue.IssueType.Name $issue.UniqueId - $issue.DefaultText#markup('b')
+
+ 
+  $l10n.ScarabLink: $link.getIssueIdLink($issue)
+  $l10n.CapModule: $module.Name
 
-#markup('i')$l10n.IssueType#markup('i'): $issue.IssueType.Name
-#markup('i')$l10n.CapModule#markup('i'): $module.Name
-#markup('i')$l10n.ScarabLink#markup('i'): $link.getIssueIdLink($issue)
 
 #if ($multipleActivity)
-$l10n.ActivityGeneratedBy
+  $l10n.ActivityGeneratedBy
 #foreach ($creat in $creators)
   - $creat.Name ($creat.Email)
 #end 
- $l10n.ActivityBetween $firstNotification.getActivityCreationDate($l10n) $l10n.ActivityAnd $lastNotification.getActivityCreationDate($l10n).
+  $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.size() > 0)
-#markup('i')$l10n.ActivityReasons#markup('i')
+  #markup('b')$l10n.ActivityReasons#markup('b')
 
 #foreach ($reason in $ActivityReasons)
-  * $reason
+  - $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')
+  #markup('b')$l10n.ActivityPersonnelChanges#markup('b')
 
 #foreach ($not in $ActivityPersonnelChanges)
-* $not.Activity.getDescription($l10n)
+  - $not.Activity.getDescription($l10n)
 #end
 
 -------------------------------------------------------------------------------
 #end
 #if ($ActivityAttributeChanges)
- #markup('b')$l10n.ActivityAttributeChanges#markup('b')
+  #markup('b')$l10n.ActivityAttributeChanges#markup('b')
 
 #foreach ($not in $ActivityAttributeChanges)
 #if ($not.Activity.Attribute.AttributeType.Name == "long-string")
-* $l10n.format("AttributeSetTo", $not.Activity.DisplayName):
+  - $l10n.format("AttributeSetTo", $not.Activity.DisplayName):
     "$not.Activity.NewValue"
 #else
-* $not.Activity.getDescription($l10n)
+  - $not.Activity.getDescription($l10n)
 #end
 #end
 
 -------------------------------------------------------------------------------
 #end
 #if ($ActivityAssociatedInfo)
- #markup('b')$l10n.ActivityAssociatedInfo#markup('b')
+  #markup('b')$l10n.ActivityAssociatedInfo#markup('b')
 
 #foreach ($not in $ActivityAssociatedInfo)
-* $not.Activity.getDescription($l10n)
+  - $not.Activity.getDescription($l10n)
 #end
 
 -------------------------------------------------------------------------------
 #end
 #if ($ActivityDependencies)
- #markup('b')$l10n.ActivityDependencies#markup('b')
+  #markup('b')$l10n.ActivityDependencies#markup('b')
 
 #foreach ($not in $ActivityDependencies)
-* $not.Activity.getDescription($l10n)
+  - $not.Activity.getDescription($l10n)
 #end
 
 -------------------------------------------------------------------------------
 #end
 #if ($ActivityComments)
- #markup('b')$l10n.ActivityComments#markup('b')
+  #markup('b')$l10n.ActivityComments#markup('b')
 #foreach ($not in $ActivityComments)
 
---- #markup('i')$l10n.By $not.Creator.Name - $not.getActivityCreationDate($l10n)#markup('i') ---
+  - $l10n.By $not.Creator.Name - $not.getActivityCreationDate($l10n) ---
   "$not.Activity.Attachment.Data"
 #end
 #end
-
-===============================================================================
\ No newline at end of file