Return-Path: 
 <commits-return-7538-apmail-ofbiz-commits-archive=ofbiz.apache.org@ofbiz.apache.org>
Delivered-To: apmail-ofbiz-commits-archive@www.apache.org
Received: (qmail 45368 invoked from network); 9 Jun 2008 21:33:30 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 9 Jun 2008 21:33:30 -0000
Received: (qmail 42290 invoked by uid 500); 9 Jun 2008 21:33:33 -0000
Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org
Received: (qmail 42148 invoked by uid 500); 9 Jun 2008 21:33:33 -0000
Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ofbiz.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ofbiz.apache.org>
List-Post: <mailto:commits@ofbiz.apache.org>
List-Id: <commits.ofbiz.apache.org>
Reply-To: dev@ofbiz.apache.org
Delivered-To: mailing list commits@ofbiz.apache.org
Received: (qmail 42139 invoked by uid 99); 9 Jun 2008 21:33:33 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jun 2008 14:33:33 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jun 2008 21:32:44 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 04C882388A03; Mon,  9 Jun 2008 14:33:07 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r665899 - in /ofbiz/trunk:
 applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
 framework/images/webapp/images/ecommain.css
Date: Mon, 09 Jun 2008 21:33:06 -0000
To: commits@ofbiz.apache.org
From: jleroux@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080609213307.04C882388A03@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jleroux
Date: Mon Jun  9 14:33:06 2008
New Revision: 665899

URL: http://svn.apache.org/viewvc?rev=665899&view=rev
Log:
A patch from Bruno Busco "Pagination controls should not be displayed on a single page list" (https://issues.apache.org/jira/browse/OFBIZ-1827) - OFBIZ-1827

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
    ofbiz/trunk/framework/images/webapp/images/ecommain.css

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?rev=665899&r1=665898&r2=665899&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl Mon Jun  9 14:33:06 2008
@@ -17,6 +17,32 @@
 under the License.
 -->
 
+<#macro paginationControls>
+    <#assign viewIndexMax = Static["java.lang.Math"].ceil((listSize - 1)?double / viewSize?double)>
+    <#if (viewIndexMax?int > 1)>
+        <div class="product-prevnext">
+            <#-- Start Page Select Drop-Down -->
+            <select name="pageSelect" onchange="window.location=this[this.selectedIndex].value;">
+                <option value="#">${uiLabelMap.CommonPage} ${viewIndex?int} ${uiLabelMap.CommonOf} ${viewIndexMax + 1}</option>
+                <#list 0..viewIndexMax as curViewNum>
+                     <option value="<@ofbizUrl>category/~category_id=${productCategoryId}/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${curViewNum?int + 1}</@ofbizUrl>">${uiLabelMap.CommonGotoPage} ${curViewNum + 1}</option>
+                </#list>
+            </select>
+            <#-- End Page Select Drop-Down -->
+            <#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)>
+                <span class="tabletext">${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
+            </#if>
+            <#if highIndex?int < listSize?int>
+             | <a href="<@ofbizUrl>category/~category_id=${productCategoryId}/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${viewIndex?int + 1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
+            </#if>
+        </div>
+    </#if>
+</#macro>
+
+
 <#if productCategory?exists>
     <h1>
         <div>${categoryContentWrapper.get("CATEGORY_NAME")?if_exists}</div>
@@ -58,29 +84,7 @@
 </#if>
 
 <#if productCategoryMembers?has_content>
-    <div class="product-prevnext">
-      <#-- Start Page Select Drop-Down -->
-      <#assign viewIndexMax = Static["java.lang.Math"].ceil((listSize - 1)?double / viewSize?double)>
-      <select name="pageSelect" onchange="window.location=this[this.selectedIndex].value;">
-        <option value="#">${uiLabelMap.CommonPage} ${viewIndex?int} ${uiLabelMap.CommonOf} ${viewIndexMax + 1}</option>
-        <#list 0..viewIndexMax as curViewNum>
-          <option value="<@ofbizUrl>category/~category_id=${productCategoryId}/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${curViewNum?int + 1}</@ofbizUrl>">${uiLabelMap.CommonGotoPage} ${curViewNum + 1}</option>
-        </#list>
-      </select>
-      <#-- End Page Select Drop-Down -->
-      <b>
-        <#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)>
-          <span class="tabletext">${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
-        </#if>
-        <#if highIndex?int < listSize?int>
-          | <a href="<@ofbizUrl>category/~category_id=${productCategoryId}/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${viewIndex?int + 1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
-        </#if>
-      </b>
-    </div>
-
+    <@paginationControls/>
     <div class="productsummary-container">
         <#list productCategoryMembers as productCategoryMember>
             ${setRequestAttribute("optProductId", productCategoryMember.productId)}
@@ -89,30 +93,7 @@
             ${screens.render(productsummaryScreen)}
         </#list>
     </div>
-
-    <div class="product-prevnext">
-      <#-- Start Page Select Drop-Down -->
-      <#assign viewIndexMax = Static["java.lang.Math"].ceil((listSize - 1)?double / viewSize?double)>
-      <select name="pageSelect" onchange="window.location=this[this.selectedIndex].value;">
-        <option value="#">${uiLabelMap.CommonPage} ${viewIndex?int} ${uiLabelMap.CommonOf} ${viewIndexMax + 1}</option>
-        <#list 0..viewIndexMax as curViewNum>
-          <option value="<@ofbizUrl>category/~category_id=${productCategoryId}/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${curViewNum?int + 1}</@ofbizUrl>">${uiLabelMap.CommonGotoPage} ${curViewNum + 1}</option>
-        </#list>
-      </select>
-      <#-- End Page Select Drop-Down -->
-      <b>
-        <#if (viewIndex?int > 1)>
-          <a href="<@ofbizUrl>category?category_id=${productCategoryId}&amp;VIEW_SIZE=${viewSize}&amp;VIEW_INDEX=${viewIndex?int - 1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> |
-        </#if>
-        <#if (listSize?int > 0)>
-          <span class="tabletext">${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
-        </#if>
-        <#if highIndex?int < listSize?int>
-          | <a href="<@ofbizUrl>category?category_id=${productCategoryId}&amp;VIEW_SIZE=${viewSize}&amp;VIEW_INDEX=${viewIndex?int + 1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
-        </#if>
-      </b>
-    </div>
-
+    <@paginationControls/>
 <#else>
     <div><hr class='sepbar'/></div>
     <div class='tabletext'>${uiLabelMap.ProductNoProductsInThisCategory}</div>

Modified: ofbiz/trunk/framework/images/webapp/images/ecommain.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/ecommain.css?rev=665899&r1=665898&r2=665899&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/ecommain.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/ecommain.css Mon Jun  9 14:33:06 2008
@@ -885,6 +885,10 @@
 text-align: right;
 }
 
+.product-prevnext .tabletext {
+font-weight: bold;
+}
+
 .productcategorylink-container {
 position: relative;
 margin-top: 10px;
@@ -991,4 +995,4 @@
 .bothclear{
 height:1%;
 clear: both;
-}
\ No newline at end of file
+}