You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2011/11/10 09:25:48 UTC
svn commit: r1200211 - in /ofbiz/trunk:
applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/
applications/order/webapp/ordermgr/entry/catalog/
applications/product/src/org/ofbiz/product/category/
specialpurpose/ecommerce/widget/ themes/tom...
Author: hansbak
Date: Thu Nov 10 08:25:48 2011
New Revision: 1200211
URL: http://svn.apache.org/viewvc?rev=1200211&view=rev
Log:
fix pagination in productlisting in the order entry screen, but still have different pagination in order and ecommerce
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java
ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml
ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy?rev=1200211&r1=1200210&r2=1200211&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy Thu Nov 10 08:25:48 2011
@@ -37,7 +37,7 @@ viewIndex = parameters.VIEW_INDEX;
currentCatalogId = CatalogWorker.getCurrentCatalogId(request);
// set the default view size
-defaultViewSize = request.getAttribute("defaultViewSize") ?: 10;
+defaultViewSize = request.getAttribute("defaultViewSize") ?: 20;
context.defaultViewSize = defaultViewSize;
// set the limit view
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=1200211&r1=1200210&r2=1200211&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl Thu Nov 10 08:25:48 2011
@@ -52,13 +52,13 @@ under the License.
</#list>
</select -->
<select name="pageSelect" onchange="callDocumentByPaginate(this[this.selectedIndex].value);">
- <option value="#">${uiLabelMap.CommonPage} ${viewIndex?int} ${uiLabelMap.CommonOf} ${viewIndexMax + 1}</option>
+ <option value="#">${uiLabelMap.CommonPage} ${viewIndex?int + 1} ${uiLabelMap.CommonOf} ${viewIndexMax + 1}</option>
<#list 0..viewIndexMax as curViewNum>
- <option value="${productCategoryId}~${viewSize}~${curViewNum?int + 1}">${uiLabelMap.CommonGotoPage} ${curViewNum + 1}</option>
+ <option value="${productCategoryId}~${viewSize}~${curViewNum?int}">${uiLabelMap.CommonGotoPage} ${curViewNum + 1}</option>
</#list>
</select>
<#-- End Page Select Drop-Down -->
- <#if (viewIndex?int > 1)>
+ <#if (viewIndex?int > 0)>
<#-- a href="<@ofbizUrl>category/~category_id=${productCategoryId}/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${viewIndex?int - 1}</...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a --> |
<a href="javascript: void(0);" onclick="callDocumentByPaginate('${productCategoryId}~${viewSize}~${viewIndex?int - 1}');" class="buttontext">${uiLabelMap.CommonPrevious}</a> |
</#if>
@@ -122,7 +122,21 @@ under the License.
</#if>
<#if productCategoryMembers?has_content>
- <@paginationControls/>
+ <#-- Pagination -->
+ <#if paginateEcommerceStyle?exists>
+ <@paginationControls/>
+ <#else>
+ <#include "component://common/webcommon/includes/htmlTemplate.ftl"/>
+ <#assign commonUrl = "category?category_id="+ parameters.category_id?if_exists + "&"/>
+ <#--assign viewIndex = viewIndex - 1/-->
+ <#assign viewIndexFirst = 0/>
+ <#assign viewIndexPrevious = viewIndex - 1/>
+ <#assign viewIndexNext = viewIndex + 1/>
+ <#assign viewIndexLast = Static["java.lang.Math"].floor(listSize/viewSize)/>
+ <#assign messageMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("lowCount", lowIndex, "highCount", highIndex, "total", listSize)/>
+ <#assign commonDisplaying = Static["org.ofbiz.base.util.UtilProperties"].getMessage("CommonUiLabels", "CommonDisplaying", messageMap, locale)/>
+ <@nextPrev commonUrl=commonUrl ajaxEnabled=false javaScriptEnabled=false paginateStyle="nav-pager" paginateFirstStyle="nav-first" viewIndex=viewIndex highIndex=highIndex listSize=listSize viewSize=viewSize ajaxFirstUrl="" firstUrl="" paginateFirstLabel="" paginatePreviousStyle="nav-previous" ajaxPreviousUrl="" previousUrl="" paginatePreviousLabel="" pageLabel="" ajaxSelectUrl="" selectUrl="" ajaxSelectSizeUrl="" selectSizeUrl="" commonDisplaying=commonDisplaying paginateNextStyle="nav-next" ajaxNextUrl="" nextUrl="" paginateNextLabel="" paginateLastStyle="nav-last" ajaxLastUrl="" lastUrl="" paginateLastLabel="" paginateViewSizeLabel="" />
+ </#if>
<#assign numCol = numCol?default(1)>
<#assign numCol = numCol?number>
<#assign tabCol = 1>
@@ -156,7 +170,9 @@ under the License.
</table>
</#if>
</div>
- <@paginationControls/>
+ <#if paginateEcommerceStyle?exists>
+ <@paginationControls/>
+ </#if>
<#else>
<hr />
<div>${uiLabelMap.ProductNoProductsInThisCategory}</div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl?rev=1200211&r1=1200210&r2=1200211&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl Thu Nov 10 08:25:48 2011
@@ -31,19 +31,19 @@ under the License.
<#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()>
<a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
<#else>
- <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
</#if>
<#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content>
<#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()>
<a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
<#else>
- <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
</#if>
<#else>
<#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()>
<a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?if_exists}</a>
<#else>
- <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a>
</#if>
</#if>
</div>
@@ -53,19 +53,19 @@ under the License.
<#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()>
<a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
<#else>
- <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
</#if>
<#elseif catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content>
<#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()>
<a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
<#else>
- <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
</#if>
<#else>
<#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()>
<a href="<@o...@ofbizUrl>" class="browsecategorybutton">${category.categoryName?if_exists}</a>
<#else>
- <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a>
</#if>
</#if>
</div>
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java?rev=1200211&r1=1200210&r2=1200211&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java Thu Nov 10 08:25:48 2011
@@ -238,11 +238,11 @@ public class CategoryServices {
Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
- int viewIndex = 1;
+ int viewIndex = 0;
try {
viewIndex = Integer.valueOf((String) context.get("viewIndexString")).intValue();
} catch (Exception e) {
- viewIndex = 1;
+ viewIndex = 0;
}
int viewSize = defaultViewSize;
@@ -266,8 +266,8 @@ public class CategoryServices {
if (limitView) {
// get the indexes for the partial list
- lowIndex = (((viewIndex - 1) * viewSize) + 1);
- highIndex = viewIndex * viewSize;
+ lowIndex = ((viewIndex * viewSize) + 1);
+ highIndex = (viewIndex + 1) * viewSize;
} else {
lowIndex = 0;
highIndex = 0;
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml?rev=1200211&r1=1200210&r2=1200211&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml Thu Nov 10 08:25:48 2011
@@ -211,6 +211,7 @@ under the License.
<field-map field-name="productCategoryId" from-field="productCategoryId"/>
<order-by field-name="sequenceNum"/>
</entity-and>
+ <set field="paginateEcommerceStyle" value="Y"/>
</actions>
<widgets>
<platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/categorydetail.ftl"/></html></platform-specific>
Modified: ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1200211&r1=1200210&r2=1200211&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css Thu Nov 10 08:25:48 2011
@@ -595,7 +595,7 @@ height: 5em;
float: right;
margin: 0.5em;
text-align: right;
-width: 13em;
+width: 15em;
}
.productsummary .productinfo { /* margin-left: 60px; */