svn commit: r1309778 - in /ofbiz/trunk: applications/product/config/freemarkerTransforms.properties applications/product/src/org/ofbiz/product/category/CatalogUrlDirective.java framework/widget/templates/htmlFormMacroLibrary.ftl

[hansbak-2]

Author: hansbak
Date: Thu Apr  5 11:30:30 2012
New Revision: 1309778

URL: http://svn.apache.org/viewvc?rev=1309778&view=rev
Log:
comment from jacopo, to revert changes from the freemarker down grade

Added:
    ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CatalogUrlDirective.java
      - copied unchanged from r986576, ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CatalogUrlDirective.java
Modified:
    ofbiz/trunk/applications/product/config/freemarkerTransforms.properties
    ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl

Modified: ofbiz/trunk/applications/product/config/freemarkerTransforms.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/freemarkerTransforms.properties?rev=1309778&r1=1309777&r2=1309778&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/freemarkerTransforms.properties (original)
+++ ofbiz/trunk/applications/product/config/freemarkerTransforms.properties Thu Apr  5 11:30:30 2012
@@ -21,5 +21,6 @@
 
 # entries are in the form: key=transform name, property=transform class name
 
-ofbizCatalogUrl=org.ofbiz.product.category.OfbizCatalogUrlTransform
 ofbizCatalogAltUrl=org.ofbiz.product.category.OfbizCatalogAltUrlTransform
+ofbizCatalogUrl=org.ofbiz.product.category.CatalogUrlDirective
+

Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1309778&r1=1309777&r2=1309778&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Thu Apr  5 11:30:30 2012
@@ -688,7 +688,7 @@ Parameter: lastViewName, String, optiona
 <li class="${paginateFirstStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxFirstUrl}')<#else>${firstUrl}</#if>">${paginateFirstLabel}</a><#else>-disabled"><span>${paginateFirstLabel}</span></#if></li>
 <li class="${paginatePreviousStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxPreviousUrl}')<#else>${previousUrl}</#if>">${paginatePreviousLabel}</a><#else>-disabled"><span>${paginatePreviousLabel}</span></#if></li>
 <#if listSize gt 0 && javaScriptEnabled><li class="nav-page-select">${pageLabel} <select name="page" size="1" onchange="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxSelectUrl}')<#else>location.href='${selectUrl}'+this.value;</#if>"><#rt/>
-<#assign x=Static["java.lang.Math"].floor(listSize/viewSize)>
+<#assign x=listSize/viewSize?floor>
 <#if listSize gt (viewIndex*viewSize)><#assign x=x+1></#if>
 <#list 1..x as i>
 <#if i == (viewIndex+1)><option selected="selected" value="<#else><option value="</#if>${i-1}">${i}</option>