Scarab commit: svn commit: r10447 - trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm

Author: ronvoe122
Date: 2007-06-10 06:40:41-0700
New Revision: 10447

Modified:
   trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm

Log:
Join the four columns of the history of an issue into two columns.
So we have a narrow column containing date and user and a wide column containing the changes and the reason for change.


Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm?view=diff&rev=10447&p1=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm&p2=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm&r1=10446&r2=10447
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm	2007-06-10 06:40:41-0700
@@ -7,12 +7,10 @@
 <h3 onClick=smartToggleVisibility('history')><img name="history.state" src="$staticLink.setPath($iconCollapse)"/>$l10n.ChangeHistory</h3>
 <div id="history">
 
-  <table cellpadding="3" cellspacing="2" border="0">
+  <table cellpadding="3" cellspacing="2" border="0" width="100%">
   <tr>
-    <th>$l10n.DateStamp</th>
-    <th>$l10n.Action</th>
-    <th>$l10n.Reason</th>
-    <th>$l10n.By</th>
+    <th width="30%">$l10n.By,<br>$l10n.DateStamp</th>
+    <th width="70%">$l10n.Action, <br> $l10n.Reason </th>
   </tr>
   #foreach ($activitySet in $allActivitySets)
    #set ($activities = $activitySet.getActivityListForIssue($currentIssue))
@@ -20,22 +18,18 @@
   
     #indexedRows($velocityCount)
      <td>
-        $format.getDate($scarabR.DateFormat, $activitySet.CreatedDate)
+        #set ($user = $scarabR.getUser($activitySet.CreatedBy))
+        <a href="mailto:$user.Email">$!user.Name</a>
+        <br>$format.getDate($scarabR.DateFormat, $activitySet.CreatedDate)
      </td>
      <td>
         #foreach ($act in $activities)
           #set($desc = $act.getDescription($l10n))
           #if ($desc.length()>0) $desc<br/> #end
         #end
-     </td>
-     #set ($reason = $activitySet.getActivityReason($l10n))
-     <td>
+        #set ($reason = $activitySet.getActivityReason($l10n))
         $!scarabG.textToHTML($reason, $link, $scarabR.CurrentModule)
      </td>
-     <td nowrap="nowrap">
-         #set ($user = $scarabR.getUser($activitySet.CreatedBy))
-         <a href="mailto:$user.Email">$!user.Name</a>
-     </td>
     </tr>
    #end
   #end