svn commit: r786388 - /ofbiz/branches/release09.04/framework/widget/templates/htmlFormMacroLibrary.ftl

[ja...@apache.org]

Author: jacopoc
Date: Fri Jun 19 06:33:13 2009
New Revision: 786388

URL: http://svn.apache.org/viewvc?rev=786388&view=rev
Log:
Applied fix from trunk for revision: 786387 
 Applied fix for pagination in new macro renderers from Guo Weizhan: OFBIZ-2549

Modified:
    ofbiz/branches/release09.04/framework/widget/templates/htmlFormMacroLibrary.ftl

Modified: ofbiz/branches/release09.04/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=786388&r1=786387&r2=786388&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/release09.04/framework/widget/templates/htmlFormMacroLibrary.ftl Fri Jun 19 06:33:13 2009
@@ -423,7 +423,7 @@
 <li class="${paginateFirstStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxFirstUrl}')<#else>${firstUrl}</#if>">${paginateFirstLabel}</a><#else>-disabled">${paginateFirstLabel}</#if></li>
 <li class="${paginatePreviousStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxPreviousUrl}')<#else>${previousUrl}</#if>">${paginatePreviousLabel}</a><#else>-disabled">${paginatePreviousLabel}</#if></li>
 <#if listSize gt 0 && javaScriptEnabled><li>${pageLabel}<select name="page" size="1" onchange="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxSelectUrl}')<#else>location.href='${selectUrl}'+this.value;</#if>"><#rt/>
-<#assign x=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 value="<#else><option value="</#if>${i-1}">${i}</option>