Scarab commit: svn commit: r10747 - trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm

Author: dabbous
Date: 2009-06-01 17:46:43-0700
New Revision: 10747

Modified:
   trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm

Log:
SCB2953: work in progress

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=10747&r1=10746&r2=10747
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm	2009-06-01 17:46:43-0700
@@ -21,19 +21,8 @@
 #set ($module      = $issue.Module)
 #set ($issueType   = $issue.issueType)
 #set ($rmit        = $module.getRModuleIssueType($issueType))
-#markup('s') $issue.UniqueId ($rmit.displayName) - $issue.DefaultText #markup('s')
-$cr
-#if ($multipleActivity)
-$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)
-#end
-#if ($ActivityReasons && $ActivityReasons.size > 0 )
+#markup('b')$issue.UniqueId [$rmit.displayName] - $issue.DefaultText.trim()#markup('b')
+#if ($ActivityReasons.size() > 0)
 $cr
 -------------------------------------------------------------------------------
 #markup('b')$l10n.ActivityReasons#markup('b')
@@ -54,7 +43,11 @@
 #markup('b')$l10n.ActivityPersonnelChanges#markup('b')
 ${cr}-------------------------------------------------------------------------------
 #foreach ($not in $ActivityPersonnelChanges)
-  - $not.Activity.getDescription($l10n)
+#set ($displayName = $not.Activity.getDisplayName(l10n) )
+#set ($newValue    = $not.Activity.getNewValue(l10n) )
+#set ($oldValue    = $not.Activity.getOldValue(l10n) )
+  - $displayName: #if ($oldValue.length() > 0 && $oldValue.length()+$newValue.length() < 70) $oldValue -->#end #if ($newValue.length() > 0)$newValue #else(${l10n.Deleted}) #end #if ($oldValue.length() == 0)   ($l10n.New) #end
+
 #end
 #end
 #if ($ActivityAttributeChanges)
@@ -63,15 +56,16 @@
 #markup('b')$l10n.ActivityAttributeChanges#markup('b')
 ${cr}-------------------------------------------------------------------------------
 #foreach ($not in $ActivityAttributeChanges)
-  #set ($displayName = $not.Activity.DisplayName(l10n) )
-  #set ($newValue    = $not.Activity.NewValue(l10n) )
-  #set ($oldValue    = $not.Activity.OldValue(l10n) )
-  #if ($not.Activity.Attribute.AttributeType.Name == "long-string")
-  - $l10n.format("AttributeSetTo", $displayName):
+#set ($displayName = $not.Activity.getDisplayName(l10n) )
+#set ($newValue    = $not.Activity.getNewValue(l10n) )
+#set ($oldValue    = $not.Activity.getOldValue(l10n) )
+#if ($not.Activity.Attribute.AttributeType.Name == "long-string")
+  - $displayName:
     "$newValue"
-  #else
-  - $displayName: #if ($oldValue.length > 0 && $oldValue.length+$newValue.length < 70) $oldValue --> #end $newValue 
-  #end
+#else
+  - $displayName: #if ($oldValue.length() > 0 && $oldValue.length()+$newValue.length() < 70) $oldValue -->#end #if ($newValue.length() > 0)$newValue #else(${l10n.Deleted}) #end #if ($oldValue.length() == 0)   ($l10n.New) #end
+
+#end
 #end
 #end
 #if ($ActivityAssociatedInfo)
@@ -94,17 +88,26 @@
 #end
 #if ($ActivityComments)
 $cr
-#if ($activityComments.size > 1)
+#if ($ActivityComments.size() > 1)
 -------------------------------------------------------------------------------
 #markup('b')$l10n.ActivityComments#markup('b')
-${cr}
 #end
 #foreach ($not in $ActivityComments)
--------------------------------------------------------------------------------
+#if ($ActivityComments.size() > 1)
+${cr}-------------------------------------------------------------------------------
+#end
+#markup('b')${l10n.Comment} $not.Creator.Name#markup('b')$cr
 $not.Activity.Attachment.Data
-($not.Creator.Name)
-$cr
 #end
 #end
--------------------------------------------------------------------------------
+${cr}-------------------------------------------------------------------------------
+#if ($multipleActivity)
+$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)${cr}
+#end
 [$module.Name]: $issueURL

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