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

Author: dabbous
Date: 2009-06-01 14:40:39-0700
New Revision: 10746

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=10746&r1=10745&r2=10746
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm	2009-06-01 14:40:39-0700
@@ -21,7 +21,7 @@
 #set ($module      = $issue.Module)
 #set ($issueType   = $issue.issueType)
 #set ($rmit        = $module.getRModuleIssueType($issueType))
-#markup('b') $issue.UniqueId ($rmit.displayName) - $issue.DefaultText #markup('b')
+#markup('s') $issue.UniqueId ($rmit.displayName) - $issue.DefaultText #markup('s')
 $cr
 #if ($multipleActivity)
 $l10n.ActivitiesGeneratedBy
@@ -63,12 +63,15 @@
 #markup('b')$l10n.ActivityAttributeChanges#markup('b')
 ${cr}-------------------------------------------------------------------------------
 #foreach ($not in $ActivityAttributeChanges)
-#if ($not.Activity.Attribute.AttributeType.Name == "long-string")
-  - $l10n.format("AttributeSetTo", $not.Activity.DisplayName):
-    "$not.Activity.NewValue"
-#else
-  - $not.Activity.getDescription($l10n)
-#end
+  #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):
+    "$newValue"
+  #else
+  - $displayName: #if ($oldValue.length > 0 && $oldValue.length+$newValue.length < 70) $oldValue --> #end $newValue 
+  #end
 #end
 #end
 #if ($ActivityAssociatedInfo)
@@ -91,10 +94,13 @@
 #end
 #if ($ActivityComments)
 $cr
+#if ($activityComments.size > 1)
 -------------------------------------------------------------------------------
 #markup('b')$l10n.ActivityComments#markup('b')
-${cr}-------------------------------------------------------------------------------
+${cr}
+#end
 #foreach ($not in $ActivityComments)
+-------------------------------------------------------------------------------
 $not.Activity.Attachment.Data
 ($not.Creator.Name)
 $cr

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