You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2010/02/22 17:52:55 UTC
svn commit: r912651 - in /ofbiz/trunk:
applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
themes/tomahawk/webapp/tomahawk/css/style.css
Author: doogie
Date: Mon Feb 22 16:52:55 2010
New Revision: 912651
URL: http://svn.apache.org/viewvc?rev=912651&view=rev
Log:
Fix alternative promo rule styling, and implement alternative
condition/action styling. The colors are not perfect, but this is at
least better then having a single flat color behind everything.
Modified:
ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=912651&r1=912650&r2=912651&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Mon Feb 22 16:52:55 2010
@@ -29,11 +29,11 @@
<td width="80%"><b>${uiLabelMap.ProductRuleName}</b></td>
<td width="10%"><b> </b></td>
</tr>
- <#assign rowClass = "2">
+ <#assign ruleClass = "2">
<#list productPromoRules as productPromoRule>
<#assign productPromoConds = productPromoRule.getRelated("ProductPromoCond")>
<#assign productPromoActions = productPromoRule.getRelated("ProductPromoAction")>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <tr valign="middle" class="row-level-one<#if ruleClass == "1"> alternate-row</#if>">
<td class="label"><b>${(productPromoRule.productPromoRuleId)?if_exists}</b></td>
<td>
<form method="post" action="<@o...@ofbizUrl>">
@@ -53,13 +53,14 @@
</#if>
</td>
</tr>
- <tr valign="top">
+ <tr valign="top" class="row-level-one<#if ruleClass == "1"> alternate-row</#if>">
<td align="right" class="label">${uiLabelMap.ProductConditions}</td>
<td colspan="2">
<table cellspacing="0" class="basic-table">
<#assign maxCondSeqId = 1>
+ <#assign condClass = "2">
<#list productPromoConds as productPromoCond>
- <tr>
+ <tr class="row-level-two<#if condClass == "1"> alternate-row</#if>">
<!-- if cur seq id is a number and is greater than max, set new max for input box prefill below -->
<#if (productPromoCond.productPromoCondSeqId)?exists>
<#assign curCondSeqId = Static["java.lang.Integer"].valueOf(productPromoCond.getString("productPromoCondSeqId"))>
@@ -208,6 +209,12 @@
</form>
</td>
</tr>
+ <#-- toggle the row color -->
+ <#if condClass == "2">
+ <#assign condClass = "1">
+ <#else>
+ <#assign condClass = "2">
+ </#if>
</#list>
<tr>
<td colspan="3">
@@ -242,12 +249,13 @@
</table>
</td>
</tr>
- <tr valign="top">
+ <tr valign="top" class="row-level-one<#if ruleClass == "1"> alternate-row</#if>">
<td align="right" class="label">${uiLabelMap.ProductActions} :</td>
<td colspan="2">
<table cellspacing="0" class="basic-table">
+ <#assign actionClass = "2">
<#list productPromoActions as productPromoAction>
- <tr>
+ <tr class="row-level-two<#if actionClass == "1"> alternate-row</#if>">
<td class="label"><b>${(productPromoAction.productPromoActionSeqId)?if_exists}</b></td>
<td>
<div>
@@ -362,6 +370,12 @@
</form>
</td>
</tr>
+ <#-- toggle the row color -->
+ <#if actionClass == "2">
+ <#assign actionClass = "1">
+ <#else>
+ <#assign actionClass = "2">
+ </#if>
</#list>
<tr>
<td colspan="3">
@@ -388,6 +402,12 @@
</table>
</td>
</tr>
+ <#-- toggle the row color -->
+ <#if ruleClass == "2">
+ <#assign ruleClass = "1">
+ <#else>
+ <#assign ruleClass = "2">
+ </#if>
</#list>
</table>
</div>
Modified: ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css?rev=912651&r1=912650&r2=912651&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css Mon Feb 22 16:52:55 2010
@@ -2432,4 +2432,12 @@
/* overwrite*/
#findScreenlet {
margin-top: 0;
-}
\ No newline at end of file
+}
+
+.row-level-one.alternate-row {
+background-color:#81817F;
+}
+.row-level-two {
+background-color:#D4D0C8;
+}
+