Author: jorgeuriarte
Date: 2006-09-19 13:08:10-0700
New Revision: 10301
Modified:
trunk/ (props changed)
trunk/project.xml
trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java
trunk/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java
trunk/src/webapp/WEB-INF/templates/layouts/Default.vm
trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm
trunk/src/webapp/images/closing-separator.gif
trunk/src/webapp/images/closing-slider.gif
trunk/src/webapp/images/opening-separator.gif
trunk/src/webapp/images/opening-slider.gif
trunk/src/webapp/style/inst.css
Log:
Merged revisions 10290-10299 via svnmerge from
http://scarab.tigris.org/svn/scarab/branches/release/b21
........
r10290 | jorgeuriarte | 2006-09-09 01:42:25 +0200 (Sat, 09 Sep 2006) | 1 line
New screen RSSIssueList should be considered a XMIT screen (so the current MIT is not freshen every httprequest)
........
r10291 | dabbous | 2006-09-09 17:47:42 +0200 (Sat, 09 Sep 2006) | 1 line
cosmetic changes to opening/closing sliders and top search navigation bar
........
r10292 | jorgeuriarte | 2006-09-09 21:18:49 +0200 (Sat, 09 Sep 2006) | 1 line
RSS feeds are only exposed for saved queries, so 'alternate' content will only be generated in that case.
........
r10293 | jorgeuriarte | 2006-09-10 00:02:46 +0200 (Sun, 10 Sep 2006) | 1 line
Slider controls should only be visible if the dhtml option is activated.
........
r10294 | jorgeuriarte | 2006-09-13 15:42:45 +0200 (Wed, 13 Sep 2006) | 1 line
Reverted partially from r10269. ScarabNotificationManager is now the default implementation (though it delegates to ScarabNewNotificationManager)
........
r10295 | jorgeuriarte | 2006-09-16 01:45:25 +0200 (Sat, 16 Sep 2006) | 1 line
Fixed problem with descriptions in rss output of queries.
........
r10296 | jorgeuriarte | 2006-09-17 01:44:31 +0200 (Sun, 17 Sep 2006) | 1 line
When there are no columns in the search results, at least the default-text of the issue will be displayed for every row.
........
r10297 | jorgeuriarte | 2006-09-17 11:47:19 +0200 (Sun, 17 Sep 2006) | 1 line
Fixed alignment of feed links in Internet Explorer.
........
r10298 | jorgeuriarte | 2006-09-18 00:33:17 +0200 (Mon, 18 Sep 2006) | 1 line
Trying to fix SCB1953. The archiver was receiving multiple notifications for the same activity. Also, a null reason was added to the consolidated reasons list that was sent to the email template.
........
r10299 | spjames | 2006-09-18 16:00:31 +0200 (Mon, 18 Sep 2006) | 1 line
Moved Steve James from contributor to developer
........
Modified: trunk/project.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/project.xml?view=diff&rev=10301&p1=trunk/project.xml&p2=trunk/project.xml&r1=10300&r2=10301
==============================================================================
--- trunk/project.xml (original)
+++ trunk/project.xml 2006-09-19 13:08:10-0700
@@ -105,6 +105,11 @@
<id>ronvoe122</id>
<email>[email protected]</email>
</developer>
+ <developer>
+ <name>Steve James</name>
+ <id>spjames</id>
+ <email>ste@cpan.org</email>
+ </developer>
</developers>
<contributors>
@@ -129,11 +134,6 @@
<email>sseifert AT pro-vision.de</email>
</contributor>
<contributor>
- <name>Steve James</name>
- <id>ste</id>
- <email>s.james AT bigfoot.com</email>
- </contributor>
- <contributor>
<name>Mariusz Olejnik</name>
<id>marol</id>
<email>[email protected]</email>
Modified: trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java?view=diff&rev=10301&p1=trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java&p2=trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java&r1=10300&r2=10301
==============================================================================
--- trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java (original)
+++ trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java 2006-09-19 13:08:10-0700
@@ -536,7 +536,7 @@
{
NotificationStatus ns = (NotificationStatus)nots.next();
String comment = ns.getComment();
- if (!set.contains(comment))
+ if (comment != null && !set.contains(comment))
{
set.add(comment);
list.add(comment);
@@ -725,7 +725,19 @@
typeNotifications = new ArrayList();
userActivities.put(activityGroup, typeNotifications);
}
- typeNotifications.add(notification);
+
+ // We will only add this notification to the user's list if it's not
+ // already present.
+ boolean bAlreadyPresent = false;
+ for (Iterator it = typeNotifications.iterator(); it.hasNext() && !bAlreadyPresent; )
+ {
+ NotificationStatus not = (NotificationStatus)it.next();
+ bAlreadyPresent = (not.getActivityId().equals(notification.getActivityId()));
+ }
+ if (!bAlreadyPresent)
+ {
+ typeNotifications.add(notification);
+ }
}
Modified: trunk/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java?view=diff&rev=10301&p1=trunk/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java&p2=trunk/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java&r1=10300&r2=10301
==============================================================================
--- trunk/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java (original)
+++ trunk/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java 2006-09-19 13:08:10-0700
@@ -86,6 +86,7 @@
XMIT_SCREENS.put("Search.vm", null);
XMIT_SCREENS.put("IssueList.vm", null);
XMIT_SCREENS.put("RSSDataExport.vm", null);
+ XMIT_SCREENS.put("RSSIssueList.vm", null);
XMIT_SCREENS.put("ViewIssue.vm", null);
XMIT_SCREENS.put("QueryList.vm", null);
XMIT_SCREENS.put("SaveQuery.vm", null);
Modified: trunk/src/webapp/WEB-INF/templates/layouts/Default.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/layouts/Default.vm?view=diff&rev=10301&p1=trunk/src/webapp/WEB-INF/templates/layouts/Default.vm&p2=trunk/src/webapp/WEB-INF/templates/layouts/Default.vm&r1=10300&r2=10301
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/layouts/Default.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/layouts/Default.vm 2006-09-19 13:08:10-0700
@@ -396,7 +396,9 @@
cellspacing="0">
<tr>
<td>
- <img style="margin-left:0px; margin-top:50px;" src="$staticLink.setPath("/images/opening-slider.gif")" border="0"/>
+ #if($hide_bars)
+ <img style="margin-left:0px; margin-top:50px;" src="$staticLink.setPath("/images/opening-slider.gif")" border="0"/>
+ #end
</td>
</tr>
</table>
@@ -441,7 +443,7 @@
</table>
</td>
- #if ($scarabR.CurrentModule)
+ #if ($scarabR.CurrentModule && $hide_bars)
<td style="height:100%;background-repeat:repeat-y;background-image:url($staticLink.setPath("/images/closing-separator.gif"));"
#if($hide_bars) onclick="hideScarableftNav()" #end
id="closing-slider"
Modified: trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm?view=diff&rev=10301&p1=trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm&p2=trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm&r1=10300&r2=10301
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm 2006-09-19 13:08:10-0700
@@ -1,7 +1,9 @@
+#if ($scarabR.Query.QueryId)
<link rel="alternate" type="application/rss+xml" title="RSS"
href="$link.setPage('Index.vm')/action/Search/go /$scarabR.Query.QueryId/eventSubmit_doSelectquery/foo/output/feed/feedType/rss_2.0">
<link rel="alternate" type="application/rss+xml" title="ATOM"
href="$link.setPage('Index.vm')/action/Search/go /$scarabR.Query.QueryId/eventSubmit_doSelectquery/foo/output/feed/feedType/atom_0.3">
+#end
#set ($mitlist = $user.CurrentMITList)
#set ($searchType = $data.Parameters.getString('searchType', ''))
@@ -41,7 +43,7 @@
#end
</td>
#if ($scarabR.Query.QueryId)
-<td align="right">
+<td align="right" nowrap="1">
<a style="align:right;" title="$l10n.SearchRSSFeed"
href="$link.setPage('Index.vm')/action/Search/go /$scarabR.Query.QueryId/eventSubmit_doSelectquery/foo/output/feed/feedType/rss_2.0"><img align="middle" src="$staticLink.setPath('/images/icon_rss.gif')" border="0"/></a>
<a style="align:right;" title="$l10n.SearchATOMFeed"
@@ -134,7 +136,11 @@
#end
</th>
<!-- Attributes selected to be displayed -->
- #foreach ($pref in $scarabR.RModuleUserAttributes)
+ #set ($rmoduleUserAttributes = $scarabR.RModuleUserAttributes)
+ #if (!$rmoduleUserAttributes || $rmoduleUserAttributes.size() == 0)
+ <th> </th>
+ #end
+ #foreach ($pref in $rmoduleUserAttributes)
#set ($value = "----")
#if ($pref.isInternal())
#set ($value = $pref.getName($l10n))
@@ -189,6 +195,9 @@
<td>$scarabR.getIssue($record.UniqueId).RModuleIssueType.DisplayName</td>
#end
<td><a href="$link">$record.UniqueId</a></td>
+ #if (!$record.AttributeValuesAsCSV)
+ <td>$scarabR.getIssue($record.UniqueId).DefaultText</td>
+ #end
#foreach ($value in $record.AttributeValuesAsCSV)
<td>
#if ($value.length() == 0)
Modified: trunk/src/webapp/images/closing-separator.gif
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/images/closing-separator.gif?view=diff&rev=10301&p1=trunk/src/webapp/images/closing-separator.gif&p2=trunk/src/webapp/images/closing-separator.gif&r1=10300&r2=10301
==============================================================================
Binary files. No diff available.
Modified: trunk/src/webapp/images/closing-slider.gif
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/images/closing-slider.gif?view=diff&rev=10301&p1=trunk/src/webapp/images/closing-slider.gif&p2=trunk/src/webapp/images/closing-slider.gif&r1=10300&r2=10301
==============================================================================
Binary files. No diff available.
Modified: trunk/src/webapp/images/opening-separator.gif
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/images/opening-separator.gif?view=diff&rev=10301&p1=trunk/src/webapp/images/opening-separator.gif&p2=trunk/src/webapp/images/opening-separator.gif&r1=10300&r2=10301
==============================================================================
Binary files. No diff available.
Modified: trunk/src/webapp/images/opening-slider.gif
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/images/opening-slider.gif?view=diff&rev=10301&p1=trunk/src/webapp/images/opening-slider.gif&p2=trunk/src/webapp/images/opening-slider.gif&r1=10300&r2=10301
==============================================================================
Binary files. No diff available.
Modified: trunk/src/webapp/style/inst.css
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/style/inst.css?view=diff&rev=10301&p1=trunk/src/webapp/style/inst.css&p2=trunk/src/webapp/style/inst.css&r1=10300&r2=10301
==============================================================================
--- trunk/src/webapp/style/inst.css (original)
+++ trunk/src/webapp/style/inst.css 2006-09-19 13:08:10-0700
@@ -119,9 +119,11 @@
padding-left: 8px;
}
+/*
#topmodule {
margin: -4px -4px 0 -4px;
}
+*/
#topmodule td {
vertical-align: middle;
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.