svn commit: r505134 - in /ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog: minilastproductsearches.ftl minilastviewedcategories.ftl

[jonesde]

Author: jonesde
Date: Thu Feb  8 18:07:02 2007
New Revision: 505134

URL: http://svn.apache.org/viewvc?view=rev&rev=505134
Log:
Fixed issue where the categoryName was not being used, ie just the description was shown (or not shown if it wasn't there, as the seed is

Modified:
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl?view=diff&rev=505134&r1=505133&r2=505134
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl Thu Feb  8 18:07:02 2007
@@ -38,8 +38,8 @@
                       <b>${uiLabelMap.EcommerceSearchNumber} ${searchOptions_index + 1}</b>
                     </div>
                     <div class="tabletext">
-                      <a href="<@ofbizUrl>setCurrentSearchFromHistoryAndSearch?searchHistoryIndex=${searchOptions_index}&clearSearch=N</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonSearch}]</a>
-                      <a href="<@ofbizUrl>setCurrentSearchFromHistory?searchHistoryIndex=${searchOptions_index}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonRefine}]</a>
+                      <a href="<@ofbizUrl>setCurrentSearchFromHistoryAndSearch?searchHistoryIndex=${searchOptions_index}&clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonSearch}</a>
+                      <a href="<@ofbizUrl>setCurrentSearchFromHistory?searchHistoryIndex=${searchOptions_index}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefine}</a>
                     </div>
                     <#assign constraintStrings = searchOptions.searchGetConstraintStrings(false, delegator, locale)>
                     <#list constraintStrings as constraintString>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl?view=diff&rev=505134&r1=505133&r2=505134
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl Thu Feb  8 18:07:02 2007
@@ -34,7 +34,9 @@
                 <#if category?has_content>
                     <div>
                         <span class="browsecategorytext">-&nbsp;</span>                      
-                        <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
+                        <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?exists>
+                            <a href="<@ofbizUrl>category/~category_id=${categoryId}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
+                        <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
                             <a href="<@ofbizUrl>category/~category_id=${categoryId}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
                         <#else>          
                             <a href="<@ofbizUrl>category/~category_id=${categoryId}</@ofbizUrl>" class="browsecategorybutton">${category.description?if_exists}</a>