Update catalog urls to use the new OfbizCatalogUrl directive

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@956485 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Scott Gray
2010-06-21 08:05:07 +00:00
parent 5db5584476
commit 375eec00c2
4 changed files with 5 additions and 7 deletions
@@ -23,15 +23,13 @@ under the License.
<#-- looping macro -->
<#macro categoryList parentCategory category>
<#if parentCategory.productCategoryId != category.productCategoryId>
<#assign categoryUrl = Static["org.ofbiz.product.category.CatalogUrlServlet"].makeCatalogUrl(request, "", category.productCategoryId, parentCategory.productCategoryId) />
<#else>
<#assign categoryUrl = Static["org.ofbiz.product.category.CatalogUrlServlet"].makeCatalogUrl(request, "", category.productCategoryId, "") />
<#local previousCategoryId = parentCategory.productCategoryId />
</#if>
<#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?exists && curCategoryId == category.productCategoryId)>
<li>
<#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists>
<a href="${categoryUrl}" class="<#if curCategoryId?exists && curCategoryId == category.productCategoryId>buttontextdisabled<#else>linktext</#if>">
<a href="<@ofbizCatalogUrl currentCategoryId=category.productCategoryId previousCategoryId=previousCategoryId!""/>" class="<#if curCategoryId?exists && curCategoryId == category.productCategoryId>buttontextdisabled<#else>linktext</#if>">
<#if catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?exists>
${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}
<#elseif catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
@@ -24,7 +24,7 @@ under the License.
<#assign productData = productDataMap[product.productId]/>
<#assign productContentWrapper = productData.productContentWrapper/>
<#assign price = productData.priceMap/>
<#assign productUrl = StringUtil.wrapString(Static["org.ofbiz.product.category.CatalogUrlServlet"].makeCatalogUrl(request, product.productId, categoryId, ""))/>
<#assign productUrl><@ofbizCatalogUrl productId=product.productId currentCategoryId=categoryId/></#assign>
<#assign smallImageUrl = productContentWrapper.get("SMALL_IMAGE_URL")/>
<#if smallImageUrl!?length == 0>
<#assign smallImageUrl = "/images/defaultImage.jpg"/>
@@ -18,7 +18,7 @@ under the License.
-->
<#if product?exists>
<#-- variable setup -->
<#assign productUrl = Static["org.ofbiz.product.category.CatalogUrlServlet"].makeCatalogUrl(request, product.productId, categoryId, "")/>
<#assign productUrl><@ofbizCatalogUrl productId=product.productId currentCategoryId=categoryId/></#assign>
<#if requestAttributes.productCategoryMember?exists>
<#assign prodCatMem = requestAttributes.productCategoryMember>
@@ -49,7 +49,7 @@ under the License.
<#else>
<#assign parentCategoryId = ""/>
</#if>
<a href="${Static["org.ofbiz.product.category.CatalogUrlServlet"].makeCatalogUrl(request, "", category.productCategoryId, parentCategoryId)}" class="${browseCategoryButtonClass}"><#if categoryName?has_content>${categoryName}<#else>${categoryDescription?default("")}</#if></a>
<a href="<@ofbizCatalogUrl currentCategoryId=category.productCategoryId previousCategoryId=parentCategoryId/>" class="${browseCategoryButtonClass}"><#if categoryName?has_content>${categoryName}<#else>${categoryDescription?default("")}</#if></a>
<#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?exists && curCategoryId == category.productCategoryId)>
<#local subCatList = Static["org.ofbiz.product.category.CategoryWorker"].getRelatedCategoriesRet(request, "subCatList", category.getString("productCategoryId"), true)>