Scarab commit: svn commit: r10729 - trunk/src/webapp: WEB-INF/templates/viewIssue images

Author: dabbous
Date: 2009-05-25 06:08:41-0700
New Revision: 10729

Added:
   trunk/src/webapp/images/icon_rightarrow_long.jpg   (contents, props changed)
Modified:
   trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm

Log:
SCB2853: Added a new arrow icon and cleaned up the ViewIssueTab5.vm

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&pathrev=10729&r1=10728&r2=10729
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm	2009-05-25 06:08:41-0700
@@ -4,67 +4,73 @@
 #end
 
 #if (!$allActivitySets.isEmpty())
-<h3 onClick=smartToggleVisibility('history')><img name="history.state" src="$staticLink.setPath($iconCollapse)"/>$l10n.ChangeHistory</h3>
-<div id="history">
+  <h3 onClick=smartToggleVisibility('history')><img name="history.state" src="$staticLink.setPath($iconCollapse)"/>$l10n.ChangeHistory</h3>
+  <div id="history">
 
-  #foreach ($activitySet in $allActivitySets)
-    <h4>
+    #foreach ($activitySet in $allActivitySets)
       #set ($activitySetUser = $scarabR.getUser($activitySet.CreatedBy))
-      #userTimeStamp( $activitySetUser $activitySet.CreatedDate)
-    </h4>
-    #set ($activities = $activitySet.getActivityListForHistory($currentIssue))
-    <div class="axial">
-    <table width="100%">
-    #foreach ($act in $activities)
-        #if($currentIssue.isAttributeVisible($act.attribute, $user))
-          #set ($newValue = $act.getNewValue($l10n))
-          #set ($oldValue = $act.getOldValue($l10n))
-          <tr>
-            <th width="14%">$act.getDisplayName($l10n)</th>
-            #if( $oldValue.length()>0 )
-              <td width="43%">$!scarabG.textToHTML($newValue, $link, $scarabR.CurrentModule)</td>
-              <td width="43%">$!scarabG.textToHTML($oldValue, $link, $scarabR.CurrentModule)</td>
-            #else
-              <td colspan="2" width="86%">$!scarabG.textToHTML($newValue, $link, $scarabR.CurrentModule)</td>
-            #end
-        #else
-          $l10n.RestrictedActivityDescription<br/>
-        #end
-      </tr>
-    #end
+      #set ($activities = $activitySet.getActivityListForHistory($currentIssue))
+      <h4>
+          #userTimeStamp( $activitySetUser $activitySet.CreatedDate)
+      </h4>
+      <div class="axial">
+        <table style="white-space:nowrap;">
+          #foreach ($act in $activities)
+            <tr>
+              #set ($newValue = "")
+              #set ($oldValue = "")
+              #if($currentIssue.isAttributeVisible($act.attribute, $user))
+                #set ($newValue = $act.getNewValue($l10n).trim())
+                #set ($oldValue = $act.getOldValue($l10n).trim())
+                <th>$act.getDisplayName($l10n)</th>
+                #if( $oldValue.length()>0 )
+                  <td>$!scarabG.textToHTML($oldValue, $link, $scarabR.CurrentModule)</td>
+                  <td style="vertical-align:middle;" ><img name="change to" src="$staticLink.setPath('/images/icon_rightarrow_long.jpg')"/></td>
+                  <td>$!scarabG.textToHTML($newValue, $link, $scarabR.CurrentModule)</td>
+                #else
+                  <td colspan="3" width="*" style="white-space:normal;">$!scarabG.textToHTML($newValue, $link, $scarabR.CurrentModule)</td>
+                #end
+                <td width="*"> &nbsp; </td>
+              #else
+                <td colspan="5">$l10n.RestrictedActivityDescription</td>
+              #end
+            </tr>
+          #end
 
-    #set ($reason = $activitySet.getCommentForHistory($currentIssue))
-    #if($reason.length()>0)
-      <tr>
-      <td colspan="3" width="100%">$!scarabG.textToHTML($reason, $link, $scarabR.CurrentModule)</td>
-      </tr>
+          #set ($reason = $activitySet.getCommentForHistory($currentIssue))
+          #if($reason.length()>0)
+            <tr>
+              <th>$l10n.Comment</th>
+              <td colspan="3" width="*" style="white-space:normal;">$!scarabG.textToHTML($reason, $link, $scarabR.CurrentModule)</td>
+              <td width="*"> &nbsp; </td>
+            </tr>
+          #end
+        </table>
+      </div>
     #end
-    </table>
-    </div>
-  #end
 
-#if ($currentIssue.isHistoryLong())
-   <div class="functnbar3">
-  #if ($fullHistory.equals("true"))
-    #set ($historyLink = $link.setPage("$template").addPathInfo("id", $currentIssueId).addPathInfo("fullhistory", "false").addPathInfo("tab", "5"))
-    #foreach ($issueId in $data.Parameters.getStrings("issue_ids"))
-      #set ($historyLink = $historyLink.addPathInfo("issue_ids", $issueId))
-    #end
-    #if ($resultsPerPage)
-      #set ($historyLink = $historyLink.addPathInfo("resultsPerPage", $resultsPerPage))
-    #end
-    <p><a href="$historyLink">$l10n.HideCompleteHistory</a></p>
-  #else
-    #set ($historyLink = $link.setPage("$template").addPathInfo("id", $currentIssueId).addPathInfo("fullhistory", "true").addPathInfo("tab", "5"))
-    #foreach ($issueId in $data.Parameters.getStrings("issue_ids"))
-      #set ($historyLink = $historyLink.addPathInfo("issue_ids", $issueId))
-    #end
-    #if ($resultsPerPage)
-      #set ($historyLink = $historyLink.addPathInfo("resultsPerPage", $resultsPerPage))
+    #if ($currentIssue.isHistoryLong())
+      <div class="functnbar3">
+        #if ($fullHistory.equals("true"))
+          #set ($historyLink = $link.setPage("$template").addPathInfo("id", $currentIssueId).addPathInfo("fullhistory", "false").addPathInfo("tab", "5"))
+          #foreach ($issueId in $data.Parameters.getStrings("issue_ids"))
+              #set ($historyLink = $historyLink.addPathInfo("issue_ids", $issueId))
+          #end
+          #if ($resultsPerPage)
+              #set ($historyLink = $historyLink.addPathInfo("resultsPerPage", $resultsPerPage))
+          #end
+          <p><a href="$historyLink">$l10n.HideCompleteHistory</a></p>
+        #else
+          #set ($historyLink = $link.setPage("$template").addPathInfo("id", $currentIssueId).addPathInfo("fullhistory", "true").addPathInfo("tab", "5"))
+          #foreach ($issueId in $data.Parameters.getStrings("issue_ids"))
+            #set ($historyLink = $historyLink.addPathInfo("issue_ids", $issueId))
+          #end
+          #if ($resultsPerPage)
+            #set ($historyLink = $historyLink.addPathInfo("resultsPerPage", $resultsPerPage))
+          #end
+          <p><a href="$historyLink">$l10n.ShowCompleteHistory</a></p>
+        #end
+      </div>
     #end
-    <p><a href="$historyLink">$l10n.ShowCompleteHistory</a></p>
-  #end
   </div>
 #end
-</div>
-#end

Added: trunk/src/webapp/images/icon_rightarrow_long.jpg
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/images/icon_rightarrow_long.jpg?view=markup&pathrev=10729
==============================================================================
Binary file. No diff available.

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