svn commit: r1130415 - in /ofbiz/trunk: applications/product/src/org/o
Locked
svn commit: r1130415 - in /ofbiz/trunk: applications/product/src/org/o
 
|
Author: hansbak
Date: Thu Jun 2 06:22:03 2011 New Revision: 1130415 URL: http://svn.apache.org/viewvc?rev=1130415&view=rev Log: update to the catalog/category tree: works now with IE and is using Ajax to update the middle section using the tree Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml ofbiz/trunk/framework/common/widget/CommonScreens.xml 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=1130415&r1=1130414&r2=1130415&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 Jun 2 06:22:03 2011 @@ -407,6 +407,10 @@ public class CategoryServices { String productCategoryId = request.getParameter("productCategoryId"); String isCatalog = request.getParameter("isCatalog"); String isCategoryType = request.getParameter("isCategoryType"); + String onclickFunction = request.getParameter("onclickFunction"); + String additionParam = request.getParameter("additionParam"); + String hrefString = request.getParameter("hrefString"); + String hrefString2 = request.getParameter("hrefString2"); String entityName = null; String primaryKeyName = null; @@ -471,7 +475,8 @@ public class CategoryServices { title = catId.toString(); dataMap.put("title", catId); } - dataAttrMap.put("onClick","window.location.href='EditCategory?productCategoryId="+catId+"'; return false;"); + dataAttrMap.put("onClick", onclickFunction + "('" + catId + additionParam + "')"); + dataAttrMap.put("href",hrefString+catId+hrefString2); dataMap.put("attr", dataAttrMap); josonMap.put("data", dataMap); Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1130415&r1=1130414&r2=1130415&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Thu Jun 2 06:22:03 2011 @@ -139,6 +139,10 @@ under the License. <security https="true" auth="true"/> <response name="success" type="view" value="EditCategory"/> </request-map> + <request-map uri="EditCategoryAjax"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditCategorySection"/> + </request-map> <request-map uri="createProductCategory"> <security https="true" auth="true"/> @@ -1410,6 +1414,10 @@ under the License. <response name="success" type="view" value="EditProdCatalog"/> <response name="error" type="view" value="EditProdCatalog"/> </request-map> + <request-map uri="EditProdCatalogAjax"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditProdCatalogSection"/> + </request-map> <!-- ================ ProdCatalog Categories Requests ================= --> <request-map uri="EditProdCatalogCategories"> @@ -3072,12 +3080,17 @@ under the License. <event type="java" path="org.ofbiz.product.category.CategoryServices" invoke="getChildCategoryTree"/> <response name="success" type="none"/> </request-map> + <request-map uri="listMiniproduct"> + <security auth="false" https="true"/> + <response name="success" type="view" value="listMiniproduct"/> + </request-map> <!-- View Mappings --> <view-map name="main" type="screen" page="component://product/widget/catalog/CommonScreens.xml#main"/> <view-map name="ChooseTopCategory" type="screen" page="component://product/widget/catalog/CommonScreens.xml#ChooseTopCategory"/> <view-map name="FastLoadCache" type="screen" page="component://product/widget/catalog/CommonScreens.xml#FastLoadCache"/> + <view-map name="listMiniproduct" type="screen" page="component://product/widget/catalog/CommonScreens.xml#listMiniproduct"/> <view-map name="advancedsearch" type="screen" page="component://product/widget/catalog/FindScreens.xml#advancedsearch"/> <view-map name="keywordsearch" type="screen" page="component://product/widget/catalog/FindScreens.xml#keywordsearch"/> @@ -3101,6 +3114,7 @@ under the License. <view-map name="EditCategoryFeatureCats" type="screen" page="component://product/widget/catalog/CategoryScreens.xml#EditCategoryFeatureCats"/> <view-map name="EditCategoryParties" type="screen" page="component://product/widget/catalog/CategoryScreens.xml#EditCategoryParties"/> <view-map name="EditProductCategoryLinks" type="screen" page="component://product/widget/catalog/CategoryScreens.xml#EditProductCategoryLinks"/> + <view-map name="EditCategorySection" type="screen" page="component://product/widget/catalog/CategoryScreens.xml#EditCategorySection"/> <view-map name="createProductInCategoryStart" type="screen" page="component://product/widget/catalog/CategoryScreens.xml#createProductInCategoryStart"/> <view-map name="CreateProductInCategoryCheckExisting" type="screen" page="component://product/widget/catalog/CategoryScreens.xml#CreateProductInCategoryCheckExisting"/> @@ -3114,6 +3128,7 @@ under the License. <view-map name="newFixedAssetProduct" type="screen" page="component://product/widget/catalog/ProductScreens.xml#newFixedAssetProduct"/> <view-map name="ProductPriceHistory" type="screen" page="component://product/widget/catalog/ProductScreens.xml#ProductPriceHistory"/> <view-map name="ProductBarCode.pdf" type="screenfop" page="component://product/widget/catalog/ProductScreens.xml#ProductBarCode.fo" content-type="application/pdf" encoding="none"/> + <view-map name="EditProductContent" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditProductContent"/> <view-map name="EditProductGeos" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditProductGeos"/> @@ -3168,6 +3183,13 @@ under the License. <view-map name="ListFeaturePrice" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#ListFeaturePrice"/> <view-map name="CreateFeature" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#CreateFeature"/> + <view-map name="FindProdCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#FindProdCatalog"/> + <view-map name="EditProdCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalog"/> + <view-map name="EditProdCatalogCategories" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogCategories"/> + <view-map name="EditProdCatalogStores" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogStores"/> + <view-map name="EditProdCatalogParties" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogParties"/> + <view-map name="EditProdCatalogSection" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogSection"/> + <view-map name="FindProductPromo" type="screen" page="component://product/widget/catalog/PromoScreens.xml#FindProductPromo"/> <view-map name="EditProductPromo" type="screen" page="component://product/widget/catalog/PromoScreens.xml#EditProductPromo"/> <view-map name="EditProductPromoRules" type="screen" page="component://product/widget/catalog/PromoScreens.xml#EditProductPromoRules"/> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl?rev=1130415&r1=1130414&r2=1130415&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl Thu Jun 2 06:22:03 2011 @@ -35,7 +35,7 @@ var rawdata = [ <#if (rootCat?has_content)> <#list rootCat as root> { - "data": {"title" : unescapeHtmlText("<#if root.categoryName?exists>${root.categoryName?js_string} [${root.productCategoryId}]<#else>${root.productCategoryId?js_string}</#if>"), "attr": {"onClick" : "window.location.href='<@ofbizUrl>/EditProdCatalog?prodCatalogId=${root.productCategoryId}</@ofbizUrl>'; return false;"}}, + "data": {"title" : unescapeHtmlText("<#if root.categoryName?exists>${root.categoryName?js_string} [${root.productCategoryId}]<#else>${root.productCategoryId?js_string}</#if>"), "attr": {"href" : "<@ofbizUrl>/EditProdCatalog?prodCatalogId=${root.productCategoryId}</@ofbizUrl>","onClick" : "callDocument('${root.productCategoryId}', 'catalog');"}}, "attr": {"id" : "${root.productCategoryId}", "rel" : "root", "isCatalog" : "${root.isCatalog?string}" ,"isCategoryType" : "${root.isCategoryType?string}"} <#if root.child?exists> ,"state" : "closed" @@ -70,7 +70,10 @@ var rawdata = [ return { "isCategoryType" : n.attr ? n.attr("isCatalog").replace("node_","") : 1 , "isCatalog" : n.attr ? n.attr("isCatalog").replace("node_","") : 1 , - "productCategoryId" : n.attr ? n.attr("id").replace("node_","") : 1 + "productCategoryId" : n.attr ? n.attr("id").replace("node_","") : 1 , + "additionParam" : "','category" , + "hrefString" : "EditCategory?productCategoryId=" , + "onclickFunction" : "callDocument" }; } } @@ -89,6 +92,36 @@ var rawdata = [ }); }); } + + function callDocument(id,type) { + //jQuerry Ajax Request + if(type == "catalog") + URL = 'EditProdCatalogAjax'; + else + URL = 'EditCategoryAjax'; + jQuery.ajax({ + url: URL, + type: 'POST', + data: {"prodCatalogId" : id, "ajaxUpdateEvent" : "Y"}, + error: function(msg) { + alert("An error occured loading content! : " + msg); + }, + success: function(msg) { + jQuery('#centerdiv').html(msg); + } + }); + jQuery.ajax({ + url: 'listMiniproduct', + type: 'POST', + data: {"productCategoryId" : id}, + error: function(msg) { + alert("An error occured loading content! : " + msg); + }, + success: function(msg) { + jQuery('#miniproductlist').html(msg); + } + }); + } </script> <div id="tree"></div> Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml?rev=1130415&r1=1130414&r2=1130415&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml Thu Jun 2 06:22:03 2011 @@ -35,6 +35,43 @@ under the License. <menu-item name="Imagemanagement" title="${uiLabelMap.ImageManagement}"><link target="Imagemanagement"/></menu-item> </menu> + <menu name="CatalogTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="ProductCatalog" title="${uiLabelMap.ProductCatalog}"> + <link target="EditProdCatalog"> + <parameter param-name="prodCatalogId"/> + </link> + </menu-item> + <menu-item name="ProductStores" title="${uiLabelMap.ProductStores}"> + <link target="EditProdCatalogStores"> + <parameter param-name="prodCatalogId"/> + </link> + </menu-item> + <menu-item name="PartyParties" title="${uiLabelMap.PartyParties}"> + <link target="EditProdCatalogParties"> + <parameter param-name="prodCatalogId"/> + </link> + </menu-item> + <menu-item name="ProductCategories" title="${uiLabelMap.ProductCategories}"> + <link target="EditProdCatalogCategories"> + <parameter param-name="prodCatalogId"/> + </link> + </menu-item> + </menu> + + <menu name="CatalogSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected"> + <menu-item name="EditProductCatalog" title="${uiLabelMap.ProductNewProdCatalog}" widget-style="buttontext create"> + <link target="EditProdCatalog"/> + </menu-item> + <menu-item name="CreateSeo" title="${uiLabelMap.ProductCatalogSeoCreate}"> + <condition> + <not><if-empty field="prodCatalog"/></not> + </condition> + <link target="CreateSeoProdCatalog"> + <parameter param-name="prodCatalogId" from-field="parameters.prodCatalogId"/> + </link> + </menu-item> + </menu> + <menu name="FeaturesTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="FeatureType" title="${uiLabelMap.ProductFeatureType}"> <link target="EditFeatureTypes"/> @@ -163,7 +200,7 @@ under the License. </menu-item> <menu-item name="EditProductStoreWebSites" title="${uiLabelMap.ProductWebSites}"> <link target="EditProductStoreWebSites"> - <parameter param-name="viewProductStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId" from-field="productStoreId"/> </link> </menu-item> <!-- The tax stuff is in the Tax Authority area of the accounting manager, need to re-do this screen to list current tax entries and link to the accmgr screens @@ -229,6 +266,30 @@ under the License. </link> </menu-item> </menu> + <menu name="ProductStoreSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected"> + <menu-item name="EditProductStore" title="${uiLabelMap.ProductNewProductStore}" widget-style="buttontext create"> + <link target="EditProductStore"/> + </menu-item> + <menu-item name="Expand" title="${uiLabelMap.CommonExpandAll}"> + <condition> + <or> + <if-compare operator="equals" value="EditProductStore" field="tabButtonItem"/> + <if-compare operator="equals" value="EditProductStoreShipmentCostEstimates" field="tabButtonItem"/> + </or> + </condition> + <link target="javascript:expandAll(true);" url-mode="plain"/> + </menu-item> + <menu-item name="Collapse" title="${uiLabelMap.CommonCollapseAll}"> + <condition> + <or> + <if-compare operator="equals" value="EditProductStore" field="tabButtonItem"/> + <if-compare operator="equals" value="EditProductStoreShipmentCostEstimates" field="tabButtonItem"/> + </or> + </condition> + <link target="javascript:expandAll(false);" url-mode="plain"/> + </menu-item> + </menu> + <menu name="ProductStoreFacility" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="AddProductStoreFacility" title="${uiLabelMap.ProductAddFacility}"> <link target="javascript:ajaxUpdateArea('ProductStoreFacilityEditArea', 'editProductStoreFacility', 'productStoreId=${parameters.productStoreId}');" @@ -236,43 +297,6 @@ under the License. </menu-item> </menu> - <menu name="CatalogTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> - <menu-item name="ProductCatalog" title="${uiLabelMap.ProductCatalog}"> - <link target="EditProdCatalog"> - <parameter param-name="prodCatalogId"/> - </link> - </menu-item> - <menu-item name="ProductStores" title="${uiLabelMap.ProductStores}"> - <link target="EditProdCatalogStores"> - <parameter param-name="prodCatalogId"/> - </link> - </menu-item> - <menu-item name="PartyParties" title="${uiLabelMap.PartyParties}"> - <link target="EditProdCatalogParties"> - <parameter param-name="prodCatalogId"/> - </link> - </menu-item> - <menu-item name="ProductCategories" title="${uiLabelMap.ProductCategories}"> - <link target="EditProdCatalogCategories"> - <parameter param-name="prodCatalogId"/> - </link> - </menu-item> - </menu> - - <menu name="CatalogSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected"> - <menu-item name="EditProductCatalog" title="${uiLabelMap.ProductNewProdCatalog}" widget-style="buttontext create"> - <link target="EditProdCatalog"/> - </menu-item> - <menu-item name="CreateSeo" title="${uiLabelMap.ProductCatalogSeoCreate}"> - <condition> - <not><if-empty field="prodCatalog"/></not> - </condition> - <link target="CreateSeoProdCatalog"> - <parameter param-name="prodCatalogId" from-field="parameters.prodCatalogId"/> - </link> - </menu-item> - </menu> - <menu name="PriceRulesButtonBar" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="FindRules" title="${uiLabelMap.CommonAdd}/${uiLabelMap.ProductFindRule}"> <link target="FindProductPriceRules"/> Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml?rev=1130415&r1=1130414&r2=1130415&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml Thu Jun 2 06:22:03 2011 @@ -35,8 +35,6 @@ under the License. <section> <widgets> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> - <decorator-section name="menu-bar"> - </decorator-section> <decorator-section name="search-options"> <include-form name="FindCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/> </decorator-section> @@ -71,6 +69,31 @@ under the License. </widgets> </section> </screen> + <screen name="EditProdCatalogSection"> + <section> + <actions> + <set field="titleProperty" value="PageTitleEditProductCatalog"/> + <set field="headerItem" value="catalog"/> + <set field="tabButtonItem" value="ProductCatalog"/> + + <set field="prodCatalogId" from-field="parameters.prodCatalogId"/> + <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-menu name="CatalogTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <include-menu name="CatalogSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <label style="h1">${uiLabelMap.ProductCatalog} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> + <screenlet title="${uiLabelMap.PageTitleEditProductCatalog}"> + <label style="h3">${uiLabelMap.ProductCatalogEmptyWarning}</label> + <include-form name="EditProdCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> <screen name="EditProdCatalogCategories"> <section> <actions> @@ -114,7 +137,7 @@ under the License. </entity-and> </actions> <widgets> - <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditProductCatalogParties}"> <include-form name="UpdateProdCatalogToParty" location="component://product/widget/catalog/ProdCatalogForms.xml"/> @@ -140,7 +163,7 @@ under the License. </entity-and> </actions> <widgets> - <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditProductCatalogStores}"> <include-form name="UpdateProductStoreCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/> @@ -153,4 +176,4 @@ under the License. </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=1130415&r1=1130414&r2=1130415&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Thu Jun 2 06:22:03 2011 @@ -89,8 +89,6 @@ under the License. <section> <widgets> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> - <decorator-section name="menu-bar"> - </decorator-section> <decorator-section name="search-options"> <include-form name="FindCategory" location="component://product/widget/catalog/CategoryForms.xml"/> </decorator-section> @@ -112,19 +110,83 @@ under the License. <set field="headerItem" value="categories"/> <set field="tabButtonItem" value="EditCategory"/> <set field="labelTitleProperty" value="ProductCategory"/> - <set field="productCategoryId" from-field="parameters.productCategoryId"/> <entity-one entity-name="ProductCategory" value-field="productCategory"/> - <entity-condition entity-name="ProductCategoryType" list="productCategoryTypes"> <order-by field-name="description"/> </entity-condition> - <script location="component://product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy"/> </actions> <widgets> - <decorator-screen name="CommonCategoryDecorator"> + <decorator-screen name="CommonCategoryDecorator"> + <decorator-section name="body"> + <platform-specific> + <html><html-template location="component://product/webapp/catalog/category/EditCategory.ftl"/></html> + </platform-specific> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditCategorySection"> + <section> + <actions> + <set field="titleProperty" value="PageTitleEditProductCategories"/> + <set field="headerItem" value="categories"/> + <set field="tabButtonItem" value="EditCategory"/> + <set field="labelTitleProperty" value="ProductCategory"/> + <set field="productCategoryId" from-field="parameters.productCategoryId"/> + <entity-one entity-name="ProductCategory" value-field="productCategory"/> + <entity-condition entity-name="ProductCategoryType" list="productCategoryTypes"> + <order-by field-name="description"/> + </entity-condition> + <script location="component://product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> + <section> + <condition> + <or> + <if-has-permission permission="CATALOG" action="_ADMIN"/> + <if-has-permission permission="CATALOG" action="_CREATE"/> + <if-has-permission permission="CATALOG" action="_UPDATE"/> + <if-has-permission permission="CATALOG" action="_VIEW"/> + </or> + </condition> + <actions> + <set field="productCategoryId" from-field="parameters.productCategoryId"/> + <entity-one entity-name="ProductCategory" value-field="productCategory"/> + </actions> + <widgets> + <section> + <condition> + <not><if-empty field="productCategory"/></not> + </condition> + <widgets> + <include-menu name="CategoryTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <include-menu name="CategorySubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <container> + <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productCategory.description} [${uiLabelMap.CommonId}:${productCategoryId}] ${${extraFunctionName}}</label> + </container> + </widgets> + <fail-widgets> + <section> + <condition> + <if-compare operator="not-equals" value="EditCategory" field="tabButtonItem"/> + </condition> + <widgets> + <include-menu name="CategorySubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + </widgets> + </section> + </fail-widgets> + </section> + <decorator-section-include name="body"/> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> + </fail-widgets> + </section> <platform-specific> <html><html-template location="component://product/webapp/catalog/category/EditCategory.ftl"/></html> </platform-specific> @@ -161,7 +223,6 @@ under the License. <screenlet title="${uiLabelMap.ProductAddContentCategory}"> <include-form name="AddCategoryContentAssoc" location="component://product/widget/catalog/CategoryForms.xml"/> </screenlet> - <platform-specific> <html><html-template location="component://product/webapp/catalog/category/EditCategoryContent.ftl"/></html> </platform-specific> @@ -480,5 +541,4 @@ under the License. </widgets> </section> </screen> - </screens> Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=1130415&r1=1130414&r2=1130415&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Thu Jun 2 06:22:03 2011 @@ -43,7 +43,7 @@ under the License. <set field="applicationTitle" value="${uiLabelMap.ProductCatalogManagerApplication}" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/external/jquery.cookie.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jsTree/jquery.jstree.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.1.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.8.13.custom.min.js" global="true"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> @@ -114,28 +114,30 @@ under the License. </decorator-section> <decorator-section name="body"> <section> - <!-- do check for CATALOG, _VIEW permission --> <condition> - <if-has-permission permission="CATALOG" action="_VIEW"/> + <or> + <if-has-permission permission="CATALOG" action="_ADMIN"/> + <if-has-permission permission="CATALOG" action="_CREATE"/> + <if-has-permission permission="CATALOG" action="_UPDATE"/> + <if-has-permission permission="CATALOG" action="_VIEW"/> + </or> </condition> + <actions> + <set field="productStoreId" from-field="parameters.productStoreId"/> + <entity-one entity-name="ProductStore" value-field="productStore"/> + </actions> <widgets> <section> - <condition><not><if-empty field="productStoreId"/></not></condition> + <condition><not><if-empty field="productStore"/></not></condition> <widgets> <container> <include-menu name="ProductStoreTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <include-menu name="ProductStoreSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}] ${${extraFunctionName}}</label> </container> <section> - <widgets> - <container> - <link target="EditProductStore" text="${uiLabelMap.ProductNewProductStore}" style="buttontext"/> - </container> - </widgets> - </section> - <section> <condition> - <if-compare field="titleProperty" operator="equals" value="PageTitleEditProductStore"/> + <if-compare operator="equals" value="EditProductStore" field="tabButtonItem"/> </condition> <widgets> <container style="button-bar"> @@ -145,8 +147,17 @@ under the License. </widgets> </section> </widgets> + <fail-widgets> + <section> + <condition> + <if-compare operator="not-equals" value="EditProductStore" field="tabButtonItem"/> + </condition> + <widgets> + <include-menu name="ProductStoreSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + </widgets> + </section> + </fail-widgets> </section> - <decorator-section-include name="body"/> </widgets> <fail-widgets> @@ -163,6 +174,16 @@ under the License. <section> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <!--<decorator-section name="pre-body"> + <section> + <condition> + <if-has-permission permission="CATALOG" action="_VIEW"/> + </condition> + <widgets> + <include-menu name="ShippingTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + </widgets> + </section> + </decorator-section>--> <decorator-section name="left-column"> <include-screen name="leftbar"/> </decorator-section> @@ -227,8 +248,8 @@ under the License. <section> <widgets> <include-screen name="keywordsearchbox"/> - <!--<include-screen name="sidecatalogs"/> - <include-screen name="sidedeepcategory"/>--> +<!-- <include-screen name="sidecatalogs"/>--> +<!-- <include-screen name="sidedeepcategory"/>--> <include-screen name="categorytree"/> <include-screen name="miniproductlist"/> </widgets> @@ -277,12 +298,13 @@ under the License. </actions> <widgets> <screenlet id="ProductCategoryProductsPanel" title="${uiLabelMap.ProductCategoryProducts}" collapsible="true"> - <platform-specific><html><html-template location="component://product/webapp/catalog/find/miniproductlist.ftl"/></html></platform-specific> + <container id="miniproductlist"> + <platform-specific><html><html-template location="component://product/webapp/catalog/find/miniproductlist.ftl"/></html></platform-specific> + </container> </screenlet> </widgets> </section> </screen> - <screen name="ChooseTopCategory"> <section> <actions> @@ -395,4 +417,19 @@ under the License. </widgets> </section> </screen> + <screen name="listMiniproduct"> + <section> + <actions> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <script location="component://product/webapp/catalog/WEB-INF/actions/find/miniproductlist.groovy"/> + </actions> + <widgets> + <platform-specific><html><html-template location="component://product/webapp/catalog/find/miniproductlist.ftl"/></html></platform-specific> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=1130415&r1=1130414&r2=1130415&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Thu Jun 2 06:22:03 2011 @@ -24,14 +24,18 @@ <section> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="left-column"> + <decorator-section name="left-column"> <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> </decorator-section> <decorator-section name="body"> <section> - <!-- do check for CATALOG, _VIEW permission --> <condition> - <if-has-permission permission="CATALOG" action="_VIEW"/> + <or> + <if-has-permission permission="CATALOG" action="_ADMIN"/> + <if-has-permission permission="CATALOG" action="_CREATE"/> + <if-has-permission permission="CATALOG" action="_UPDATE"/> + <if-has-permission permission="CATALOG" action="_VIEW"/> + </or> </condition> <widgets> <include-menu name="FeaturesTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=1130415&r1=1130414&r2=1130415&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Thu Jun 2 06:22:03 2011 @@ -60,7 +60,7 @@ under the License. </or> </condition> <widgets> - <include-menu name="ProductTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <include-menu name="ProductTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <include-menu name="ProductSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <image src="${product.smallImageUrl}" height="40" width="40" url-mode="content" alt="${product.internalName}"/> <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}</label> @@ -87,7 +87,7 @@ under the License. </widgets> </section> </screen> - + <screen name="FindProduct"> <section> <actions> Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=1130415&r1=1130414&r2=1130415&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Thu Jun 2 06:22:03 2011 @@ -32,9 +32,6 @@ under the License. <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ProductProductStoreList}"> - <container style="button-bar"> - <link target="EditProductStore" text="${uiLabelMap.ProductCreateNewProductStore}" style="buttontext create"/> - </container> <include-form name="ListProductStore" location="component://product/widget/catalog/ProductStoreForms.xml"/> </screenlet> </decorator-section> @@ -73,17 +70,12 @@ under the License. <set field="headerItem" value="store"/> <set field="tabButtonItem" value="FindProductStoreRoles"/> <set field="labelTitleProperty" value="ProductProductStoreRoles"/> - <set field="productStoreId" from-field="parameters.productStoreId"/> <set field="parameters.fromDate" from-field="parameters.fromDate" type="Timestamp"/> <entity-one entity-name="ProductStoreRole" value-field="productStoreRole" auto-field-map="true"/> - <set field="parameters.productStoreId" value="${groovy:parameters.noConditionFind==null || parameters.noConditionFind=='N'?'':parameters.productStoreId}"/> </actions> <widgets> <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.PageTitleEditProductStoreRoles}"> - <include-form name="EditProductStoreRole" location="component://product/widget/catalog/StoreForms.xml"/> - </screenlet> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> <include-form name="FindProductStoreRole" location="component://product/widget/catalog/StoreForms.xml"/> @@ -92,6 +84,9 @@ under the License. <include-form name="ListProductStoreRole" location="component://product/widget/catalog/StoreForms.xml"/> </decorator-section> </decorator-screen> + <screenlet title="${uiLabelMap.PageTitleEditProductStoreRoles}"> + <include-form name="EditProductStoreRole" location="component://product/widget/catalog/StoreForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -104,10 +99,6 @@ under the License. <set field="headerItem" value="store"/> <set field="tabButtonItem" value="EditProductStorePromos"/> <set field="labelTitleProperty" value="ProductPromotions"/> - - <set field="productStoreId" from-field="parameters.productStoreId"/> - <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> - <set field="userEntered" from-field="parameters.userEntered"/> <set field="activeOnly" from-field="parameters.activeOnly" default-value="true"/> <entity-condition entity-name="ProductStorePromoAndAppl" list="productStorePromoAndAppls" filter-by-date="${activeOnly}"> @@ -202,13 +193,8 @@ under the License. <set field="headerItem" value="store"/> <set field="tabButtonItem" value="EditProductStoreWebSites"/> <set field="labelTitleProperty" value="ProductProductStoreWebSites"/> - - <set field="productStoreId" from-field="parameters.viewProductStoreId"/> - <set field="productStoreId" from-field="parameters.productStoreId" default-value="${productStoreId}"/> - <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> - <entity-condition entity-name="WebSite" list="storeWebSites"> - <condition-expr field-name="productStoreId" from-field="productStoreId"/> + <condition-expr field-name="productStoreId" from-field="parameters.productStoreId"/> <order-by field-name="siteName"/> </entity-condition> <entity-condition entity-name="WebSite" list="webSites"> @@ -310,10 +296,6 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.ProductNewShipmentEstimate}"> - <container style="button-bar"> - <link target="javascript:expandAll(true);" text="${uiLabelMap.CommonExpandAll}" style="buttontext expand-all" url-mode="plain"/> - <link target="javascript:expandAll(false);" text="${uiLabelMap.CommonCollapseAll}" style="buttontext collapse-all" url-mode="plain"/> - </container> <include-form name="AddShipmentCostEstimate" location="component://product/widget/catalog/ProductStoreForms.xml"/> </screenlet> </widgets> Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=1130415&r1=1130414&r2=1130415&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Thu Jun 2 06:22:03 2011 @@ -149,53 +149,70 @@ under the License. <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]"/> </actions> <widgets> - <!-- render header --> - <platform-specific><html><html-template location="${headerTemplateLocation}"/></html></platform-specific> - <!-- render appbar or its opening part --> - <section name="Render-Main-Nav"> + <section> <condition> - <not><if-empty field="appbarOpenTemplateLocation"/></not> + <if-empty field="parameters.ajaxUpdateEvent"/> </condition> <widgets> - <platform-specific><html><html-template location="${appbarOpenTemplateLocation}"/></html></platform-specific> + <!-- render header --> + <platform-specific><html><html-template location="${headerTemplateLocation}"/></html></platform-specific> + <!-- render appbar or its opening part --> + <section name="Render-Main-Nav"> + <condition> + <not><if-empty field="appbarOpenTemplateLocation"/></not> + </condition> + <widgets> + <platform-specific><html><html-template location="${appbarOpenTemplateLocation}"/></html></platform-specific> + </widgets> + <fail-widgets> + <platform-specific><html><html-template location="${appbarTemplateLocation}"/></html></platform-specific> + </fail-widgets> + </section> </widgets> - <fail-widgets> - <platform-specific><html><html-template location="${appbarTemplateLocation}"/></html></platform-specific> - </fail-widgets> </section> - - <!-- render appheader: both menu widget style and ftl template style menus are supported--> - <section name="Render-App-Nav"> + + <section> <condition> - <not><if-empty field="userLogin"/></not> + <if-empty field="parameters.ajaxUpdateEvent"/> </condition> <widgets> - <section> - <condition><not><if-empty field="appheaderTemplate"/></not></condition> + <!-- render appheader: both menu widget style and ftl template style menus are supported--> + <section name="Render-App-Nav"> + <condition> + <not><if-empty field="userLogin"/></not> + </condition> <widgets> - <platform-specific><html><html-template location="${appheaderTemplate}"/></html></platform-specific> - </widgets> - <fail-widgets> <section> - <condition><not><if-empty field="parameters.applicationTitle"/></not></condition> - <widgets><label style="apptitle">${parameters.applicationTitle}</label></widgets> - </section> - <section> - <condition><not><if-empty field="applicationMenuLocation"/></not></condition> - <widgets><include-menu name="${applicationMenuName}" location="${applicationMenuLocation}"/></widgets> + <condition><not><if-empty field="appheaderTemplate"/></not></condition> + <widgets> + <platform-specific><html><html-template location="${appheaderTemplate}"/></html></platform-specific> + </widgets> + <fail-widgets> + <section> + <condition><not><if-empty field="parameters.applicationTitle"/></not></condition> + <widgets><label style="apptitle">${parameters.applicationTitle}</label></widgets> + </section> + <section> + <condition><not><if-empty field="applicationMenuLocation"/></not></condition> + <widgets><include-menu name="${applicationMenuName}" location="${applicationMenuLocation}"/></widgets> + </section> + </fail-widgets> </section> + </widgets> + <fail-widgets> + <!-- better to just not include this, the CommonAppBarMenu doesn't show anything by default if the user isn't logged in, causing a funny empty menu: <include-menu name="CommonAppBarMenu" location="component://common/widget/CommonMenus.xml"/> --> </fail-widgets> </section> </widgets> - <fail-widgets> - <!-- better to just not include this, the CommonAppBarMenu doesn't show anything by default if the user isn't logged in, causing a funny empty menu: <include-menu name="CommonAppBarMenu" location="component://common/widget/CommonMenus.xml"/> --> - </fail-widgets> </section> - + <!-- render the appbar closing part --> <section> <condition> - <not><if-empty field="appbarCloseTemplateLocation"/></not> + <and> + <if-empty field="parameters.ajaxUpdateEvent"/> + <not><if-empty field="appbarCloseTemplateLocation"/></not> + </and> </condition> <widgets> <platform-specific><html><html-template location="${appbarCloseTemplateLocation}"/></html></platform-specific> @@ -223,7 +240,7 @@ under the License. <decorator-section-include name="left-column"/> </container> <container id="content-main-section" style="leftonly"> - <container style="no-clear"> + <container style="no-clear" id="centerdiv"> <decorator-section-include name="body"/> </container> </container> @@ -233,17 +250,24 @@ under the License. </container> </container> - <!-- render footer --> - <section name="Render-Footer"> + <section> <condition> - <if-empty field="applicationFooterTemplate"/> + <if-empty field="parameters.ajaxUpdateEvent"/> </condition> <widgets> - <platform-specific><html><html-template location="${footerTemplateLocation}"/></html></platform-specific> + <!-- render footer --> + <section name="Render-Footer"> + <condition> + <if-empty field="applicationFooterTemplate"/> + </condition> + <widgets> + <platform-specific><html><html-template location="${footerTemplateLocation}"/></html></platform-specific> + </widgets> + <fail-widgets> + <platform-specific><html><html-template location="${applicationFooterTemplate}"/></html></platform-specific> + </fail-widgets> + </section> </widgets> - <fail-widgets> - <platform-specific><html><html-template location="${applicationFooterTemplate}"/></html></platform-specific> - </fail-widgets> </section> </widgets> </section> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |