You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bu...@apache.org on 2009/10/03 01:00:23 UTC
svn commit: r821197 - in
/ofbiz/trunk/applications/order/webapp/ordermgr/entry: ./ cart/ catalog/
Author: buscob
Date: Fri Oct 2 23:00:22 2009
New Revision: 821197
URL: http://svn.apache.org/viewvc?rev=821197&view=rev
Log:
Cleaned up several ftl screenlets markup.
Changed from <div class="screenlet-header"> to <div class="screenlet-title-bar">.
Replaced <div class="boxhead"> with <div class="h3">.
This fixes also a white text on white background issue with bluelight theme reported by Matthieu Bollot in the dev ML.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/choosecatalog.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/compareproductslist.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl?rev=821197&r1=821196&r2=821197&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl Fri Oct 2 23:00:22 2009
@@ -47,14 +47,16 @@
</ul>
</div>
<br/>
-<div class="screenlet-title-bar">
- <h3>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">
${uiLabelMap.CommonCreate}
<#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
${uiLabelMap.OrderPurchaseOrder}
<#else>
${uiLabelMap.OrderSalesOrder}
</#if>
- </h3>
+ </div>
+ </div>
</div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl?rev=821197&r1=821196&r2=821197&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl Fri Oct 2 23:00:22 2009
@@ -19,8 +19,8 @@
<#if allProductPromos?has_content>
<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxhead"> ${uiLabelMap.OrderManualPromotions}</div>
+ <div class="screenlet-title-bar">
+ <div class="h3"> ${uiLabelMap.OrderManualPromotions}</div>
</div>
<div class="screenlet-body">
<div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl?rev=821197&r1=821196&r2=821197&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl Fri Oct 2 23:00:22 2009
@@ -19,8 +19,8 @@
<#if shoppingCart.getOrderType() == "SALES_ORDER">
<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxhead"> ${uiLabelMap.OrderPromotionCouponCodes}</div>
+ <div class="screenlet-title-bar">
+ <div class="h3"> ${uiLabelMap.OrderPromotionCouponCodes}</div>
</div>
<div class="screenlet-body">
<div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl?rev=821197&r1=821196&r2=821197&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl Fri Oct 2 23:00:22 2009
@@ -18,8 +18,8 @@
-->
<#if showPromoText?exists && showPromoText>
<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxhead"> ${uiLabelMap.OrderSpecialOffers}</div>
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.OrderSpecialOffers}</div>
</div>
<div class="screenlet-body">
<table cellspacing="0" cellpadding="1" border="0">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=821197&r1=821196&r2=821197&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Fri Oct 2 23:00:22 2009
@@ -20,8 +20,8 @@
<#-- Continuation of showcart.ftl: List of order items and forms to modify them. -->
<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxhead"> ${uiLabelMap.OrderOrderItems}</div>
+ <div class="screenlet-title-bar">
+ <div class='h3'>${uiLabelMap.OrderOrderItems}</div>
</div>
<div class="screenlet-body">
<#if (shoppingCartSize > 0)>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/choosecatalog.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/choosecatalog.ftl?rev=821197&r1=821196&r2=821197&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/choosecatalog.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/choosecatalog.ftl Fri Oct 2 23:00:22 2009
@@ -20,8 +20,8 @@
<#-- Only show if there is more than 1 (one) catalog, no sense selecting when there is only one option... -->
<#if (catalogCol?size > 1)>
<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxhead">${uiLabelMap.ProductChooseCatalog}</div>
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.ProductChooseCatalog}</div>
</div>
<div class="screenlet-body" style="text-align: center;">
<form name="choosecatalogform" method="post" action="<@o...@ofbizUrl>" style='margin: 0;'>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/compareproductslist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/compareproductslist.ftl?rev=821197&r1=821196&r2=821197&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/compareproductslist.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/compareproductslist.ftl Fri Oct 2 23:00:22 2009
@@ -17,37 +17,37 @@
under the License.
-->
<div id="productcomparelist" class="screenlet">
- <div class="screenlet-header">
- <div class="boxhead">${uiLabelMap.ProductCompareProducts}</div>
- </div>
- <div class="screenlet-body">
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.ProductCompareProducts}</div>
+ </div>
+ <div class="screenlet-body">
<#assign productCompareList = Static["org.ofbiz.product.product.ProductEvents"].getProductCompareList(request)/>
<#if productCompareList?has_content>
<table>
<#list productCompareList as product>
- <tr>
- <td>
- ${Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "PRODUCT_NAME", request)}
- </td>
- <td>
- <form method="post" action="<@o...@ofbizUrl>" name="removeFromCompare${product_index}form">
- <input type="hidden" name="productId" value="${product.productId}"/>
- </form>
- <a href="javascript:document.removeFromCompare${product_index}form.submit()" class="buttontext">${uiLabelMap.CommonRemove}</a>
- </td>
- </tr>
+ <tr>
+ <td>
+ ${Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "PRODUCT_NAME", request)}
+ </td>
+ <td>
+ <form method="post" action="<@o...@ofbizUrl>" name="removeFromCompare${product_index}form">
+ <input type="hidden" name="productId" value="${product.productId}"/>
+ </form>
+ <a href="javascript:document.removeFromCompare${product_index}form.submit()" class="buttontext">${uiLabelMap.CommonRemove}</a>
+ </td>
+ </tr>
</#list>
- </table>
- <div>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClearAll}</a>
- </div>
- <div>
- <a href="javascript:popUp('<@ofbizUrl secure="${request.isSecure()?string}">compareProducts</...@ofbizUrl>', 'compareProducts', '650', '750')" class="buttontext">${uiLabelMap.ProductCompareProducts}</a>
- </div>
+ </table>
+ <div>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClearAll}</a>
+ </div>
+ <div>
+ <a href="javascript:popUp('<@ofbizUrl secure="${request.isSecure()?string}">compareProducts</...@ofbizUrl>', 'compareProducts', '650', '750')" class="buttontext">${uiLabelMap.ProductCompareProducts}</a>
+ </div>
<#else/>
- <div>
- ${uiLabelMap.ProductNoProductsToCompare}
- </div>
+ <div>
+ ${uiLabelMap.ProductNoProductsToCompare}
+ </div>
</#if>
- </div>
+ </div>
</div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl?rev=821197&r1=821196&r2=821197&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl Fri Oct 2 23:00:22 2009
@@ -18,7 +18,9 @@
-->
<div id="keywordsearchbox" class="screenlet">
- <h3>${uiLabelMap.ProductSearchCatalog}</h3>
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ProductSearchCatalog}</h3>
+ </div>
<div class="screenlet-body">
<form name="keywordsearchform" id="keywordsearchbox_keywordsearchform" method="post" action="<@o...@ofbizUrl>">
<fieldset>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl?rev=821197&r1=821196&r2=821197&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl Fri Oct 2 23:00:22 2009
@@ -85,8 +85,8 @@
<#if topLevelList?has_content>
<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxhead">${uiLabelMap.ProductBrowseCategories}</div>
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.ProductBrowseCategories}</div>
</div>
<div class="screenlet-body">
<div class="browsecategorylist">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl?rev=821197&r1=821196&r2=821197&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl Fri Oct 2 23:00:22 2009
@@ -31,8 +31,8 @@
</#if>
<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxhead">${uiLabelMap.OrderOrderHeaderInfo}</div>
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.OrderOrderHeaderInfo}</div>
</div>
<div class="screenlet-body">
<table width="100%" border="0" cellpadding="2" cellspacing="0">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl?rev=821197&r1=821196&r2=821197&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl Fri Oct 2 23:00:22 2009
@@ -20,8 +20,8 @@
<#assign shoppingCart = sessionAttributes.shoppingCart?if_exists>
<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxhead">${uiLabelMap.OrderOrderShortcuts}</div>
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.OrderOrderShortcuts}</div>
</div>
<div class="screenlet-body">
<ul>