-
-
- <#assign sortList = Static["org.ofbiz.base.util.UtilMisc"].toList("prodCatalogCategoryTypeId", "sequenceNum", "productCategoryId")>
- <#list prodCatalogs as prodCatalog>
- <#if curProdCatalogId?exists && curProdCatalogId == prodCatalog.prodCatalogId>
- <#assign prodCatalogCategories = prodCatalog.getRelatedOrderByCache("ProdCatalogCategory", sortList)>
-
-
- <#list prodCatalogCategories as prodCatalogCategory>
- <#assign productCategory = prodCatalogCategory.getRelatedOneCache("ProductCategory")>
-
-
-
- <#else>
-
-
-
-
-
+ <#assign sortList = Static["org.ofbiz.base.util.UtilMisc"].toList("prodCatalogCategoryTypeId", "sequenceNum", "productCategoryId")>
+ <#list prodCatalogs as prodCatalog>
+ <#if curProdCatalogId?exists && curProdCatalogId == prodCatalog.prodCatalogId>
+ <#assign prodCatalogCategories = prodCatalog.getRelatedOrderByCache("ProdCatalogCategory", sortList)>
+
+
+ <#list prodCatalogCategories as prodCatalogCategory>
+ <#assign productCategory = prodCatalogCategory.getRelatedOneCache("ProductCategory")>
+
+
+
+ <#else>
+
+
+
Index: applications/product/webapp/catalog/find/sidedeepcategory.ftl
===================================================================
--- applications/product/webapp/catalog/find/sidedeepcategory.ftl (revision 677699)
+++ applications/product/webapp/catalog/find/sidedeepcategory.ftl (working copy)
@@ -56,36 +56,20 @@
-
-
-<#if isOpen>
-
-
-
- <#if currentTopCategory?exists>
- <#if curCategoryId?exists && curCategoryId == currentTopCategory.productCategoryId>
-
- ${currentTopCategory.categoryName?default("No Name")} [${currentTopCategory.productCategoryId}]
- <#else>
-
-
-
-
- <#if topLevelList?exists>
- <#list topLevelList as category>
- <@categoryList parentCategory=category category=category/>
-
-
-
-
-
+
+
+<#if currentTopCategory?exists>
+ <#if curCategoryId?exists && curCategoryId == currentTopCategory.productCategoryId>
+
- ${currentTopCategory.categoryName?default("No Name")} [${currentTopCategory.productCategoryId}]
+ <#else>
+
+
+
+ <#if topLevelList?exists>
+ <#list topLevelList as category>
+ <@categoryList parentCategory=category category=category/>
+
+
+
Index: applications/product/webapp/catalog/includes/appheader.ftl
===================================================================
--- applications/product/webapp/catalog/includes/appheader.ftl (revision 677699)
+++ applications/product/webapp/catalog/includes/appheader.ftl (working copy)
@@ -1,42 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you 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
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<#assign selected = headerItem?default("void")>
-
-
-
${uiLabelMap.ProductCatalogManagerApplication}
-
-
-
Index: applications/product/webapp/catalog/WEB-INF/web.xml
===================================================================
--- applications/product/webapp/catalog/WEB-INF/web.xml (revision 677699)
+++ applications/product/webapp/catalog/WEB-INF/web.xml (working copy)
@@ -41,7 +41,7 @@
mainDecoratorLocation
- component://product/widget/catalog/CatalogCommonScreens.xml
+ component://product/widget/catalog/CommonScreens.xml
The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.
Index: applications/product/widget/catalog/CatalogCommonScreens.xml
===================================================================
--- applications/product/widget/catalog/CatalogCommonScreens.xml (revision 677699)
+++ applications/product/widget/catalog/CatalogCommonScreens.xml (working copy)
@@ -1,339 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}
-
-
-
-
-
-
-
-
-
-
- ${uiLabelMap.ProductCatalogViewPermissionError}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${uiLabelMap.ProductCatalogViewPermissionError}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}] ${${extraFunctionName}}
-
-
-
-
-
-
-
-
-
- ${uiLabelMap.ProductCatalogViewPermissionError}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${uiLabelMap.${labelTitleProperty}}
-
-
-
- ${uiLabelMap.ProductCatalogViewPermissionError}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: applications/product/widget/catalog/CommonScreens.xml
===================================================================
--- applications/product/widget/catalog/CommonScreens.xml (revision 677699)
+++ applications/product/widget/catalog/CommonScreens.xml (working copy)
@@ -1,4 +1,4 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}
+
+
+
+
+
+
+
+
+
+
+ ${uiLabelMap.ProductCatalogViewPermissionError}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${uiLabelMap.ProductCatalogViewPermissionError}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}] ${${extraFunctionName}}
+
+
+
+
+
+
+
+
+
+ ${uiLabelMap.ProductCatalogViewPermissionError}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${uiLabelMap.${labelTitleProperty}}
+
+
+
+ ${uiLabelMap.ProductCatalogViewPermissionError}
+
+
+
+
+
+
+
+
@@ -39,7 +235,9 @@
-
+
@@ -49,7 +247,9 @@
-
+
@@ -59,7 +259,9 @@
-
+
@@ -69,7 +271,9 @@
-
+
Index: applications/product/widget/catalog/Menus.xml
===================================================================
--- applications/product/widget/catalog/Menus.xml (revision 0)
+++ applications/product/widget/catalog/Menus.xml (revision 0)
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+