Scarab commit: svn commit: r10592 - trunk/src: java/org/tigris/scarab/feeds java/org/tigris/scarab/om java/org/tigris/scarab/tools webapp/WEB-INF/templates/screens/notifications webapp/WEB-INF/templates/viewIssue webapp/style
[email protected] 25 May 2008 21:20:25 -0000
Newsgroups
gmane.comp.java.scarab.cvs
Message-ID
<[email protected] >
Author: ronvoe122
Date: 2008-05-25 14:20:25-0700
New Revision: 10592
Modified:
trunk/src/java/org/tigris/scarab/feeds/IssueFeed.java
trunk/src/java/org/tigris/scarab/om/Activity.java
trunk/src/java/org/tigris/scarab/om/ActivitySet.java
trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java
trunk/src/webapp/WEB-INF/templates/screens/notifications/NotificationList.vm
trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm
trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm
trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm
trunk/src/webapp/style/tigris.css
Log:
SCB1454:
- Saved some screen-space:
- The whole screen-with is now used for displaying the activity-descriptions in the History-tab.
- Removed duplicate information from History-tab (display only one of comment or reason, if both are identical).
- Unified appearance of Comments-tab and History-tab.
- Unified display of user/timestamp-information.
Modified: trunk/src/java/org/tigris/scarab/feeds/IssueFeed.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/feeds/IssueFeed.java?view=diff&rev=10592&p1=trunk/src/java/org/tigris/scarab/feeds/IssueFeed.java&p2=trunk/src/java/org/tigris/scarab/feeds/IssueFeed.java&r1=10591&r2=10592
==============================================================================
--- trunk/src/java/org/tigris/scarab/feeds/IssueFeed.java (original)
+++ trunk/src/java/org/tigris/scarab/feeds/IssueFeed.java 2008-05-25 14:20:25-0700
@@ -74,7 +74,7 @@
StringBuffer desc = new StringBuffer();
String activityDesc=activity.getDescription(this.l10nTool);
desc.append("<b>Description:</b>" + activityDesc +"<br/>");
- desc.append("<b>Reason:</b>" + activitySet.getActivityReason(l10nTool) +"<br/>");
+ desc.append("<b>Reason:</b>" + activitySet.getActivityReason() +"<br/>");
entry.setAuthor(activitySet.getCreator().getName());
description.setValue(desc.toString());
Modified: trunk/src/java/org/tigris/scarab/om/Activity.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/Activity.java?view=diff&rev=10592&p1=trunk/src/java/org/tigris/scarab/om/Activity.java&p2=trunk/src/java/org/tigris/scarab/om/Activity.java&r1=10591&r2=10592
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/Activity.java (original)
+++ trunk/src/java/org/tigris/scarab/om/Activity.java 2008-05-25 14:20:25-0700
@@ -216,7 +216,7 @@
else if (ActivityType.COMMENT_ADDED.equals(type))
{
desc = this.getCommentAddedDescription(this.getAttachment().getData(), l10nTool);
- }
+ }
else if (ActivityType.COMMENT_CHANGED.equals(type))
{
desc = this.getCommentChangedDescription(l10nTool);
@@ -299,7 +299,7 @@
private String getCommentAddedDescription(String comment, ScarabLocalizationTool l10nTool)
{
- return L10NKeySet.AddedCommentToIssue.getMessage(l10nTool) + ": '" + comment + "'";
+ return L10NKeySet.AddedCommentToIssue.getMessage(l10nTool) + "\n" + comment;
}
private String getCommentChangedDescription(ScarabLocalizationTool l10nTool)
Modified: trunk/src/java/org/tigris/scarab/om/ActivitySet.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/ActivitySet.java?view=diff&rev=10592&p1=trunk/src/java/org/tigris/scarab/om/ActivitySet.java&p2=trunk/src/java/org/tigris/scarab/om/ActivitySet.java&r1=10591&r2=10592
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/ActivitySet.java (original)
+++ trunk/src/java/org/tigris/scarab/om/ActivitySet.java 2008-05-25 14:20:25-0700
@@ -47,6 +47,7 @@
*/
import java.util.List;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.HashSet;
import java.util.Set;
@@ -127,6 +128,21 @@
return result;
}
+ public List getActivitiesExceptActivitySetDescription(Issue issue)
+ throws TorqueException
+ {
+ List activities = new ArrayList();
+ for(Iterator i = getActivityListForIssue(issue).iterator();i.hasNext();)
+ {
+ Activity activity = (Activity)i.next();
+ if(getAttachmentId()==null || !getAttachmentId().equals(activity.getAttachmentId()))
+ {
+ activities.add(activity);
+ }
+ }
+ return activities;
+ }
+
/**
* Returns a list of Activity objects associated with this ActivitySet
* And this issue.
@@ -155,27 +171,10 @@
return getScarabUser();
}
- public String getActivityReason(ScarabLocalizationTool l10n) throws TorqueException
+ public String getActivityReason() throws TorqueException
{
- String reason = null;
Attachment attachment = this.getAttachment();
- if (attachment != null) {
- String data = attachment.getData();
- // Reason is the attachment entered for this transaction
- if (data != null && data.length() > 0) {
- reason = data;
- } else {
- reason = l10n.get(L10NKeySet.NotProvided);
- }
- }
- // No reasons given for initial issue entry
- else if (this.getTypeId().equals(
- ActivitySetTypePeer.CREATE_ISSUE__PK)) {
- reason = l10n.get(L10NKeySet.InitialEntry);
- } else {
- reason = l10n.get(L10NKeySet.NotProvided);
- }
- return reason;
+ return attachment!=null ? attachment.getData() : "";
}
/**
Modified: trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java?view=diff&rev=10592&p1=trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java&p2=trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java&r1=10591&r2=10592
==============================================================================
--- trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java (original)
+++ trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java 2008-05-25 14:20:25-0700
@@ -679,11 +679,6 @@
return result;
}
- public SkipFiltering getCommentText(String text, ScarabLink link, Module currentModule)
- {
- return this.textToHTML(text, link, currentModule);
- }
-
/**
* <p>Converts a text string to HTML by:</p>
* <ul>
Modified: trunk/src/webapp/WEB-INF/templates/screens/notifications/NotificationList.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/notifications/NotificationList.vm?view=diff&rev=10592&p1=trunk/src/webapp/WEB-INF/templates/screens/notifications/NotificationList.vm&p2=trunk/src/webapp/WEB-INF/templates/screens/notifications/NotificationList.vm&r1=10591&r2=10592
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/notifications/NotificationList.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/notifications/NotificationList.vm 2008-05-25 14:20:25-0700
@@ -57,7 +57,7 @@
#end
#indexedRows($velocityCount)
<th colspan="2">$l10n.ReasonForChange</th>
- <td colspan="2">$set.getActivityReason($l10n)</td>
+ <td colspan="2">$set.getActivityReason()</td>
</tr>
</table>
</li>
Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm?view=diff&rev=10592&p1=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm&p2=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm&r1=10591&r2=10592
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm 2008-05-25 14:20:25-0700
@@ -38,15 +38,18 @@
<div class="functnbar3">
<input type="submit" value="$l10n.Save" name="eventSubmit_doSubmitcomment" />
</div>
+ <h4>$l10n.Comments</h4>
#end
#foreach ($comment in $comments)
- #set ($commentUser = $scarabR.getUser($comment.CreatedBy))
- <h4>$format.getDate($scarabR.DateFormat, $comment.CreatedDate) | Added by: <a href="mailto:$commentUser.Email">$!commentUser.Name</a></h4>
+ #set ($commentUser = $scarabR.getUser($comment.CreatedBy))
+ <div class="historyEntryHeader">
+ #userTimeStamp( $commentUser $comment.CreatedDate)
+ </div>
#if ($isEditComments)
- <p>#textAreaLarge( "edit_comment_$comment.AttachmentId" $comment.Data)</p>
+ #textAreaLarge( "edit_comment_$comment.AttachmentId" $comment.Data)
#else
- <p><pre>$scarabG.getCommentText($comment.Data, $link, $scarabR.CurrentModule)</pre></p>
+ $scarabG.textToHTML($comment.Data, $link, $scarabR.CurrentModule)
#end
#end
Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm?view=diff&rev=10592&p1=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm&p2=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm&r1=10591&r2=10592
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Att.vm 2008-05-25 14:20:25-0700
@@ -19,7 +19,6 @@
<th>$l10n.Description</th>
<th>$l10n.Type</th>
<th>$l10n.CreatedBy</th>
- <th>$l10n.CreationDate</th>
<th>$l10n.AttachmentSize</th>
</tr>
#foreach ($file in $attachments)
@@ -42,8 +41,9 @@
<td>$file.Name</td>
<td>$file.MimeType</td>
#set ($createdUser = $file.ScarabUserRelatedByCreatedBy)
- <td><a href="mailTo:$createdUser.Email">$!createdUser.Name</a></td>
- <td>$format.getDate($scarabR.DateFormat, $file.CreatedDate)</td>
+ <td>
+ #userTimeStamp( $createdUser $file.CreatedDate)
+ </td>
<td>
#if ($file.Size.toString().equals("-1"))
-
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=10592&p1=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm&p2=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm&r1=10591&r2=10592
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab5.vm 2008-05-25 14:20:25-0700
@@ -7,33 +7,21 @@
<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" width="100%">
- <tr>
- <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))
- #if (!$activities.isEmpty())
-
- #indexedRows($velocityCount)
- <td>
+ #set ($activities = $activitySet.getActivitiesExceptActivitySetDescription($currentIssue))
+ #if (!$activities.isEmpty())
+ <div class="historyEntryHeader">
#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
- #set ($reason = $activitySet.getActivityReason($l10n))
- $!scarabG.textToHTML($reason, $link, $scarabR.CurrentModule)
- </td>
- </tr>
- #end
+ #userTimeStamp( $user $activitySet.CreatedDate)
+ </div>
+ #foreach ($act in $activities)
+ #set($desc = $act.getDescription($l10n))
+ $!scarabG.textToHTML($desc, $link, $scarabR.CurrentModule)
+ #end
+ #set ($reason = $activitySet.getActivityReason())
+ $!scarabG.textToHTML($reason, $link, $scarabR.CurrentModule)
+ #end
#end
- </table>
#if ($currentIssue.isHistoryLong())
<div class="functnbar3">
Modified: trunk/src/webapp/style/tigris.css
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/style/tigris.css?view=diff&rev=10592&p1=trunk/src/webapp/style/tigris.css&p2=trunk/src/webapp/style/tigris.css&r1=10591&r2=10592
==============================================================================
--- trunk/src/webapp/style/tigris.css (original)
+++ trunk/src/webapp/style/tigris.css 2008-05-25 14:20:25-0700
@@ -122,6 +122,13 @@
background-color: #ccc;
}
+.historyEntryHeader {
+ padding: 4px;
+ margin-right: 2px;
+ margin-left: 2px;
+ background-color: #ddd;
+}
+
#main {
border-top: 1px solid #999;
}
@@ -761,8 +768,8 @@
padding-left: 20px;
min-height: 15px;
}
-
-.blockingmark, .blockedmark, .notblockedmark
+
+.blockingmark, .blockedmark, .notblockedmark
{
/*
padding-left: 20px;