Author: jonesde
Date: Sat Jan 20 21:52:14 2007
New Revision: 498248
URL: http://svn.apache.org/viewvc?view=rev&rev=498248
Log:
A few misc cleanups in the feature area; the big change here is to use
categoryName, etc as a priority over description, etc though both are still
supported; this should have been done a long time ago but when the categoryName
field is added it was done poorly
Modified:
ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml
ofbiz/trunk/applications/ecommerce/data/DemoProductCategoriesI18nData.xml
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl
ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl
ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
Modified: ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml?view=diff&rev=498248&r1=498247&r2=498248
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml (original)
+++ ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml Sat Jan 20 21:52:14
2007
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
-Copyright 2001-2006 The Apache Software Foundation
-
Licensed under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
the License at
@@ -96,7 +93,7 @@
<ProductStoreCatalog productStoreId="9000" prodCatalogId="DemoCatalog"
fromDate="2001-05-13 12:00:00.0" sequenceNum="1"/>
<ProductStoreCatalog productStoreId="9000" prodCatalogId="TestCatalog"
fromDate="2001-05-13 12:00:00.0" sequenceNum="2"/>
- <ProductCategory description="Demo Browse Root"
+ <ProductCategory categoryName="Demo Browse Root"
longDescription="Demo Catalog Primary Browse Root Category"
productCategoryId="CATALOG1" productCategoryTypeId="CATALOG_CATEGORY"/>
<ProductCategory longDescription="long description of Gizmos"
primaryParentCategoryId="CATALOG1" productCategoryId="100"
productCategoryTypeId="CATALOG_CATEGORY"/>
@@ -116,20 +113,20 @@
primaryParentCategoryId="201" productCategoryId="2012"
productCategoryTypeId="CATALOG_CATEGORY"/>
<ProductCategory longDescription="long description of Micro Widgets"
primaryParentCategoryId="2011" productCategoryId="20111"
productCategoryTypeId="CATALOG_CATEGORY"/>
- <ProductCategory description="Featured Products"
productCategoryId="PROMOTIONS" productCategoryTypeId="CATALOG_CATEGORY"/>
- <ProductCategory description="Demo Default Search"
+ <ProductCategory categoryName="Featured Products"
productCategoryId="PROMOTIONS" productCategoryTypeId="CATALOG_CATEGORY"/>
+ <ProductCategory categoryName="Demo Default Search"
longDescription="Catalog1 Search Products - only products in this
category will show up in a search in catalog1"
productCategoryId="CATALOG1_SEARCH"
productCategoryTypeId="SEARCH_CATEGORY"/>
- <ProductCategory description="Main Quick Add"
+ <ProductCategory categoryName="Main Quick Add"
longDescription="For quick orders, you have found the right place!"
productCategoryId="CATALOG1_QUICKADD1"
productCategoryTypeId="QUICKADD_CATEGORY"/>
- <ProductCategory description="Widget Quick Add"
+ <ProductCategory categoryName="Widget Quick Add"
longDescription="Get all you widgets here!"
productCategoryId="CATALOG1_QUICKADD2"
productCategoryTypeId="QUICKADD_CATEGORY"/>
- <ProductCategory description="Test Limited Admin Category"
+ <ProductCategory categoryName="Test Limited Admin Category"
longDescription="Test Limited Admin Category"
productCategoryId="TSTLTDADMIN" productCategoryTypeId="CATALOG_CATEGORY"/>
<ProductCategoryRole productCategoryId="TSTLTDADMIN" partyId="ltdadmin"
roleTypeId="LTD_ADMIN" fromDate="2001-05-13 12:00:00.0"/>
- <ProductCategory description="Test Cross Sell Category"
+ <ProductCategory categoryName="Test Cross Sell Category"
longDescription="Test Cross Sell Category" productCategoryId="TSTCSL"
productCategoryTypeId="CROSS_SELL_CATEGORY"/>
<ProdCatalogCategory prodCatalogId="DemoCatalog"
productCategoryId="CATALOG1" fromDate="2001-05-13 12:00:00.0"
Modified:
ofbiz/trunk/applications/ecommerce/data/DemoProductCategoriesI18nData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoProductCategoriesI18nData.xml?view=diff&rev=498248&r1=498247&r2=498248
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/DemoProductCategoriesI18nData.xml
(original)
+++ ofbiz/trunk/applications/ecommerce/data/DemoProductCategoriesI18nData.xml
Sat Jan 20 21:52:14 2007
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright 2001-2006 The Apache Software Foundation
-
Licensed under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
the License at
@@ -28,7 +26,7 @@
<Content contentId="C100DESCIT" contentTypeId="DOCUMENT"
dataResourceId="DR100DESCIT" description="DESCRIPTION IT Gizmos"
localeString="it" />
<Content contentId="C100DESCEN" contentTypeId="DOCUMENT"
dataResourceId="DR100DESCEN" description="DESCRIPTION EN Gizmos"
localeString="en"/>
- <ProductCategoryContent productCategoryId="100" contentId="C100DESCEN"
prodCatContentTypeId="DESCRIPTION" fromDate="2006-09-22 00:00:00.0"/>
+ <ProductCategoryContent productCategoryId="100" contentId="C100DESCEN"
prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="C100DESCEN" contentIdTo="C100DESCIT"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="C100DESCEN" contentIdTo="C100DESCFR"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
@@ -46,7 +44,7 @@
<Content contentId="C101DESCIT" contentTypeId="DOCUMENT"
dataResourceId="DR101DESCIT" description="DESCRIPTION IT Piccolo Gizmos"
localeString="it" />
<Content contentId="C101DESCEN" contentTypeId="DOCUMENT"
dataResourceId="DR101DESCEN" description="DESCRIPTION EN Small Gizmos"
localeString="en"/>
- <ProductCategoryContent productCategoryId="101" contentId="C101DESCEN"
prodCatContentTypeId="DESCRIPTION" fromDate="2006-09-22 00:00:00.0"/>
+ <ProductCategoryContent productCategoryId="101" contentId="C101DESCEN"
prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="C101DESCEN" contentIdTo="C101DESCFR"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="C101DESCEN" contentIdTo="C101DESCIT"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
@@ -64,7 +62,7 @@
<Content contentId="C102DESCIT" contentTypeId="DOCUMENT"
dataResourceId="DR102DESCIT" description="DESCRIPTION IT Grande Gizmos"
localeString="it" />
<Content contentId="C102DESCEN" contentTypeId="DOCUMENT"
dataResourceId="DR102DESCEN" description="DESCRIPTION IT Large Gizmos"
localeString="en"/>
- <ProductCategoryContent productCategoryId="102" contentId="C102DESCEN"
prodCatContentTypeId="DESCRIPTION" fromDate="2006-09-22 00:00:00.0"/>
+ <ProductCategoryContent productCategoryId="102" contentId="C102DESCEN"
prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="C102DESCEN" contentIdTo="C102DESCIT"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="C102DESCEN" contentIdTo="C102DESCFR"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
@@ -82,7 +80,7 @@
<Content contentId="C200DESCIT" contentTypeId="DOCUMENT"
dataResourceId="DR200DESCIT" description="DESCRIPTION IT Gizmos"
localeString="it" />
<Content contentId="C200DESCEN" contentTypeId="DOCUMENT"
dataResourceId="DR200DESCEN" description="DESCRIPTION EN Gizmos"
localeString="en"/>
- <ProductCategoryContent productCategoryId="200" contentId="C200DESCEN"
prodCatContentTypeId="DESCRIPTION" fromDate="2006-09-22 00:00:00.0"/>
+ <ProductCategoryContent productCategoryId="200" contentId="C200DESCEN"
prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="C200DESCEN" contentIdTo="C200DESCIT"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="C200DESCEN" contentIdTo="C200DESCFR"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
@@ -100,7 +98,7 @@
<Content contentId="C201DESCIT" contentTypeId="DOCUMENT"
dataResourceId="DR201DESCIT" description="DESCRIPTION IT Piccolo Widgets"
localeString="it" />
<Content contentId="C201DESCEN" contentTypeId="DOCUMENT"
dataResourceId="DR201DESCEN" description="DESCRIPTION EN Small Widgets"
localeString="en"/>
- <ProductCategoryContent productCategoryId="201" contentId="C201DESCEN"
prodCatContentTypeId="DESCRIPTION" fromDate="2006-09-22 00:00:00.0"/>
+ <ProductCategoryContent productCategoryId="201" contentId="C201DESCEN"
prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="C201DESCEN" contentIdTo="C201DESCFR"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="C201DESCEN" contentIdTo="C201DESCIT"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
@@ -118,7 +116,7 @@
<Content contentId="C2012DESCIT" contentTypeId="DOCUMENT"
dataResourceId="DR2012DESCIT" description="DESCRIPTION IT Altro Piccolo
Widgets" localeString="it" />
<Content contentId="C2012DESCEN" contentTypeId="DOCUMENT"
dataResourceId="DR2012DESCEN" description="DESCRIPTION EN Other Mini Widgets"
localeString="en"/>
- <ProductCategoryContent productCategoryId="2012" contentId="C2012DESCEN"
prodCatContentTypeId="DESCRIPTION" fromDate="2006-09-22 00:00:00.0"/>
+ <ProductCategoryContent productCategoryId="2012" contentId="C2012DESCEN"
prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="C2012DESCEN" contentIdTo="C2012DESCFR"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="C2012DESCEN" contentIdTo="C2012DESCIT"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
@@ -136,7 +134,7 @@
<Content contentId="C2011DESCIT" contentTypeId="DOCUMENT"
dataResourceId="DR2011DESCIT" description="DESCRIPTION IT Mini Widgets"
localeString="it" />
<Content contentId="C2011DESCEN" contentTypeId="DOCUMENT"
dataResourceId="DR2011DESCEN" description="DESCRIPTION EN Mini Widgets"
localeString="en"/>
- <ProductCategoryContent productCategoryId="2011" contentId="C2011DESCEN"
prodCatContentTypeId="DESCRIPTION" fromDate="2006-09-22 00:00:00.0"/>
+ <ProductCategoryContent productCategoryId="2011" contentId="C2011DESCEN"
prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="C2011DESCEN" contentIdTo="C2011DESCFR"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="C2011DESCEN" contentIdTo="C2011DESCIT"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
@@ -154,7 +152,7 @@
<Content contentId="C20111DESCIT" contentTypeId="DOCUMENT"
dataResourceId="DR20111DESCIT" description="DESCRIPTION IT Micro Widgets"
localeString="it" />
<Content contentId="C20111DESCEN" contentTypeId="DOCUMENT"
dataResourceId="DR20111DESCEN" description="DESCRIPTION EN Micro Widgets"
localeString="en"/>
- <ProductCategoryContent productCategoryId="20111" contentId="C20111DESCEN"
prodCatContentTypeId="DESCRIPTION" fromDate="2006-09-22 00:00:00.0"/>
+ <ProductCategoryContent productCategoryId="20111" contentId="C20111DESCEN"
prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="C20111DESCEN" contentIdTo="C20111DESCFR"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="C20111DESCEN" contentIdTo="C20111DESCIT"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
@@ -172,7 +170,7 @@
<Content contentId="C202DESCIT" contentTypeId="DOCUMENT"
dataResourceId="DR202DESCIT" description="DESCRIPTION IT Grande Widgets"
localeString="it" />
<Content contentId="C202DESCEN" contentTypeId="DOCUMENT"
dataResourceId="DR202DESCEN" description="DESCRIPTION IT Large Widgets"
localeString="en"/>
- <ProductCategoryContent productCategoryId="202" contentId="C202DESCEN"
prodCatContentTypeId="DESCRIPTION" fromDate="2006-09-22 00:00:00.0"/>
+ <ProductCategoryContent productCategoryId="202" contentId="C202DESCEN"
prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="C202DESCEN" contentIdTo="C202DESCIT"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="C202DESCEN" contentIdTo="C202DESCFR"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
@@ -190,7 +188,7 @@
<Content contentId="CGC-100DESCIT" contentTypeId="DOCUMENT"
dataResourceId="DRGC-100DESCIT" description="DESCRIPTION IT Carte regalo"
localeString="it" />
<Content contentId="CGC-100DESCEN" contentTypeId="DOCUMENT"
dataResourceId="DRGC-100DESCEN" description="DESCRIPTION EN Gift Cards"
localeString="en"/>
- <ProductCategoryContent productCategoryId="GC-100"
contentId="CGC-100DESCEN" prodCatContentTypeId="DESCRIPTION"
fromDate="2006-09-22 00:00:00.0"/>
+ <ProductCategoryContent productCategoryId="GC-100"
contentId="CGC-100DESCEN" prodCatContentTypeId="CATEGORY_NAME"
fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="CGC-100DESCEN" contentIdTo="CGC-100DESCIT"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="CGC-100DESCEN" contentIdTo="CGC-100DESCFR"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
@@ -208,7 +206,7 @@
<Content contentId="CGC-101DESCIT" contentTypeId="DOCUMENT"
dataResourceId="DRGC-101DESCIT" description="DESCRIPTION IT Acquisto di carta
regalo" localeString="it" />
<Content contentId="CGC-101DESCEN" contentTypeId="DOCUMENT"
dataResourceId="DRGC-101DESCEN" description="DESCRIPTION IT Gift Cards
Purchase" localeString="en"/>
- <ProductCategoryContent productCategoryId="GC-101"
contentId="CGC-101DESCEN" prodCatContentTypeId="DESCRIPTION"
fromDate="2006-09-22 00:00:00.0"/>
+ <ProductCategoryContent productCategoryId="GC-101"
contentId="CGC-101DESCEN" prodCatContentTypeId="CATEGORY_NAME"
fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="CGC-101DESCEN" contentIdTo="CGC-101DESCIT"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="CGC-101DESCEN" contentIdTo="CGC-101DESCFR"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
@@ -226,7 +224,7 @@
<Content contentId="CGC-102DESCIT" contentTypeId="DOCUMENT"
dataResourceId="DRGC-102DESCIT" description="DESCRIPTION IT Ricaricano di carte
regalo" localeString="it" />
<Content contentId="CGC-102DESCEN" contentTypeId="DOCUMENT"
dataResourceId="DRGC-102DESCEN" description="DESCRIPTION EN Gift Cards Reload"
localeString="en"/>
- <ProductCategoryContent productCategoryId="GC-102"
contentId="CGC-102DESCEN" prodCatContentTypeId="DESCRIPTION"
fromDate="2006-09-22 00:00:00.0"/>
+ <ProductCategoryContent productCategoryId="GC-102"
contentId="CGC-102DESCEN" prodCatContentTypeId="CATEGORY_NAME"
fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="CGC-102DESCEN" contentIdTo="CGC-102DESCFR"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="CGC-102DESCEN" contentIdTo="CGC-102DESCIT"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
@@ -244,9 +242,8 @@
<Content contentId="CPC-100DESCIT" contentTypeId="DOCUMENT"
dataResourceId="DRPC-100DESCIT" description="DESCRIPTION IT Computer
configurabili" localeString="it" />
<Content contentId="CPC-100DESCEN" contentTypeId="DOCUMENT"
dataResourceId="DRPC-100DESCEN" description="DESCRIPTION EN Configurables PCs"
localeString="en"/>
- <ProductCategoryContent productCategoryId="PC-100"
contentId="CPC-100DESCEN" prodCatContentTypeId="DESCRIPTION"
fromDate="2006-09-22 00:00:00.0"/>
+ <ProductCategoryContent productCategoryId="PC-100"
contentId="CPC-100DESCEN" prodCatContentTypeId="CATEGORY_NAME"
fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="CPC-100DESCEN" contentIdTo="CPC-100DESCIT"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
<ContentAssoc contentId="CPC-100DESCEN" contentIdTo="CPC-100DESCFR"
contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-09-22 00:00:00.0"/>
-
</entity-engine-xml>
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl?view=diff&rev=498248&r1=498247&r2=498248
==============================================================================
---
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl
(original)
+++
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl
Sat Jan 20 21:52:14 2007
@@ -1,7 +1,4 @@
<#--
-
-Copyright 2001-2006 The Apache Software Foundation
-
Licensed under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
the License at
@@ -26,18 +23,22 @@
<#if curCategoryId?exists && curCategoryId == category.productCategoryId>
<div class="browsecategorytext">
- <#if catContentWrappers?exists &&
catContentWrappers[category.productCategoryId]?exists &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
+ <#if catContentWrappers?exists &&
catContentWrappers[category.productCategoryId]?exists &&
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?exists>
+ - <a
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
+ <#elseif catContentWrappers?exists &&
catContentWrappers[category.productCategoryId]?exists &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
- <a
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
<#else>
- - <a
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybuttondisabled">${category.description?if_exists}</a>
+ - <a
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybuttondisabled">${category.categoryName?default(category.description)}</a>
</#if>
</div>
<#else>
<div class="browsecategorytext">
- <#if catContentWrappers?exists &&
catContentWrappers[category.productCategoryId]?exists &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
+ <#if catContentWrappers?exists &&
catContentWrappers[category.productCategoryId]?exists &&
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?exists>
+ - <a
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
+ <#elseif catContentWrappers?exists &&
catContentWrappers[category.productCategoryId]?exists &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
- <a
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
<#else>
- - <a
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybutton">${category.description?if_exists}</a>
+ - <a
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybutton">${category.categoryName?default(category.description)}</a>
</#if>
</div>
</#if>
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?view=diff&rev=498248&r1=498247&r2=498248
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
Sat Jan 20 21:52:14 2007
@@ -1,7 +1,4 @@
<#--
-
-Copyright 2001-2006 The Apache Software Foundation
-
Licensed under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
the License at
@@ -25,7 +22,13 @@
</#if>
<#if curCategoryId?exists && curCategoryId == category.productCategoryId>
<div class="browsecategorytext">
- <#if catContentWrappers?exists &&
catContentWrappers[category.productCategoryId]?exists &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
+ <#if catContentWrappers?exists &&
catContentWrappers[category.productCategoryId]?exists &&
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content>
+ <#if sessionAttributes.shoppingCart?exists &&
sessionAttributes.shoppingCart.isPurchaseOrder()>
+ - <a
href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
+ <#else>
+ - <a
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@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="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
<#else>
@@ -33,15 +36,21 @@
</#if>
<#else>
<#if sessionAttributes.shoppingCart?exists &&
sessionAttributes.shoppingCart.isPurchaseOrder()>
- - <a
href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybuttondisabled">${category.description?if_exists}</a>
+ - <a
href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybuttondisabled">${category.categoryName?if_exists}</a>
<#else>
- - <a
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybuttondisabled">${category.description?if_exists}</a>
+ - <a
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybuttondisabled">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a>
</#if>
</#if>
</div>
<#else>
<div class="browsecategorytext">
- <#if
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
+ <#if
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content>
+ <#if sessionAttributes.shoppingCart?exists &&
sessionAttributes.shoppingCart.isPurchaseOrder()>
+ - <a
href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
+ <#else>
+ - <a
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@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="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
<#else>
@@ -49,9 +58,9 @@
</#if>
<#else>
<#if sessionAttributes.shoppingCart?exists &&
sessionAttributes.shoppingCart.isPurchaseOrder()>
- - <a
href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybutton">${category.description?if_exists}</a>
+ - <a
href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybutton">${category.categoryName?if_exists}</a>
<#else>
- - <a
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybutton">${category.description?if_exists}</a>
+ - <a
href="<@ofbizUrl>category/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybutton">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a>
</#if>
</#if>
</div>
Modified:
ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml?view=diff&rev=498248&r1=498247&r2=498248
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
Sat Jan 20 21:52:14 2007
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
-Copyright 2001-2006 The Apache Software Foundation
-
Licensed under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
the License at
@@ -48,7 +45,7 @@
</field>
<field
use-when="productFeature!=null&&productFeature.getString("productFeatureCategoryId")!=null"
name="categoryLink" title="" widget-style="buttontext">
<hyperlink
target="/EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeature.productFeatureCategoryId}"
target-type="intra-app"
- description="[${uiLabelMap.ProductGoToFeatureCategory}
${productFeature.productFeatureCategoryId}]" also-hidden="false"/>
+ description="${uiLabelMap.ProductGoToFeatureCategory}
${productFeature.productFeatureCategoryId}" also-hidden="false"/>
</field>
<field name="description" title="${uiLabelMap.CommonDescription}"/>
@@ -105,7 +102,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"
widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="" widget-style="buttontext">
<hyperlink
target="removeSupplierProductFeature?productFeatureId=${productFeatureId}&partyId=${partyId}"
- description="[${uiLabelMap.CommonDelete}]"/>
+ description="${uiLabelMap.CommonDelete}"/>
</field>
</form>
@@ -117,10 +114,10 @@
<field name="parentTypeId"><hidden/></field>
<field name="hasTable"><hidden/></field>
<field name="editFeatureType" title="${uiLabelMap.CommonEdit}"
widget-style="buttontext">
- <hyperlink
target="EditFeatureType?productFeatureTypeId=${productFeatureTypeId}"
description="[${uiLabelMap.CommonEdit}]"/>
+ <hyperlink
target="EditFeatureType?productFeatureTypeId=${productFeatureTypeId}"
description="${uiLabelMap.CommonEdit}"/>
</field>
<field name="removeFeatureType" title="${uiLabelMap.CommonDelete}"
widget-style="buttontext">
- <hyperlink
target="removeProductFeatureType?productFeatureTypeId=${productFeatureTypeId}"
description="[${uiLabelMap.CommonDelete}]"/>
+ <hyperlink
target="removeProductFeatureType?productFeatureTypeId=${productFeatureTypeId}"
description="${uiLabelMap.CommonDelete}"/>
</field>
</form>
<form name="EditFeatureType" type="single"
@@ -137,6 +134,7 @@
</entity-options>
</drop-down>
</field>
+ <field name="hasTable"><hidden/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListFeatureGroupAppls" type="multi" use-row-submit="false"
@@ -154,7 +152,7 @@
</field>
<field name="sequenceNum"><text size="3"/></field>
<field name="removeFeatureGroupAppl"
title="${uiLabelMap.CommonRemove}" widget-style="buttontext">
- <hyperlink
target="RemoveProductFeatureGroupAppl?productFeatureGroupId=${productFeatureGroupId}&productFeatureId=${productFeatureId}&fromDate=${fromDate}"
description="[${uiLabelMap.CommonRemove}]"/>
+ <hyperlink
target="RemoveProductFeatureGroupAppl?productFeatureGroupId=${productFeatureGroupId}&productFeatureId=${productFeatureId}&fromDate=${fromDate}"
description="${uiLabelMap.CommonRemove}"/>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"
widget-style="smallSubmit">
<submit/>
Modified: ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl?view=diff&rev=498248&r1=498247&r2=498248
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl Sat
Jan 20 21:52:14 2007
@@ -1,7 +1,4 @@
<#--
-
-Copyright 2001-2006 The Apache Software Foundation
-
Licensed under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
the License at
@@ -14,8 +11,6 @@
License for the specific language governing permissions and limitations
under the License.
-->
-<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap =
requestAttributes.uiLabelMap></#if>
-
<div class="screenlet">
<div class="screenlet-header">
<div class="simple-right-small">
@@ -39,7 +34,7 @@
<div style='margin-left: 10px;'>
<#list prodCatalogCategories as prodCatalogCategory>
<#assign productCategory =
prodCatalogCategory.getRelatedOneCache("ProductCategory")>
- <div class='browsecategorytext'>- <a
href='<@ofbizUrl>EditCategory?CATALOG_TOP_CATEGORY=${prodCatalogCategory.productCategoryId}&productCategoryId=${prodCatalogCategory.productCategoryId}</@ofbizUrl>'
class="browsecategorybutton">${(productCategory.description)?if_exists}</a></div>
+ <div class='browsecategorytext'>- <a
href='<@ofbizUrl>EditCategory?CATALOG_TOP_CATEGORY=${prodCatalogCategory.productCategoryId}&productCategoryId=${prodCatalogCategory.productCategoryId}</@ofbizUrl>'
class="browsecategorybutton">${(productCategory.categoryName)?default(productCategory.description)?default(productCategory.productCategoryId)}</a></div>
</#list>
</div>
<#else>
@@ -50,4 +45,3 @@
</div>
</#if>
</div>
-
Modified:
ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl?view=diff&rev=498248&r1=498247&r2=498248
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl
Sat Jan 20 21:52:14 2007
@@ -11,7 +11,6 @@
License for the specific language governing permissions and limitations
under the License.
-->
-<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap =
requestAttributes.uiLabelMap></#if>
<#-- looping macro -->
<#macro categoryList parentCategory category>
@@ -20,18 +19,22 @@
</#if>
<#if curCategoryId?exists && curCategoryId == category.productCategoryId>
<div class="browsecategorytext">
- <#if catContentWrappers?exists &&
catContentWrappers[category.productCategoryId]?exists &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
+ <#if catContentWrappers?exists &&
catContentWrappers[category.productCategoryId]?exists &&
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content>
+ - <a
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}
[${category.productCategoryId}]</a>
+ <#elseif catContentWrappers?exists &&
catContentWrappers[category.productCategoryId]?exists &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content>
- <a
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}
[${category.productCategoryId}]</a>
- <#else>
- - <a
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybuttondisabled">${category.description?if_exists}
[${category.productCategoryId}]</a>
+ <#else>
+ - <a
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybuttondisabled">${category.categoryName?default(category.description)?if_exists}
[${category.productCategoryId}]</a>
</#if>
</div>
<#else>
<div class="browsecategorytext">
- <#if catContentWrappers?exists &&
catContentWrappers[category.productCategoryId]?exists &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
+ <#if catContentWrappers?exists &&
catContentWrappers[category.productCategoryId]?exists &&
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content>
+ - <a
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}
[${category.productCategoryId}]</a>
+ <#elseif catContentWrappers?exists &&
catContentWrappers[category.productCategoryId]?exists &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content>
- <a
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}
[${category.productCategoryId}]</a>
- <#else>
- - <a
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybutton">${category.description?if_exists}
[${category.productCategoryId}]</a>
+ <#else>
+ - <a
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>"
class="browsecategorybutton">${category.categoryName?default(category.description)?if_exists}
[${category.productCategoryId}]</a>
</#if>
</div>
</#if>
@@ -65,9 +68,9 @@
<div style='margin-left: 10px;'>
<#if currentTopCategory?exists>
<#if curCategoryId?exists && curCategoryId ==
currentTopCategory.productCategoryId>
- <div class='tabletext' style='text-indent:
-10px;'><b>- ${currentTopCategory.description?default("No Description")}
[${currentTopCategory.productCategoryId}]</b></div>
+ <div class='tabletext' style='text-indent:
-10px;'><b>- ${currentTopCategory.categoryName?default("No Name")}
[${currentTopCategory.productCategoryId}]</b></div>
<#else>
- <div class='browsecategorytext'>- <a
href="<@ofbizUrl>EditCategory?productCategoryId=${currentTopCategory.productCategoryId}</@ofbizUrl>"
class='browsecategorybutton'>${currentTopCategory.description?if_exists}
[${currentTopCategory.productCategoryId}]</a></div>
+ <div class='browsecategorytext'>- <a
href="<@ofbizUrl>EditCategory?productCategoryId=${currentTopCategory.productCategoryId}</@ofbizUrl>"
class='browsecategorybutton'>${currentTopCategory.categoryName?default(currentTopCategory.description)?if_exists}
[${currentTopCategory.productCategoryId}]</a></div>
</#if>
</#if>
<div style='margin-left: 10px;'>
Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?view=diff&rev=498248&r1=498247&r2=498248
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Sat Jan
20 21:52:14 2007
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
-Copyright 2001-2006 The Apache Software Foundation
-
Licensed under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
the License at
@@ -96,7 +93,7 @@
<decorator-screen name="CommonFeatureDecorator">
<decorator-section name="body">
<container>
- <link target="EditFeatureType"
text="[${uiLabelMap.ProductNewFeatureType}]" style="buttontext"/>
+ <link target="EditFeatureType"
text="${uiLabelMap.ProductNewFeatureType}" style="buttontext"/>
</container>
<include-form name="ListFeatureTypes"
location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
</decorator-section>
