Scarab commit: svn commit: r11265 - branches/scarab_11079_legacy_with_ant_maven1/src/webapp: WEB-INF/templates/email/notification WEB-INF/templates/macros WEB-INF/templates/screens skins
[email protected] Wed, 23 May 2012 14:01:30 -0700 (PDT)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: dabbous
Date: 2012-05-23 14:01:29-0700
New Revision: 11265
Modified:
branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm
branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/screens/IssueList.vm
branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/custom.css
branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/modern.css
Log:
some style fixes
Modified: branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm?view=diff&pathrev=11265&r1=11264&r2=11265
==============================================================================
--- branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm (original)
+++ branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm 2012-05-23 14:01:29-0700
@@ -48,13 +48,13 @@
${cr}-------------------------------------------------------------------------------
#end
#set ($currentDisplayName = $displayName)
-#set ($newValue = $not.Activity.getNewValue($l10n) )
-#set ($oldValue = $not.Activity.getOldValue($l10n) )
-#set ($fromValue = "") #if ($oldValue.length() > 0 && $oldValue.length()+$newValue.length() < 70) #set($fromValue = $oldValue) #end
-#set ($toValue = "") #if ($newValue.length() > 0) #set ($toValue = $newValue) #end
-#set ($transit = "") #if ($fromValue != "" && $toValue != "") #set ($transit = "-->") #end
-#set ($comment = "") #if ($fromValue != "" && $toValue == "") #set ($comment = $l10n.Deleted) #elseif ($fromValue == "" && $toValue != "") #set ($comment = $l10n.New ) #end
- - $format.getDate($l10n.ShortTimePattern, $not.CreationDate) : $fromValue $transit $toValue #if ($comment != "") ($comment) #end
+#set ($newValue = $not.Activity.getNewValue($l10n).toString())
+#set ($oldValue = $not.Activity.getOldValue($l10n).toString())
+#set ($fromValue = "")#if($oldValue.length() > 0 && $oldValue.length()+$newValue.length() < 70)#set($fromValue = $oldValue)#end
+#set ($toValue = "")#if($newValue.length() > 0)#set ($toValue = $newValue)#end
+#set ($transit = "")#if($fromValue != "" && $toValue != "")#set ($transit = " --> ")#end
+#set ($comment = "")#if($fromValue != "" && $toValue == "")#set ($comment = $l10n.Deleted)#elseif ($fromValue == "" && $toValue != "")#set ($comment = $l10n.New )#end
+ - $format.getDate($l10n.ShortTimePattern, $not.CreationDate) : $fromValue$transit$toValue #if ($comment != "")($comment)#end
#end
#end
Modified: branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm?view=diff&pathrev=11265&r1=11264&r2=11265
==============================================================================
--- branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm (original)
+++ branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm 2012-05-23 14:01:29-0700
@@ -2,13 +2,7 @@
#set ($pseudoHTML = $scarabG.getTurbineConfiguration().getString("system.mail.pseudohtml").toLowerCase().equals("true"))
#if($pseudoHTML && $type=='b')*#end#if($pseudoHTML && $type=='u')_#end#if($pseudoHTML && $type=='i')/#end#if(!$pseudoHTML && $type=='s')****#end
#end
-
-##
-## Call example: :#getProperty("scarab.site.logo")
-##
-#macro (getProperty $key)$scarabG.getTurbineConfiguration().getString($key)#end
-
-
+
#macro (CanMakeTransitionForOption $fromValue $option $issue $multiple)
#set ($selected = false)
#set ($canMakeTransition = true)
@@ -98,7 +92,7 @@
#if ($canMakeTransition.trim()=="true")
#if ($templateInfo || (!$required && $newValues && $newValues.toString() == ''))
<input id="$cssId" type="hidden" name="$attrInput.get($optionFieldName).Key" value="$newValues"/>
- #if ($newValues && $newValues > 0)
+ #if ($newValues && $newValues != "" && $newValues > 0)
#set ($checked = "checked")
#end
#set ($oc = "javascript:this.form.${attrInput.get($optionFieldName).Key}.value=(this.checked)?$option.OptionId:''")
@@ -554,32 +548,39 @@
<tr class="b">
#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 (indexedColumnsWithIdleHours $count $hours)
+ #if ($hours <= 0) #set ($extra = "")
+ #elseif($hours < 120) #set ($extra = "_attention1")
+ #elseif($hours < 240) #set ($extra = "_attention2")
+ #elseif($hours < 480) #set ($extra = "_attention3")
+ #else
+ #set ($extra = "_attention5")
+ #end
+
+ #if ($count % 2 > 0)
+ <td class="a$extra">
+ #else
+ <td class="b$extra">
+ #end
+#end
+
+#macro (indexedRowsWithIdleHours $count $hours)
+ #if ($hours <= 0) #set ($extra = "")
+ #elseif($hours < 120) #set ($extra = "")
+ #elseif($hours < 240) #set ($extra = "_attention1")
+ #elseif($hours < 480) #set ($extra = "_attention2")
+ #else
+ #set ($extra = "_attention5")
+ #end
+
+ #if ($count % 2 > 0)
+ <tr class="a$extra">
+ #else
+ <tr class="b$extra">
+ #end
+#end
+
#macro (indexedRowsWithStyle $count $style)
#if ($count % 2 > 0)
<tr class="a" style=$style">
@@ -637,7 +638,7 @@
#set ($prevLink = $link.setPathInfo("resultsperpage", "$resultsPerPage").setPathInfo("pageNum", "$scarabR.PrevPage").setPathInfo("sortColumn", "$sortColumn").setPathInfo("sortPolarity", "$sortPolarity").setPage($scarabR.getCurrentTemplate()))
<a href="$prevLink">$l10n.PaginatePrevious</a> |
#end
- $pageNum l10n.Of $scarabR.NbrPages
+ $pageNum of $scarabR.NbrPages
#if ($scarabR.NextPage != 0)
#set ($nextLink = $link.setPathInfo("resultsperpage", "$resultsPerPage").setPathInfo("pageNum", "$scarabR.NextPage").setPathInfo("sortColumn", "$sortColumn").setPathInfo("sortPolarity", "$sortPolarity").setPage($scarabR.getCurrentTemplate()))
| <a href="$nextLink">$l10n.PaginateNext</a>
@@ -655,7 +656,7 @@
#set ($prevLink = $link.setPathInfo("resultsperpage", "$resultsPerPage").setPathInfo("pageNum", "$scarabR.PrevPage").setPathInfo("sortColumn", "$sortColumn").setPathInfo("sortPolarity", "$sortPolarity").setPathInfo("searchType", "$searchType").setPage($scarabR.getCurrentTemplate()))
<a href="$prevLink" title="$l10n.PaginatePrevious" class="previous_element" ></a> |
#end
- $pageNum $l10n.Of $scarabR.NbrPages
+ $pageNum of $scarabR.NbrPages
#if ($scarabR.NextPage != 0)
#set ($nextLink = $link.setPathInfo("resultsperpage", "$resultsPerPage").setPathInfo("pageNum", "$scarabR.NextPage").setPathInfo("sortColumn", "$sortColumn").setPathInfo("sortPolarity", "$sortPolarity").setPathInfo("searchType", "$searchType").setPage($scarabR.getCurrentTemplate()))
| <a href="$nextLink" title="$l10n.PaginateNext" class="next_element"></a>
@@ -673,7 +674,7 @@
#set ($prevLink = $link.setPathInfo("resultsperpage", "$resultsPerPage").setPathInfo("pageNum", "$scarabR.PrevPage").setPathInfo("sortColumn", "$sortColumn").setPathInfo("sortPolarity", "$sortPolarity").setPathInfo("searchType", "$searchType").setPathInfo("view","$view").setPage($scarabR.getCurrentTemplate()))
<a href="$prevLink">$l10n.PaginatePrevious</a> |
#end
- $pageNum $l10n.Of $scarabR.NbrPages
+ $pageNum of $scarabR.NbrPages
#if ($scarabR.NextPage != 0)
#set ($nextLink = $link.setPathInfo("resultsperpage", "$resultsPerPage").setPathInfo("pageNum", "$scarabR.NextPage").setPathInfo("sortColumn", "$sortColumn").setPathInfo("sortPolarity", "$sortPolarity").setPathInfo("searchType", "$searchType").setPathInfo("view","$view").setPage($scarabR.getCurrentTemplate()))
| <a href="$nextLink">$l10n.PaginateNext</a>
@@ -694,7 +695,7 @@
#end
<a href="$prevLink">$l10n.PaginatePrevious</a> |
#end
- $pageNum $l10n.Of $scarabR.NbrPages
+ $pageNum of $scarabR.NbrPages
#if ($scarabR.NextPage != 0)
#set ($nextLink = $link.setPathInfo("resultsperpage", "$resultsPerPage.toString()").addPathInfo("pageNum", "$scarabR.NextPage").addPathInfo("sortColumn", "$sortColumn").addPathInfo("sortPolarity", "$sortPolarity").setPage($scarabR.getCurrentTemplate()).addPathInfo("searchString", $searchString).addPathInfo("searchField", $searchField).addPathInfo($scarabG.Constant.CANCEL_TEMPLATE, $cancelTemplate))
@@ -721,9 +722,7 @@
#set ($prevLink = $link.setPathInfo("id", "$prevIssue").setPage($scarabR.getCurrentTemplate()).addPathInfo("posInList", $scarabR.PrevIssuePosInList))
<a href="$prevLink">$l10n.PaginatePrevious</a> |
#end
- #if ($scarabR.CurrentSearchResultsSize > 1)
- $scarabR.IssuePosInList $l10n.Of $scarabR.CurrentSearchResultsSize
- #end
+ $scarabR.IssuePosInList of $scarabR.CurrentSearchResultsSize
#set ($nextIssue=$scarabR.NextIssue)
#if ($nextIssue)
#set ($nextLink = $link.setPathInfo("id", "$nextIssue").setPage($scarabR.getCurrentTemplate()).addPathInfo("posInList", $scarabR.NextIssuePosInList))
Modified: branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/screens/IssueList.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/screens/IssueList.vm?view=diff&pathrev=11265&r1=11264&r2=11265
==============================================================================
--- branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/screens/IssueList.vm (original)
+++ branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/screens/IssueList.vm 2012-05-23 14:01:29-0700
@@ -58,7 +58,7 @@
<input type="hidden" name="pageNum" value="$pageNum" />
<input type="hidden" name="$scarabG.Constant.CANCEL_TEMPLATE" value="IssueList.vm" />
-#queryFunctionBar("")
+#queryFunctionBar("2")
<h3 style="height:18px;">
@@ -182,7 +182,7 @@
#if ($issue.isOnHold() || $issue.isSealed())
<td>
#else
- #indexedColumnsWithIdleHours($velocityCount $issue.HoursIdle)
+ #indexedRowsWithIdleHours($velocityCount $issue.HoursIdle)
#end
<a href="$link">$record.UniqueId</a></td>
@@ -203,7 +203,7 @@
</table>
## END of RESULTS TABLE!
-<div class="axial" style="margin-left:2px;margin-right:2px;background-color:#abc4db;white-space:nowrap;">
+<div class="axial-footer" style="margin-left:2px;margin-right:2px;white-space:nowrap;">
<span style="margin-left:15px;margin-right:10px;">
#if ($paginated)
#paginateIssueList($resultsPerPage $pageNum $sortColumn $sortPolarity $searchType)
Modified: branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/custom.css
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/custom.css?view=diff&pathrev=11265&r1=11264&r2=11265
==============================================================================
--- branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/custom.css (original)
+++ branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/custom.css 2012-05-23 14:01:29-0700
@@ -127,16 +127,16 @@
//
*/
-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;}
+td.a_attention1 {vertical-align:top; background-color:#dddddd;}
+td.b_attention1 {vertical-align:top; background-color:#efefef;}
+td.a_attention2 {vertical-align:top; background: url(images/attention_low.png) no-repeat scroll 95% 5px transparent; background-color:#dddddd;}
+td.b_attention2 {vertical-align:top; background: url(images/attention_low.png) no-repeat scroll 95% 5px transparent; background-color:#efefef;}
+td.a_attention3 {vertical-align:top; background: url(images/attention_medium.png) no-repeat scroll 95% 5px transparent; background-color:#dddddd;}
+td.b_attention3 {vertical-align:top; background: url(images/attention_medium.png) no-repeat scroll 95% 5px transparent; background-color:#efefef;}
+td.a_attention4 {vertical-align:top; background: url(images/attention_high.png) no-repeat scroll 95% 5px transparent; background-color:#dddddd;}
+td.b_attention4 {vertical-align:top; background: url(images/attention_high.png) no-repeat scroll 95% 5px transparent; background-color:#efefef;}
+td.a_attention5 {vertical-align:top; background: url(images/attention_highest.png) no-repeat scroll 95% 5px transparent; background-color:#dddddd;}
+td.b_attention5 {vertical-align:top; background: url(images/attention_highest.png) no-repeat scroll 95% 5px transparent; background-color:#efefef;}
// experimental stuff will be removed later.
Modified: branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/modern.css
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/modern.css?view=diff&pathrev=11265&r1=11264&r2=11265
==============================================================================
--- branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/modern.css (original)
+++ branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/modern.css 2012-05-23 14:01:29-0700
@@ -371,9 +371,15 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
//div.axial {
-// background-color:#bbbbbb;
+// background-color:#dddddd;
//}
+div.axial-footer {
+ background-color:#dddddd;
+ margin-left:2px;
+ margin-right:2px;
+ white-space:nowrap;
+}
/* ============================================================== */
/* tigris.css */
@@ -413,11 +419,15 @@
background-color:#fff;
}
-select {
+treeview_button, select, input[type='submit'], input[type='reset'], input[type='file'] {
border-radius: 5px;
+ padding:2px;
border-style:solid;
- border-color:#d0d0d0;
- background-color:#fff;
+ border-color:#f0d0d0 #f0d0d0 #f0b0b0 #f0b0b0;
+ background-color:#f8f8f8;
+ border-width:2px;
+ color:#b00000;
+
}
@@ -425,14 +435,14 @@
font-size: 1em;
}
-input[type='submit']{
- border-style:solid;
- border-width:1px;
- border-color:#808080;
- border-radius: 5px;
- cursor:pointer;
- background-color:#fef8fe;
-}
+//input[type='submit']{
+// border-style:solid;
+// border-width:1px;
+// border-color:#808080;
+// border-radius: 5px;
+// cursor:pointer;
+// background-color:#fef8fe;
+//}
.functnbar a,.functnbar2 a,.functnbar3 a {
color: #000;
@@ -900,7 +910,7 @@
}
.toolgroup {
- background: #e0e0e0;
+ background: #e8e8e8;
margin-bottom: 6px;
}
@@ -1247,7 +1257,7 @@
}
.scarab-toolgroup {
- background: #f0f0f0;
+ background: #f8f8f8;
margin-bottom: 6px;
margin-right: 3px;
margin-left: 0px;
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2964689