Scarab commit: svn commit: r11009 - trunk: . src/webapp/WEB-INF/templates/viewIssue src/webapp/skins tomcat www/repository/radeox/jars www/repository/radeox/src www/repository/torque/plugins
[email protected] Tue, 4 May 2010 04:29:32 -0700 (PDT)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: dabbous
Date: 2010-05-04 04:29:32-0700
New Revision: 11009
Added:
trunk/www/repository/radeox/jars/radeox-1.1-b2.jar (contents, props changed)
trunk/www/repository/radeox/jars/radeox-api-1.1-b2.jar (contents, props changed)
trunk/www/repository/radeox/src/radeox-1.1-BETA-2-src.tar.gz (contents, props changed)
trunk/www/repository/torque/plugins/maven-torque-plugin-3.3-RC2.jar (contents, props changed)
Removed:
trunk/www/repository/radeox/jars/radeox-1.1-b1.jar
trunk/www/repository/radeox/jars/radeox-api-1.1-b1.jar
trunk/www/repository/radeox/src/radeox-1.1-BETA-1-src.tar.gz
Modified:
trunk/project.xml
trunk/scarab_properties.xml
trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm
trunk/src/webapp/skins/classic.css
trunk/tomcat/ (props changed)
Log:
Well, IE6 seems to have some problems with long line wrapping. It should work with all IE6 related fixes. But for some reason it breaks as soon as a white-space:pre-wrap is added to the css declaraion. The wrap itself works, but it does not free the wrapped space, hence the page width remains as if nowrap was choosen.
I fixed it by using a workaround for IE6 only: The comments section has now a width restriction (via css, can be customized in classic.css or custom.css)
While i was at it i added some divs for better styling.
There was a distribution error in the radeox-jars. I also recompiled them and fixed a minor inconvenience directly related to this issue. As radeox seems to be non existing i again added the radeox sources (1.1-beta-2 now) as reference. and to be honest, i would rename it to radeox-1.1 (release). I do not see any more need for changes there...
Modified: trunk/project.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/project.xml?view=diff&pathrev=11009&r1=11008&r2=11009
==============================================================================
--- trunk/project.xml (original)
+++ trunk/project.xml 2010-05-04 04:29:32-0700
@@ -899,7 +899,7 @@
<dependency>
<groupId>radeox</groupId>
<artifactId>radeox</artifactId>
- <version>1.1-b1</version>
+ <version>1.1-b2</version>
<type>jar</type>
<properties>
<war.bundle>true</war.bundle>
@@ -908,7 +908,7 @@
<dependency>
<groupId>radeox</groupId>
<artifactId>radeox-api</artifactId>
- <version>1.1-b1</version>
+ <version>1.1-b2</version>
<type>jar</type>
<properties>
<war.bundle>true</war.bundle>
Modified: trunk/scarab_properties.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/scarab_properties.xml?view=diff&pathrev=11009&r1=11008&r2=11009
==============================================================================
--- trunk/scarab_properties.xml (original)
+++ trunk/scarab_properties.xml 2010-05-04 04:29:32-0700
@@ -1048,7 +1048,65 @@
the unit is minutes. The default setting is 1440 (1 day)
</details>
</property>
-
+
+ <property>
+ <name>scarab.common.status.activity.reminder.exclude.states</name>
+ <default>onhold,closed</default>
+ <type>Runtime</type>
+ <customization modification="optional">advanced</customization>
+ <file/>
+ <details>
+ Whenever an issue hangs during the course of its processing, a reminder
+ notification shall be sent out to the participants. This property
+ defines a comma separated list of $state values for which the reminder
+ shall NOT be issued. By default we exclude "onhold" and "closed" for
+ following reasons: "closed" issues are meant to keep idle forever.
+ So there is no need to remind anybody of that!
+ "onhold" issues are handled elsewhere and again there is no reason to
+ reind anybody either.
+ </details>
+ </property>
+
+ <property>
+ <name>scarab.common.status.activity.reminder.include.states</name>
+ <default></default>
+ <type>Runtime</type>
+ <customization modification="optional">advanced</customization>
+ <file/>
+ <details>
+ Whenever an issue hangs during the course of its processing, a reminder
+ notification shall be sent out to the participants. This property
+ defines a comma separated list of $state values for which the reminder
+ MUST be performed. By default this property is empty. Hence we process
+ issues in ANY state except those mentioned above in
+
+ scarab.common.status.activity.reminder.exclude.states.
+
+ If you want to explicitly define the states for which a reminder must be sent,
+ you can create a comma separated list of state values here.
+
+ IMPORTANT:
+ - If include.states AND exclude.states both are empty, then no reminder
+ is sent out at all.
+ - If only one of the two properties is set then the according inclusion/exclusion
+ takes place.
+ - If both properties are set, then the exclusion property is ignored!
+ </details>
+ </property>
+
+ <property>
+ <name>scarab.common.status.activity.reminder.period</name>
+ <default>1440</default>
+ <type>Runtime</type>
+ <customization modification="optional">advanced</customization>
+ <file/>
+ <details>
+ This attribute tells the NotificationManager how long to wait
+ utnil it sends a reminder notification for issues in any state found in the
+ includes.state list or not found in the excludes.state list (see above).
+ The default setting is 1440 (1 day)
+ </details>
+ </property>
<property>
<name>scarab.common.status.sealed.modifyPermission</name>
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&pathrev=11009&r1=11008&r2=11009
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm 2010-05-04 04:29:32-0700
@@ -41,16 +41,24 @@
<h4>$l10n.Comments</h4>
#end
+ #set ($comment_counter=0)
#foreach ($comment in $comments)
- #set ($commentUser = $scarabR.getUser($comment.CreatedBy))
- <h4>
- #userTimeStamp( $commentUser $comment.CreatedDate)
- </h4>
- #if ($isEditComments)
- #textAreaLarge( "edit_comment_$comment.AttachmentId" $comment.Data)
- #else
- $scarabG.textToHTML($l10n.getIgnoreMissingResource($comment.Data), $link, $scarabR.CurrentModule)
- #end
+ #set ($comment_counter = $comment_counter + 1)
+ <div class="scb_comment">
+ #set ($commentUser = $scarabR.getUser($comment.CreatedBy))
+ <h4>
+ <span class="counter">$comment_counter: </span> #userTimeStamp( $commentUser $comment.CreatedDate)
+ </h4>
+
+ <div class="content">
+ #if ($isEditComments)
+ #textAreaLarge( "edit_comment_$comment.AttachmentId" $comment.Data)
+ #else
+ $scarabG.textToHTML($l10n.getIgnoreMissingResource($comment.Data), $link, $scarabR.CurrentModule)
+ #end
+ </div>
+
+ </div>
#end
#if ($isEditComments)
Modified: trunk/src/webapp/skins/classic.css
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/skins/classic.css?view=diff&pathrev=11009&r1=11008&r2=11009
==============================================================================
--- trunk/src/webapp/skins/classic.css (original)
+++ trunk/src/webapp/skins/classic.css 2010-05-04 04:29:32-0700
@@ -91,7 +91,7 @@
#scb_banner table {
border-style:none;
- margin:8px;
+ margin:8px 0px;
padding:0px;
width:100%;
}
@@ -326,6 +326,42 @@
margin-left:15px;
}
+/* ============================================================== */
+/* Issue comments */
+/* ============================================================== */
+
+/*
+ provide a cross browser compatible pre which uses auto
+ word wrap for long lines:
+*/
+.comment {
+ white-space: pre-wrap; /* css-3 */
+ white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+ white-space: -pre-wrap; /* Opera 4-6 */
+ white-space: -o-pre-wrap; /* Opera 7 */
+ word-wrap: break-word; /* Internet Explorer 5.5+ */
+ _white-space:pre;
+}
+
+.scb_comment {
+ _margin-top:20px;
+}
+
+.scb_comment .content {
+ margin-top:5px;
+ margin-left:35px;
+}
+
+.scb_comment .content .comment {
+ margin-top:0px;
+ background-color:#f8f8f8;
+ margin:0px;
+ padding:10px;
+}
+
+.scb_comment .counter {
+ margin-right:10px;
+}
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* ==== From here on downwards the refactoring must still take place. ==== */
@@ -1272,6 +1308,7 @@
border-bottom-style: none;
margin-left: 2px;
margin-right: 2px;
+ _width:640px; // for ie6 only (long-line wrapping broken)
}
.scarab-canvas div h4 {
@@ -1326,18 +1363,7 @@
color: #003163
}
-/*
- provide a cross browser compatible pre which uses auto
- word wrap for long lines:
-*/
-pre {
- white-space: -moz-pre-wrap;
- white-space: -pre-wrap;
- white-space: -o-pre-wrap;
- white-space: pre-wrap;
- word-wrap: break-word;
- display: inline;
-}
+
/*
Treeview related style definitions
Removed: trunk/www/repository/radeox/jars/radeox-1.1-b1.jar
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/radeox/jars/radeox-1.1-b1.jar?view=markup&pathrev=11008
Added: trunk/www/repository/radeox/jars/radeox-1.1-b2.jar
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/radeox/jars/radeox-1.1-b2.jar?view=markup&pathrev=11009
==============================================================================
Binary file. No diff available.
Removed: trunk/www/repository/radeox/jars/radeox-api-1.1-b1.jar
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/radeox/jars/radeox-api-1.1-b1.jar?view=markup&pathrev=11008
Added: trunk/www/repository/radeox/jars/radeox-api-1.1-b2.jar
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/radeox/jars/radeox-api-1.1-b2.jar?view=markup&pathrev=11009
==============================================================================
Binary file. No diff available.
Removed: trunk/www/repository/radeox/src/radeox-1.1-BETA-1-src.tar.gz
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/radeox/src/radeox-1.1-BETA-1-src.tar.gz?view=markup&pathrev=11008
Added: trunk/www/repository/radeox/src/radeox-1.1-BETA-2-src.tar.gz
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/radeox/src/radeox-1.1-BETA-2-src.tar.gz?view=markup&pathrev=11009
==============================================================================
Binary file. No diff available.
Added: trunk/www/repository/torque/plugins/maven-torque-plugin-3.3-RC2.jar
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/torque/plugins/maven-torque-plugin-3.3-RC2.jar?view=markup&pathrev=11009
==============================================================================
Binary file. No diff available.
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2602616