svn commit: r811861 - in /ofbiz/branches/release09.04: ./ applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl

Author: jleroux
Date: Sun Sep  6 19:08:21 2009
New Revision: 811861

URL: http://svn.apache.org/viewvc?rev=811861&view=rev
Log:
"Applied fix from trunk for revision: 811860"
------------------------------------------------------------------------
r811860 | jleroux | 2009-09-06 21:04:43 +0200 (dim. 06 sept. 2009) | 1 ligne

A suggested fix by Ruth Hoffman at "categorydetail.ftl page select drop-down and pagination is not compatible with new screen called categorydetailmatrix.ftl. [Screen uses 3 columns per row to display products vs 1 column per row from older versions.]" (https://issues.apache.org/jira/browse/OFBIZ-2596) - OFBIZ-2596
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep  6 19:08:21 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
 836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
 836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860

Modified: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?rev=811861&r1=811860&r2=811861&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl (original)
+++ ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl Sun Sep  6 19:08:21 2009
@@ -19,7 +19,11 @@
 
 <#macro paginationControls>
     <#assign viewIndexMax = Static["java.lang.Math"].ceil((listSize - 1)?double / viewSize?double)>
-    <#if (viewIndexMax?int > 1)>
+      <#-- if the list size/view size (that is total number of items allowed on the page for this page)
+      is 0 or 1 then there is only 1 page of items - so display the pagination drop down anyhow
+      'cause its cool and people should see it.
+      -->
+      <#if (viewIndexMax?int > -1)>
         <div class="product-prevnext">
             <#-- Start Page Select Drop-Down -->
             <select name="pageSelect" onchange="window.location=this[this.selectedIndex].value;">
@@ -32,7 +36,7 @@
             <#if (viewIndex?int > 1)>
                 <a href="<@ofbizUrl>category/~category_id=${productCategoryId}/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${viewIndex?int - 1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> |
             </#if>
-            <#if (listSize?int > 0)>
+            <#if ((listSize?int - viewSize?int) > 0)>
                 <span>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
             </#if>
             <#if highIndex?int < listSize?int>