You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2011/10/01 23:44:16 UTC
svn commit: r1178092 -
/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl
Author: jleroux
Date: Sat Oct 1 21:44:16 2011
New Revision: 1178092
URL: http://svn.apache.org/viewvc?rev=1178092&view=rev
Log:
I missed this in r1175130
For a better formatting of breadcrumbs in all cases, fixes a bug introduced (for Visual themes) at r737506, and propagated in r1128983
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl?rev=1178092&r1=1178091&r2=1178092&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl Sat Oct 1 21:44:16 2011
@@ -18,25 +18,52 @@ under the License.
-->
<div class="breadcrumbs">
+<#assign isDefaultTheme = !layoutSettings.VT_FTR_TMPLT_LOC?contains("multiflex")>
+<#if isDefaultTheme>
+ <a href="<@o...@ofbizUrl>" class="linktext">${uiLabelMap.CommonMain}</a> >
+<#else>
<ul>
<li>
<a href="<@o...@ofbizUrl>" class="linktext">${uiLabelMap.CommonMain}</a>
</li>
+</#if>
<#-- Show the category branch -->
<#if productCategoryTrail?exists>
<#list productCategoryTrail as trail>
- <li>
- <a href="<@ofbizCatalogAltUrl productCategoryId=trail.productCategoryId previousCategoryId=trail.parentCategory!""/>" class="linktext">
- <#if trail.title?exists>
- ${trail.title}
- <#else>
- ${trail.productCategoryId}
- </#if>
- </a>
- </li>
+ <#if !isDefaultTheme>
+ <li>
+ <a href="<@ofbizCatalogAltUrl productCategoryId=trail.productCategoryId previousCategoryId=trail.parentCategory!""/>" class="linktext">
+ <#if trail.title?exists>
+ ${trail.title}
+ <#else>
+ ${trail.productCategoryId}
+ </#if>
+ </a>
+ </li>
+ <#else>
+ <a href="<@ofbizCatalogAltUrl productCategoryId=trail.productCategoryId previousCategoryId=trail.parentCategory!""/>" class="linktext">
+ <#if trail.title?exists>
+ ${trail.title} >
+ <#else>
+ ${trail.productCategoryId} >
+ </#if>
+ </a>
+ </#if>
</#list>
</#if>
- <li>
+ <#if !isDefaultTheme>
+ <li>
+ <a href="<@ofbizCatalogAltUrl productCategoryId=currentCategoryId previousCategoryId=parameters.parentCategoryStr/>" class="linktext">
+ <#if currentCategoryName?exists>
+ ${currentCategoryName}
+ <#elseif currentCategoryDescription?exists>
+ ${currentCategoryDescription}
+ <#else>
+ ${currentCategoryId}
+ </#if>
+ </a>
+ </li>
+ <#else>
<a href="<@ofbizCatalogAltUrl productCategoryId=currentCategoryId previousCategoryId=parameters.parentCategoryStr/>" class="linktext">
<#if currentCategoryName?exists>
${currentCategoryName}
@@ -46,10 +73,14 @@ under the License.
${currentCategoryId}
</#if>
</a>
- </li>
+ </#if>
<#-- Show the product, if there is one -->
<#if productContentWrapper?exists>
- <li>${productContentWrapper.get("PRODUCT_NAME")?if_exists}</li>
+ <#if isDefaultTheme>
+ > ${productContentWrapper.get("PRODUCT_NAME")?if_exists}
+ <#else>
+ <li>${productContentWrapper.get("PRODUCT_NAME")?if_exists}</li>
+ </#if>
</#if>
</ul>
</div>