You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2008/08/10 19:04:46 UTC
svn commit: r684555 - in /ofbiz/trunk/applications:
ecommerce/webapp/ecommerce/catalog/ order/webapp/ordermgr/entry/
order/webapp/ordermgr/entry/catalog/
Author: adrianc
Date: Sun Aug 10 10:04:45 2008
New Revision: 684555
URL: http://svn.apache.org/viewvc?rev=684555&view=rev
Log:
More CSS style and HTML cleanups.
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl?rev=684555&r1=684554&r2=684555&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl Sun Aug 10 10:04:45 2008
@@ -40,7 +40,7 @@
${screens.render("component://ecommerce/widget/CatalogScreens.xml#miniproductsummary")}
</div>
<#if productId_has_next>
- <div><hr class='sepbar'/></div>
+ <div><hr/></div>
</#if>
</#list>
</div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?rev=684555&r1=684554&r2=684555&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl Sun Aug 10 10:04:45 2008
@@ -44,27 +44,29 @@
<#if productCategory?exists>
- <h1>
- <div>${categoryContentWrapper.get("CATEGORY_NAME")?if_exists}</div>
- <div>${categoryContentWrapper.get("DESCRIPTION")?if_exists}</div>
- <#if hasQuantities?exists>
- <form method="post" action="<@ofbizUrl>addCategoryDefaults<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#...@ofbizUrl>" name="thecategoryform" style='margin: 0;'>
- <input type='hidden' name='add_category_id' value='${productCategory.productCategoryId}'/>
- <#if requestParameters.product_id?exists><input type='hidden' name='product_id' value='${requestParameters.product_id}'/></#if>
- <#if requestParameters.category_id?exists><input type='hidden' name='category_id' value='${requestParameters.category_id}'/></#if>
- <#if requestParameters.VIEW_INDEX?exists><input type='hidden' name='VIEW_INDEX' value='${requestParameters.VIEW_INDEX}'/></#if>
- <#if requestParameters.SEARCH_STRING?exists><input type='hidden' name='SEARCH_STRING' value='${requestParameters.SEARCH_STRING}'/></#if>
- <#if requestParameters.SEARCH_CATEGORY_ID?exists><input type='hidden' name='SEARCH_CATEGORY_ID' value='${requestParameters.SEARCH_CATEGORY_ID}'/></#if>
- <a href="javascript:document.thecategoryform.submit()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.ProductAddProductsUsingDefaultQuantities}</span></a>
- </form>
- </#if>
- <#if searchInCategory?default("Y") == "Y">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductSearchinCategory}</a>
- </#if>
- </h1>
- <#assign longDescription = categoryContentWrapper.get("LONG_DESCRIPTION")?if_exists/>
- <#assign categoryImageUrl = categoryContentWrapper.get("CATEGORY_IMAGE_URL")?if_exists/>
- <#if categoryImageUrl?has_content || longDescription?has_content>
+ <#if categoryContentWrapper.get("CATEGORY_NAME")?has_content>
+ <h1>${categoryContentWrapper.get("CATEGORY_NAME")}</h1>
+ </#if>
+ <#if categoryContentWrapper.get("DESCRIPTION")?has_content>
+ <h1>${categoryContentWrapper.get("DESCRIPTION")}</h1>
+ </#if>
+ <#if hasQuantities?exists>
+ <form method="post" action="<@ofbizUrl>addCategoryDefaults<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#...@ofbizUrl>" name="thecategoryform" style='margin: 0;'>
+ <input type='hidden' name='add_category_id' value='${productCategory.productCategoryId}'/>
+ <#if requestParameters.product_id?exists><input type='hidden' name='product_id' value='${requestParameters.product_id}'/></#if>
+ <#if requestParameters.category_id?exists><input type='hidden' name='category_id' value='${requestParameters.category_id}'/></#if>
+ <#if requestParameters.VIEW_INDEX?exists><input type='hidden' name='VIEW_INDEX' value='${requestParameters.VIEW_INDEX}'/></#if>
+ <#if requestParameters.SEARCH_STRING?exists><input type='hidden' name='SEARCH_STRING' value='${requestParameters.SEARCH_STRING}'/></#if>
+ <#if requestParameters.SEARCH_CATEGORY_ID?exists><input type='hidden' name='SEARCH_CATEGORY_ID' value='${requestParameters.SEARCH_CATEGORY_ID}'/></#if>
+ <a href="javascript:document.thecategoryform.submit()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.ProductAddProductsUsingDefaultQuantities}</span></a>
+ </form>
+ </#if>
+ <#if searchInCategory?default("Y") == "Y">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductSearchinCategory}</a>
+ </#if>
+ <#assign longDescription = categoryContentWrapper.get("LONG_DESCRIPTION")?if_exists/>
+ <#assign categoryImageUrl = categoryContentWrapper.get("CATEGORY_IMAGE_URL")?if_exists/>
+ <#if categoryImageUrl?has_content || longDescription?has_content>
<div>
<#if categoryImageUrl?has_content>
<img src='<@o...@ofbizContentUrl>' vspace='5' hspace='5' border='1' height='100' align='left'/>
@@ -90,7 +92,7 @@
<#assign numCol = numCol?default(1)>
<#assign numCol = numCol?number>
<#assign tabCol = 1>
- <div class="productsummary-container <#if (numCol?int > 1)>matrix</#if>">
+ <div class="productsummary-container<#if (numCol?int > 1)> matrix</#if>">
<#if (numCol?int > 1)>
<table>
</#if>
@@ -118,6 +120,6 @@
</div>
<@paginationControls/>
<#else>
- <div><hr class='sepbar'/></div>
- <div class='tabletext'>${uiLabelMap.ProductNoProductsInThisCategory}</div>
+ <div><hr/></div>
+ <div>${uiLabelMap.ProductNoProductsInThisCategory}</div>
</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl?rev=684555&r1=684554&r2=684555&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl Sun Aug 10 10:04:45 2008
@@ -80,7 +80,7 @@
</td>
</tr>
</#if>
- <tr><td colspan='2'><hr class='sepbar'></td></tr>
+ <tr><td colspan='2'><hr/></td></tr>
<#else>
<input type='hidden' name='${shipGroupIndex?default("0")}_shipping_method' value="NO_SHIPPING@_NA_">
</#if>
@@ -105,7 +105,7 @@
<div>${uiLabelMap.FacilityShipAvailable}</div>
</td>
</tr>
- <tr><td colspan="2"><hr class='sepbar'></td></tr>
+ <tr><td colspan="2"><hr/></td></tr>
<tr>
<td colspan="2">
<h2>${uiLabelMap.FacilitySpecialInstructions}</h2>
@@ -130,7 +130,7 @@
</td>
</tr>
<#if cart.getOrderType() != "PURCHASE_ORDER">
- <tr><td colspan="2"><hr class='sepbar'></td></tr>
+ <tr><td colspan="2"><hr/></td></tr>
<tr>
<td colspan="2">
<h2>${uiLabelMap.OrderGiftMessage}</h2>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl?rev=684555&r1=684554&r2=684555&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl Sun Aug 10 10:04:45 2008
@@ -39,7 +39,7 @@
<td><div><b>${uiLabelMap.CommonDescription}</b></div></td>
<td align="right"> </td>
</tr>
- <tr><td colspan="5"><hr class='sepbar'></td></tr>
+ <tr><td colspan="5"><hr/></td></tr>
<#assign index=0>
<#list orderTerms as orderTerm>
<tr>
@@ -54,7 +54,7 @@
</td>
</tr>
<#if orderTerms.size()<index >
- <tr><td colspan="5"><hr class='sepbar'></td></tr>
+ <tr><td colspan="5"><hr/></td></tr>
</#if>
<#assign index=index+1>
</#list>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl?rev=684555&r1=684554&r2=684555&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl Sun Aug 10 10:04:45 2008
@@ -46,7 +46,7 @@
<div>${uiLabelMap.FacilityFacility}: ${facility.facilityName?if_exists} [${facility.facilityId}]</div>
</td>
</tr>
- <tr><td colspan="4"><hr class='sepbar'/></td></tr>
+ <tr><td colspan="4"><hr/></td></tr>
<#-- company postal addresses -->
@@ -76,7 +76,7 @@
</td>
</tr>
<#if shippingContactMech_has_next>
- <tr><td colspan="4"><hr class='sepbar'/></td></tr>
+ <tr><td colspan="4"><hr/></td></tr>
</#if>
</#if>
<#assign i = i + 1>
@@ -138,7 +138,7 @@
</td>
</tr>
<#if shippingContactMechList?has_content>
- <tr><td colspan="3"><hr class='sepbar'/></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<#assign i = 0>
<#list shippingContactMechList as shippingContactMech>
<#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
@@ -176,15 +176,15 @@
</td>
</tr>
<#if shippingContactMech_has_next>
- <tr><td colspan="3"><hr class='sepbar'/></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
</#if>
<#assign i = i + 1>
</#list>
</#if>
<#if shipToPartyShippingContactMechList?has_content>
- <tr><td colspan="3"><hr class='sepbar'/></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<tr><td colspan="3">${uiLabelMap.OrderShipToAnotherParty}: <b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(shipToParty)}</b></td></tr>
- <tr><td colspan="3"><hr class='sepbar'/></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<#list shipToPartyShippingContactMechList as shippingContactMech>
<#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
<tr>
@@ -206,7 +206,7 @@
<td> </td>
</tr>
<#if shippingContactMech_has_next>
- <tr><td colspan="3"><hr class='sepbar'/></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
</#if>
</#list>
</#if>