Author: mor
Date: Mon Aug 3 06:45:28 2009
New Revision: 800218
URL: http://svn.apache.org/viewvc?rev=800218&view=rev
Log:
Tab to spaces and minor improvement to use _index attribute instead of a
counter.
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl
ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl?rev=800218&r1=800217&r2=800218&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl
(original)
+++
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl
Mon Aug 3 06:45:28 2009
@@ -17,11 +17,9 @@
under the License.
-->
-
<div id="partyContentList">
<#if partyContent?has_content>
<table class="basic-table" cellspacing="0">
- <#assign rowCount = 0>
<#list partyContent as pContent>
<#assign content = pContent.getRelatedOne("Content")>
<#assign contentType = content.getRelatedOneCache("ContentType")>
@@ -40,19 +38,18 @@
<#if (content.contentName?has_content)>
<a
href="<@ofbizUrl>img/${content.contentName}?imgId=${content.dataResourceId}</@ofbizUrl>">${uiLabelMap.CommonView}</a>
</#if>
- <form name= "removePartyContent_o_${rowCount}" method= "post"
action= "<@ofbizUrl>removePartyContent/viewprofile</@ofbizUrl>">
- <input type= "hidden" name= "contentId" value=
"${pContent.contentId}">
- <input type= "hidden" name= "partyId" value=
"${pContent.partyId}">
- <input type= "hidden" name= "partyContentTypeId" value=
"${pContent.partyContentTypeId}">
- <input type= "hidden" name= "fromDate" value=
"${pContent.fromDate}">
- <a
href="javascript:document.removePartyContent_o_${rowCount}.submit()">${uiLabelMap.CommonRemove}</a>
+ <form name="removePartyContent_${pContent_index}"
method="post" action="<@ofbizUrl>removePartyContent/viewprofile</@ofbizUrl>">
+ <input type= "hidden" name= "contentId" value=
"${pContent.contentId}">
+ <input type= "hidden" name= "partyId" value=
"${pContent.partyId}">
+ <input type= "hidden" name= "partyContentTypeId" value=
"${pContent.partyContentTypeId}">
+ <input type= "hidden" name= "fromDate" value=
"${pContent.fromDate}">
+ <a
href="javascript:document.removePartyContent_${pContent_index}.submit()">${uiLabelMap.CommonRemove}</a>
</form>
</td>
</tr>
- <#assign rowCount = rowCount + 1>
</#list>
</table>
<#else>
${uiLabelMap.PartyNoContent}
</#if>
- </div>
+ </div>
\ No newline at end of file
Modified:
ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl?rev=800218&r1=800217&r2=800218&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl
(original)
+++
ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl
Mon Aug 3 06:45:28 2009
@@ -69,7 +69,6 @@
</tr>
<#assign maxCondSeqId = 1>
<#assign rowClass = "2">
- <#assign rowCount = 0>
<#list productPriceConds as productPriceCond>
<tr valign="middle"<#if rowClass == "1">
class="alternate-row"</#if>>
<#-- if cur seq id is a number and is greater than
max, set new max for input box prefill below -->
@@ -109,11 +108,11 @@
</form>
</td>
<td align="center">
- <form name= "deleteProductPriceCond_o_${rowCount}"
method= "post" action= "<@ofbizUrl>deleteProductPriceCond</@ofbizUrl>">
- <input type= "hidden" name=
"productPriceRuleId" value= "${productPriceCond.productPriceRuleId}">
- <input type= "hidden" name=
"productPriceCondSeqId" value= "${productPriceCond.productPriceCondSeqId}">
- <a
href="javascript:document.deleteProductPriceCond_o_${rowCount}.submit()"
class="buttontext">${uiLabelMap.CommonRemove}</a>
- </form>
+ <form
name="deleteProductPriceCond_${productPriceCond_index}" method= "post" action=
"<@ofbizUrl>deleteProductPriceCond</@ofbizUrl>">
+ <input type= "hidden" name= "productPriceRuleId"
value= "${productPriceCond.productPriceRuleId}">
+ <input type= "hidden" name= "productPriceCondSeqId"
value= "${productPriceCond.productPriceCondSeqId}">
+ <a
href="javascript:document.deleteProductPriceCond_${productPriceCond_index}.submit()"
class="buttontext">${uiLabelMap.CommonRemove}</a>
+ </form>
</td>
</tr>
<#-- toggle the row color -->
@@ -122,7 +121,6 @@
<#else>
<#assign rowClass = "2">
</#if>
- <#assign rowCount = rowCount + 1>
</#list>
<tr>
<td colspan="3">
@@ -157,7 +155,6 @@
<td width="10%"><b> </b></td>
</tr>
<#assign rowClass = "2">
- <#assign rowCount = 0>
<#list productPriceActions as productPriceAction>
<tr valign="middle"<#if rowClass == "1">
class="alternate-row"</#if>>
<td
class="label"><b>${productPriceAction.productPriceActionSeqId}</b></td>
@@ -182,14 +179,13 @@
</form>
</td>
<td align="center">
- <form name=
"deleteProductPriceAction_o_${rowCount}" method= "post" action=
"<@ofbizUrl>deleteProductPriceAction</@ofbizUrl>">
- <input type= "hidden" name=
"productPriceRuleId" value= "${productPriceAction.productPriceRuleId}">
- <input type= "hidden" name=
"productPriceActionSeqId" value=
"${productPriceAction.productPriceActionSeqId}">
- <a
href="javascript:document.deleteProductPriceAction_o_${rowCount}.submit()"
class="buttontext">${uiLabelMap.CommonDelete}</a>
- </form>
+ <form
name="deleteProductPriceAction_${productPriceAction_index}" method="post"
action="<@ofbizUrl>deleteProductPriceAction</@ofbizUrl>">
+ <input type="hidden" name="productPriceRuleId"
value="${productPriceAction.productPriceRuleId}">
+ <input type="hidden"
name="productPriceActionSeqId"
value="${productPriceAction.productPriceActionSeqId}">
+ <a
href="javascript:document.deleteProductPriceAction_${productPriceAction_index}.submit()"
class="buttontext">${uiLabelMap.CommonDelete}</a>
+ </form>
</td>
</tr>
- <#assign rowCount = rowCount + 1>
<#-- toggle the row color -->
<#if rowClass == "2">
<#assign rowClass = "1">
