Scarab commit: svn commit: r11079 - trunk/src/webapp: WEB-INF/templates/macros WEB-INF/templates/screens skins skins/images
[email protected] Fri, 9 Mar 2012 11:18:12 -0800 (PST)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: dabbous
Date: 2012-03-09 11:18:12-0800
New Revision: 11079
Added:
trunk/src/webapp/skins/images/attention_high.png (contents, props changed)
trunk/src/webapp/skins/images/attention_highest.png (contents, props changed)
trunk/src/webapp/skins/images/attention_low.png (contents, props changed)
trunk/src/webapp/skins/images/attention_medium.png (contents, props changed)
Modified:
trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm
trunk/src/webapp/skins/custom.css
trunk/src/webapp/skins/modern.css
Log:
modern skin (work in progress):
- Changed attention marker appearance for long running issues
(using last change date)
- Changed reaction times (for attention markers)
- Added attention icons to skins/image folder
note: This change only affects users who use the "modern" skin
Modified: trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm?view=diff&pathrev=11079&r1=11078&r2=11079
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm 2012-03-09 11:18:12-0800
@@ -555,23 +555,31 @@
#end
#end
-#macro (indexedRowsWithIdleHours $count $hours)
- #if ($hours <= 0) #set ($extra = "")
- #elseif($hours < 12) #set ($extra = "_attention1")
- #elseif($hours < 36) #set ($extra = "_attention2")
- #elseif($hours < 120) #set ($extra = "_attention3")
- #elseif($hours < 240) #set ($extra = "_attention4")
- #else
- #set ($extra = "_attention5")
- #end
-
- #if ($count % 2 > 0)
- <tr class="a$extra">
- #else
- <tr class="b$extra">
- #end
-#end
-
+#macro (indexedElementWithIdleHours $element $count $hours)
+ #if ($hours <= 0) #set ($extra = "")
+ #elseif($hours < 168) #set ($extra = "_attention1")
+ #elseif($hours < 336) #set ($extra = "_attention2")
+ #elseif($hours < 400) #set ($extra = "_attention3")
+ #elseif($hours < 500) #set ($extra = "_attention4")
+ #else
+ #set ($extra = "_attention5")
+ #end
+
+ #if ($count % 2 > 0)
+ <$element class="a$extra">
+ #else
+ <$element class="b$extra">
+ #end
+#end
+
+#macro (indexedRowsWithIdleHours $count $hours)
+ #indexedElementWithIdleHours("tr" $count $hours)
+#end
+
+#macro (indexedColumnsWithIdleHours $count $hours)
+ #indexedElementWithIdleHours("td" $count $hours)
+#end
+
#macro (indexedRowsWithStyle $count $style)
#if ($count % 2 > 0)
<tr class="a" style=$style">
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&pathrev=11079&r1=11078&r2=11079
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm 2012-03-09 11:18:12-0800
@@ -173,16 +173,19 @@
#foreach ($record in $qrIterator)
#set ($issue = $scarabR.getIssue($record.UniqueId))
$qrIterator.initializeLink($link)
+ #indexedRows($velocityCount)
+ <td>
+ <input type="hidden" name="all_issue_ids" value="$record.UniqueId" />
+ <input type="checkbox" name="issue_ids" value="$record.UniqueId" />
+ </td>
+
#if ($issue.isOnHold() || $issue.isSealed())
- #indexedRows($velocityCount)
+ <td>
#else
- #indexedRowsWithIdleHours($velocityCount $issue.HoursIdle)
+ #indexedColumnsWithIdleHours($velocityCount $issue.HoursIdle)
#end
- <td>
- <input type="hidden" name="all_issue_ids" value="$record.UniqueId" />
- <input type="checkbox" name="issue_ids" value="$record.UniqueId" />
- </td>
- <td><a href="$link">$record.UniqueId</a></td>
+
+ <a href="$link">$record.UniqueId</a></td>
#if (!$record.AttributeValuesAsCSV)
<td>$issue.DefaultText</td>
#end
Modified: trunk/src/webapp/skins/custom.css
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/skins/custom.css?view=diff&pathrev=11079&r1=11078&r2=11079
==============================================================================
--- trunk/src/webapp/skins/custom.css (original)
+++ trunk/src/webapp/skins/custom.css 2012-03-09 11:18:12-0800
@@ -121,21 +121,22 @@
color:red;
}
+/*
// colrized issuelists
// the schema is:
//
-//
+*/
-.a_attention1 td {background: #fee378;}
-.b_attention1 td {background: #fdebad;}
-.a_attention2 td {background: #ffb573;}
-.b_attention2 td {background: #fec08e;}
-.a_attention3 td {background: #ffb573;}
-.b_attention3 td {background: #fec08e;}
-.a_attention4 td {background: #ffb573;}
-.b_attention4 td {background: #fec08e;}
-.a_attention5 td {background: #fa686b;}
-.b_attention5 td {background: #fc8689;}
+td.a_attention1 {vertical-align:middle; background-color:#dddddd;}
+td.b_attention1 {vertical-align:middle; background-color:#efefef;}
+td.a_attention2 {vertical-align:middle; background: url(images/attention_low.png) no-repeat scroll 95% 52% transparent; background-color:#dddddd;}
+td.b_attention2 {vertical-align:middle; background: url(images/attention_low.png) no-repeat scroll 95% 52% transparent; background-color:#efefef;}
+td.a_attention3 {vertical-align:middle; background: url(images/attention_medium.png) no-repeat scroll 95% 52% transparent; background-color:#dddddd;}
+td.b_attention3 {vertical-align:middle; background: url(images/attention_medium.png) no-repeat scroll 95% 52% transparent; background-color:#efefef;}
+td.a_attention4 {vertical-align:middle; background: url(images/attention_high.png) no-repeat scroll 95% 52% transparent; background-color:#dddddd;}
+td.b_attention4 {vertical-align:middle; background: url(images/attention_high.png) no-repeat scroll 95% 52% transparent; background-color:#efefef;}
+td.a_attention5 {vertical-align:middle; background: url(images/attention_highest.png) no-repeat scroll 95% 52% transparent; background-color:#dddddd;}
+td.b_attention5 {vertical-align:middle; background: url(images/attention_highest.png) no-repeat scroll 95% 52% transparent; background-color:#efefef;}
// experimental stuff will be removed later.
Added: trunk/src/webapp/skins/images/attention_high.png
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/skins/images/attention_high.png?view=markup&pathrev=11079
==============================================================================
Binary file. No diff available.
Added: trunk/src/webapp/skins/images/attention_highest.png
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/skins/images/attention_highest.png?view=markup&pathrev=11079
==============================================================================
Binary file. No diff available.
Added: trunk/src/webapp/skins/images/attention_low.png
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/skins/images/attention_low.png?view=markup&pathrev=11079
==============================================================================
Binary file. No diff available.
Added: trunk/src/webapp/skins/images/attention_medium.png
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/skins/images/attention_medium.png?view=markup&pathrev=11079
==============================================================================
Binary file. No diff available.
Modified: trunk/src/webapp/skins/modern.css
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/skins/modern.css?view=diff&pathrev=11079&r1=11078&r2=11079
==============================================================================
--- trunk/src/webapp/skins/modern.css (original)
+++ trunk/src/webapp/skins/modern.css 2012-03-09 11:18:12-0800
@@ -469,11 +469,11 @@
}
.a td {
- background: #ddd;
+ background-color: #ddd;
}
.b td {
- background: #efefef;
+ background-color: #efefef;
}
table,th,td {
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2933646