You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2009/06/28 15:51:46 UTC
svn commit: r789100 - in
/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog:
choosecatalog.ftl minilastproductsearches.ftl minilastviewedproducts.ftl
miniproductsummary.ftl
Author: apatel
Date: Sun Jun 28 13:51:46 2009
New Revision: 789100
URL: http://svn.apache.org/viewvc?rev=789100&view=rev
Log:
Cleaned up markup.
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl?rev=789100&r1=789099&r2=789100&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl Sun Jun 28 13:51:46 2009
@@ -24,7 +24,6 @@
<#if (catalogCol?size > 1)>
<div id ="choosecatalog" class="screenlet">
<h3>${uiLabelMap.ProductChooseCatalog}</h3>
- <div class="screenlet-body">
<form name="choosecatalogform" method="post" action="<@o...@ofbizUrl>">
<select name='CURRENT_CATALOG_ID' class='selectBox' onchange="submit()">
<option value='${currentCatalogId}'>${currentCatalogName}</option>
@@ -35,6 +34,5 @@
</#list>
</select>
</form>
- </div>
</div>
</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl?rev=789100&r1=789099&r2=789100&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl Sun Jun 28 13:51:46 2009
@@ -31,7 +31,6 @@
</div>
<h3>${uiLabelMap.OrderLastSearches}...</h3>
- <div class="screenlet-body">
<ul>
<#list searchOptionsHistoryList[0..limit] as searchOptions>
<#-- searchOptions type is ProductSearchSession.ProductSearchOptions -->
@@ -49,6 +48,5 @@
</ul>
</#list>
</ul>
- </div>
</div>
</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl?rev=789100&r1=789099&r2=789100&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl Sun Jun 28 13:51:46 2009
@@ -30,18 +30,15 @@
</#if>
</div>
<h3>${uiLabelMap.EcommerceLastProducts}</h3>
- <div class="screenlet-body">
+ <ul>
<#list lastViewedProducts[0..limit] as productId>
- <div>
+ <li>
${setRequestAttribute("miniProdQuantity", "1")}
${setRequestAttribute("optProductId", productId)}
${setRequestAttribute("miniProdFormName", "lastviewed" + productId_index + "form")}
${screens.render("component://ecommerce/widget/CatalogScreens.xml#miniproductsummary")}
- </div>
- <#if productId_has_next>
-
- </#if>
+ </li>
</#list>
- </div>
+ </ul>
</div>
</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl?rev=789100&r1=789099&r2=789100&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl Sun Jun 28 13:51:46 2009
@@ -17,32 +17,33 @@
under the License.
-->
<#if miniProduct?exists>
- <p><a href="<@o...@ofbizUrl>" class="linktext">${miniProductContentWrapper.get("PRODUCT_NAME")?default("No Name Available")}</a></p>
- <p>${miniProduct.productId}
- <#if (priceResult.price?default(0) > 0 && miniProduct.requireAmount?default("N") == "N")>
- <#if "Y" = miniProduct.isVirtual?if_exists> ${uiLabelMap.CommonFrom} </#if>
- <#if totalPrice?exists>
- <p>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></p>
- <#else>
- <span class="<#if priceResult.isSale>salePrice<#else>normalPrice</#if>">
- <@ofbizCurrency amount=priceResult.price isoCode=priceResult.currencyUsed/></span>
- </#if>
- </#if>
- </p>
-
- <div>
+ <a href="<@o...@ofbizUrl>" class="linktext">${miniProductContentWrapper.get("PRODUCT_NAME")?default("No Name Available")}</a>
+ <ul>
+ <li>${miniProduct.productId}
+ <#if (priceResult.price?default(0) > 0 && miniProduct.requireAmount?default("N") == "N")>
+ <#if "Y" = miniProduct.isVirtual?if_exists> ${uiLabelMap.CommonFrom} </#if>
+ <#if totalPrice?exists>
+ <li>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></li>
+ <#else>
+ <span class="<#if priceResult.isSale>salePrice<#else>normalPrice</#if>">
+ <@ofbizCurrency amount=priceResult.price isoCode=priceResult.currencyUsed/></span>
+ </#if>
+ </#if>
+ </li>
<#if (miniProduct.introductionDate?exists) && (nowTimeLong < miniProduct.introductionDate.getTime())>
<#-- check to see if introductionDate hasn't passed yet -->
- <p>${uiLabelMap.ProductNotYetAvailable}</p>
+ <li>${uiLabelMap.ProductNotYetAvailable}</li>
<#elseif (miniProduct.salesDiscontinuationDate?exists) && (nowTimeLong > miniProduct.salesDiscontinuationDate.getTime())>
<#-- check to see if salesDiscontinuationDate has passed -->
- <p>${uiLabelMap.ProductNoLongerAvailable}</p>
+ <li>${uiLabelMap.ProductNoLongerAvailable}</li>
<#elseif miniProduct.isVirtual?default("N") == "Y">
- <a href="<@ofbizUrl>product/<#if requestParameters.category_id?exists>~category_id=${requestParameters.category_id}/</#...@ofbizUrl>" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderChooseVariations}...</span></a>
+ <li><a href="<@ofbizUrl>product/<#if requestParameters.category_id?exists>~category_id=${requestParameters.category_id}/</#...@ofbizUrl>" class="buttons"><span style="white-space: nowrap;">${uiLabelMap.OrderChooseVariations}...</span></a></li>
<#elseif miniProduct.requireAmount?default("N") == "Y">
- <a href="<@ofbizUrl>product/<#if requestParameters.category_id?exists>~category_id=${requestParameters.category_id}/</#...@ofbizUrl>" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderChooseAmount}...</span></a>
+ <li><a href="<@ofbizUrl>product/<#if requestParameters.category_id?exists>~category_id=${requestParameters.category_id}/</#...@ofbizUrl>" class="buttons"><span style="white-space: nowrap;">${uiLabelMap.OrderChooseAmount}...</span></a></li>
<#else>
+ <li>
<form method="post" action="<@ofbizUrl>additem<#if requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#...@ofbizUrl>" name="${miniProdFormName}" style="margin: 0;">
+ <fieldset>
<input type="hidden" name="add_product_id" value="${miniProduct.productId}"/>
<input type="hidden" name="quantity" value="${miniProdQuantity?default("1")}"/>
<#if requestParameters.orderId?has_content><input type="hidden" name="orderId" value="${requestParameters.orderId}"/></#if>
@@ -51,8 +52,10 @@
<#if requestParameters.VIEW_INDEX?has_content><input type="hidden" name="VIEW_INDEX" value="${requestParameters.VIEW_INDEX}"/></#if>
<#if requestParameters.VIEW_SIZE?has_content><input type="hidden" name="VIEW_SIZE" value="${requestParameters.VIEW_SIZE}"/></#if>
<input type="hidden" name="clearSearch" value="N"/>
- <a href="javascript:document.${miniProdFormName}.submit()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.CommonAdd} ${miniProdQuantity} ${uiLabelMap.OrderToCart}</span></a>
+ <a href="javascript:document.${miniProdFormName}.submit()" class="buttons"><span style="white-space: nowrap;">${uiLabelMap.CommonAdd} ${miniProdQuantity} ${uiLabelMap.OrderToCart}</span></a>
+ </fieldset>
</form>
+ </li>
</#if>
- </div>
+ </ul>
</#if>