Author: deepak
Date: Sat Jan 12 06:16:36 2019 New Revision: 1851136 URL: http://svn.apache.org/viewvc?rev=1851136&view=rev Log: Applied fix from trunk for revision: 1851135 === Improved: Improve ecommerce main-decorator (OFBIZ-10790) Added two new section in ecommerce main-decorator, now we don't need to pass right/left bar screen name, instead we can include it directly in decoratot-section. Modified: ofbiz/ofbiz-plugins/branches/release18.12/ (props changed) ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CartScreens.xml ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CatalogScreens.xml ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CommonScreens.xml ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/ContentScreens.xml ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CustRequestScreens.xml ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CustomerScreens.xml ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/ForumScreens.xml ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/OrderScreens.xml ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/QuoteScreens.xml ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/ShoppingListScreens.xml Propchange: ofbiz/ofbiz-plugins/branches/release18.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 12 06:16:36 2019 @@ -10,4 +10,4 @@ /ofbiz/branches/json-integration-refactoring/plugins:1634077-1635900 /ofbiz/branches/multitenant20100310/plugins:921280-927264 /ofbiz/branches/release13.07/plugins:1547657 -/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068 +/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135 Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CartScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CartScreens.xml?rev=1851136&r1=1851135&r2=1851136&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CartScreens.xml (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CartScreens.xml Sat Jan 12 06:16:36 2019 @@ -67,7 +67,6 @@ under the License. <screen name="showcart"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> <set field="MainColumnStyle" value="center"/> <!--set field="MainColumnStyle" value="leftonly"/--> @@ -79,6 +78,9 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/cart/ShowCart.ftl"/></html></platform-specific> </decorator-section> @@ -89,7 +91,6 @@ under the License. <screen name="showAllPromotions"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> <set field="MainColumnStyle" value="leftonly"/> <set field="promoUseDetailsInlineScreen" value="component://ecommerce/widget/CartScreens.xml#promoUseDetailsInline"/> @@ -100,6 +101,9 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <platform-specific><html><html-template location="component://order/template/entry/cart/ShowAllPromotions.ftl"/></html></platform-specific> </decorator-section> @@ -110,8 +114,6 @@ under the License. <screen name="showPromotionDetails"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> <set field="productsummaryScreen" value="component://ecommerce/widget/CatalogScreens.xml#productsummary"/> <set field="titleProperty" value="PageTitleShowPromotionDetails"/> @@ -119,9 +121,15 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <include-screen name="promotion" location="component://order/widget/ordermgr/OrderEntryCartScreens.xml"/> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CatalogScreens.xml?rev=1851136&r1=1851135&r2=1851136&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CatalogScreens.xml (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CatalogScreens.xml Sat Jan 12 06:16:36 2019 @@ -166,8 +166,6 @@ under the License. <screen name="category"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> <set field="titleProperty" value="PageTitleCategoryPage"/> @@ -180,10 +178,16 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <include-screen name="breadcrumbs"/> <include-screen name="category-include"/> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -254,8 +258,6 @@ under the License. <screen name="product"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> <set field="titleProperty" value="PageTitleProductPage"/> <set field="layoutSettings.javaScripts[]" value="/ecommerce/images/productAdditionalView.js" global="true"/> @@ -264,6 +266,9 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <section> <condition> @@ -277,6 +282,9 @@ under the License. </fail-widgets> </section> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -325,17 +333,21 @@ under the License. <screen name="productreview"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> <set field="titleProperty" value="PageTitleProductReview"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/catalog/ProductReview.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -344,17 +356,21 @@ under the License. <screen name="lastviewedproducts"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> <set field="titleProperty" value="PageTitleLastViewProducts"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/catalog/LastViewedProducts.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -385,8 +401,6 @@ under the License. <screen name="quickadd"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> <set field="quickaddsummaryScreen" value="component://ecommerce/widget/CatalogScreens.xml#quickaddsummary"/> @@ -396,9 +410,15 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/order/QuickAdd.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -418,8 +438,6 @@ under the License. <screen name="keywordsearch"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> <set field="productsummaryScreen" value="component://ecommerce/widget/CatalogScreens.xml#productsummary"/> @@ -430,9 +448,15 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <platform-specific><html><html-template location="component://order/template/entry/catalog/KeywordSearch.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -441,8 +465,6 @@ under the License. <screen name="tagsearch"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> <set field="productsummaryScreen" value="component://ecommerce/widget/CatalogScreens.xml#productsummary"/> @@ -453,9 +475,15 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <platform-specific><html><html-template location="component://order/template/entry/catalog/TagSearch.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -464,8 +492,6 @@ under the License. <screen name="advancedsearch"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> <set field="titleProperty" value="PageTitleAdvancedSearch"/> @@ -474,9 +500,15 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/catalog/AdvancedSearch.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CommonScreens.xml?rev=1851136&r1=1851135&r2=1851136&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CommonScreens.xml Sat Jan 12 06:16:36 2019 @@ -56,28 +56,51 @@ under the License. <not><if-empty field="globalContext.productStore"/></not> </condition> <widgets> - <platform-specific><html><html-template location="component://ecommerce/template/includes/HeaderHead.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://common-theme/template/includes/OpenHtmlBody.ftl"/></html></platform-specific> - <!-- render header --> - <container id="parentContainer"> - <container id="header"><platform-specific><html><html-template location="${headerTemplateLocation}"/></html></platform-specific></container> - - <container id="ecom-mainarea" style="row mx-2"> - - <container id="div1" style="col-lg-3 order-lg-1 order-2"><include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/></container> - <container id="div3" style="col-lg-6 order-lg-2 order-1"> - <!-- render messages --> - <platform-specific><html><html-template location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific> - <decorator-section-include name="body"/> - </container> - <container id="div2" style="col-lg-3 order-lg-3 order-3"><include-screen name="${rightbarScreenName}" location="${rightbarScreenLocation}"/></container> - <container id="div4" style="endcolumns"/> - </container> - - <!-- render footer --> - <container id="footer"><platform-specific><html><html-template location="${footerTemplateLocation}"/></html></platform-specific></container> - </container> - <platform-specific><html><html-template location="component://common-theme/template/includes/CloseHtmlBody.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://ecommerce/template/includes/HeaderHead.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common-theme/template/includes/OpenHtmlBody.ftl"/></html></platform-specific> + <!-- render header --> + <container id="parentContainer"> + <container id="header"> + <platform-specific><html><html-template location="${headerTemplateLocation}"/></html></platform-specific> + </container> + <container id="ecom-mainarea" style="row mx-2"> + <section> + <condition> + <not><if-empty-section section-name="left-column"/></not> + </condition> + <widgets> + <container id="div1" style="col-lg-3 order-lg-1 order-2"> + <decorator-section-include name="left-column"/> + </container> + </widgets> + </section> + <container id="div3" style="col-lg-6 order-lg-2 order-1"> + <!-- render messages --> + <platform-specific><html><html-template location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific> + <decorator-section-include name="body"/> + </container> + <section> + <condition> + <not> + <if-empty-section section-name="right-column"/> + </not> + </condition> + <widgets> + <container id="div2" style="col-lg-3 order-lg-3 order-3"> + <decorator-section-include name="right-column"/> + </container> + </widgets> + </section> + + <container id="div4" style="endcolumns"/> + </container> + <!-- render footer --> + <container id="footer"> + <platform-specific><html><html-template location="${footerTemplateLocation}"/></html></platform-specific> + </container> + </container> + + <platform-specific><html><html-template location="component://common-theme/template/includes/CloseHtmlBody.ftl"/></html></platform-specific> </widgets> <fail-widgets> <label text="A Product Store has not been defined for this ecommerce site. A Product Store can be created using the ofbizsetup wizard."/> @@ -141,11 +164,13 @@ under the License. <screen name="CommonLeftDecorator"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> <set field="MainColumnStyle" value="center"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar"/> + </decorator-section> <decorator-section name="body"> <decorator-section-include name="body"/> </decorator-section> @@ -156,7 +181,6 @@ under the License. <screen name="CommonRightDecorator"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> </actions> <widgets> @@ -164,6 +188,9 @@ under the License. <decorator-section name="body"> <decorator-section-include name="body"/> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -171,15 +198,19 @@ under the License. <screen name="CommonLeftRightDecorator"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar"/> + </decorator-section> <decorator-section name="body"> <decorator-section-include name="body"/> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -189,16 +220,20 @@ under the License. <screen name="commonForumDecorator"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar"/> + </decorator-section> <decorator-section name="body"> <label style="head1" text="${uiLabelMap.${titleProperty}}"></label> <decorator-section-include name="body"/> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -208,18 +243,22 @@ under the License. <section> <actions> <set field="currentMenuItemName" from-field="currentMenuItemName" default-value="all" from-scope="user"/> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> </actions> <widgets> <decorator-screen name="main-decorator"> + <decorator-section name="left-column"> + <include-screen name="leftbar"/> + </decorator-section> <decorator-section name="body"> <container style="blogs"> <include-screen name="CommonBlogTitle" location="component://ecommerce/widget/blog/BlogScreens.xml"/> <decorator-section-include name="body"/> </container> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -270,8 +309,6 @@ under the License. <screen name="main"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> <set field="titleProperty" value="PageTitleMain"/> @@ -283,11 +320,17 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar"/> + </decorator-section> <decorator-section name="body"> <platform-specific> <html><html-template location="component://ecommerce/template/Main.ftl"/></html> </platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar"/> + </decorator-section> </decorator-screen> </widgets> </section> Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/ContentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/ContentScreens.xml?rev=1851136&r1=1851135&r2=1851136&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/ContentScreens.xml (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/ContentScreens.xml Sat Jan 12 06:16:36 2019 @@ -67,7 +67,6 @@ under the License. <screen name="defaultcontent"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> <set field="MainColumnStyle" value="leftonly"/> <set field="titleProperty" value="PageTitleContentPage"/> @@ -77,6 +76,9 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/content/DefaultContent.ftl"/></html></platform-specific> </decorator-section> @@ -87,8 +89,6 @@ under the License. <screen name="showcontenttree"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> <set field="titleProperty" value="PageTitleViewBlog"/> @@ -100,9 +100,15 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/content/ShowContentTree.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -110,8 +116,6 @@ under the License. <screen name="searchContent"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> <set field="titleProperty" value="PageTitleShoppingCart"/> @@ -128,10 +132,16 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/content/SearchContent.ftl"/></html></platform-specific> <include-form name="SearchList" location="component://ecommerce/widget/ContentForms.xml"/> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -139,8 +149,6 @@ under the License. <screen name="viewcontent"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> <set field="titleProperty" value="PageTitleViewContent"/> @@ -152,9 +160,15 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/content/ViewContent.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CustRequestScreens.xml?rev=1851136&r1=1851135&r2=1851136&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CustRequestScreens.xml (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CustRequestScreens.xml Sat Jan 12 06:16:36 2019 @@ -35,7 +35,6 @@ under the License. <screen name="ListRequests"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleListRequests"/> @@ -55,6 +54,9 @@ under the License. <html><html-template location="component://ecommerce/template/request/RequestList.ftl"/></html> </platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -62,7 +64,6 @@ under the License. <screen name="ViewRequest"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleViewRequest"/> @@ -111,6 +112,9 @@ under the License. </fail-widgets> </section> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CustomerScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CustomerScreens.xml?rev=1851136&r1=1851135&r2=1851136&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CustomerScreens.xml (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CustomerScreens.xml Sat Jan 12 06:16:36 2019 @@ -24,17 +24,21 @@ under the License. <screen name="survey"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> <set field="titleProperty" value="PageTitleAdditionalInfo"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <platform-specific><html><html-template location="component://order/template/entry/Survey.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -154,8 +158,6 @@ under the License. <screen name="giftcardbalance"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> <set field="titleProperty" value="PageTitleGiftCardBalance"/> @@ -163,9 +165,15 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/customer/GiftCardBalance.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -173,8 +181,6 @@ under the License. <screen name="giftcardlink"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> <set field="titleProperty" value="PageTitleGiftCardLink"/> @@ -182,9 +188,15 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/customer/GiftCardLink.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -210,7 +222,6 @@ under the License. <section> <actions> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleLogin"/> @@ -223,6 +234,9 @@ under the License. <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/customer/NewMsg.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -635,7 +649,6 @@ under the License. <section> <actions> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleLogin"/> @@ -648,6 +661,9 @@ under the License. <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/customer/AnonContactus.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/ForumScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/ForumScreens.xml?rev=1851136&r1=1851135&r2=1851136&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/ForumScreens.xml (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/ForumScreens.xml Sat Jan 12 06:16:36 2019 @@ -52,8 +52,6 @@ under the License. <screen name="Showforum"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> <set field="titleProperty" value="PageTitleForumSummary"/> @@ -79,6 +77,9 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <section> <widgets> @@ -104,6 +105,9 @@ under the License. </widgets> </section> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -111,8 +115,6 @@ under the License. <screen name="ViewForumMessage"> <section> <actions> - <set field="leftbarScreenName" value="leftbar"/> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> <set field="titleProperty" value="PageTitleForumArticle"/> <set field="contentAssoc.contentId" from-field="parameters.responseContentId"/> @@ -130,6 +132,9 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <label style="blogheader">${uiLabelMap.EcommerceBlogFullMessage}:</label> <container style="blogcontentwrapper"> @@ -152,6 +157,9 @@ under the License. </container> <include-tree name="ResponseTree" location="component://ecommerce/widget/ForumTrees.xml"/> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/OrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/OrderScreens.xml?rev=1851136&r1=1851135&r2=1851136&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/OrderScreens.xml (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/OrderScreens.xml Sat Jan 12 06:16:36 2019 @@ -93,7 +93,6 @@ under the License. <screen name="custsettings"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="parameters.formNameValue" value="custsetupform" global="true"/> @@ -105,6 +104,9 @@ under the License. <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/order/CustSettings.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -113,7 +115,6 @@ under the License. <screen name="shipsettings"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="parameters.formNameValue" value="shipsetupform" global="true"/> @@ -125,6 +126,9 @@ under the License. <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/order/ShipSettings.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -133,7 +137,6 @@ under the License. <screen name="optionsettings"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="parameters.formNameValue" value="optsetupform" global="true"/> @@ -145,6 +148,9 @@ under the License. <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/order/OptionSettings.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -153,7 +159,6 @@ under the License. <screen name="paymentoptions"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="parameters.formNameValue" value="paymentoptions" global="true"/> @@ -166,6 +171,9 @@ under the License. <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/order/PaymentOptions.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -174,7 +182,6 @@ under the License. <screen name="paymentinformation"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="parameters.formNameValue" value="billsetupform"/> @@ -187,6 +194,9 @@ under the License. <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/order/PaymentInformation.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -212,7 +222,6 @@ under the License. <screen name="billsettings"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleBillingInformation"/> @@ -225,6 +234,9 @@ under the License. <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/order/BillSettings.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -252,7 +264,6 @@ under the License. <screen name="checkoutshippingaddress"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleCheckoutOptions"/> @@ -263,6 +274,9 @@ under the License. <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/order/CheckoutShippingAddress.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -271,7 +285,6 @@ under the License. <screen name="checkoutshippingoptions"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleCheckoutOptions"/> @@ -282,6 +295,9 @@ under the License. <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/order/CheckoutShippingOptions.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -339,7 +355,6 @@ under the License. <screen name="orderhistory"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleOrderHistory"/> @@ -350,6 +365,9 @@ under the License. <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/order/OrderHistory.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -358,7 +376,6 @@ under the License. <screen name="orderstatus"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="maySelectItems" value="Y"/> @@ -370,6 +387,9 @@ under the License. <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/order/OrderStatus.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -378,7 +398,6 @@ under the License. <screen name="requestreturn"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleRequestReturn"/> @@ -389,6 +408,9 @@ under the License. <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/order/RequestReturn.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -439,7 +461,6 @@ under the License. <screen name="quickAnonCustSettings"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="parameters.formNameValue" value="quickAnonCustSetupForm" global="true"/> @@ -452,6 +473,9 @@ under the License. <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/order/QuickAnonCustSettings.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -630,7 +654,6 @@ under the License. <screen name="checkoutpayment"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleCheckoutOptions"/> @@ -642,6 +665,9 @@ under the License. <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/order/CheckoutPayment.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/QuoteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/QuoteScreens.xml?rev=1851136&r1=1851135&r2=1851136&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/QuoteScreens.xml (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/QuoteScreens.xml Sat Jan 12 06:16:36 2019 @@ -23,7 +23,6 @@ under the License. <screen name="ListQuotes"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleListQuotes"/> @@ -42,6 +41,9 @@ under the License. <html><html-template location="component://ecommerce/template/quote/QuoteList.ftl"/></html> </platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> @@ -49,7 +51,6 @@ under the License. <screen name="ViewQuote"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleViewQuote"/> @@ -84,6 +85,9 @@ under the License. </fail-widgets> </section> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/ShoppingListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/ShoppingListScreens.xml?rev=1851136&r1=1851135&r2=1851136&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/ShoppingListScreens.xml (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/ShoppingListScreens.xml Sat Jan 12 06:16:36 2019 @@ -24,7 +24,6 @@ under the License. <screen name="editShoppingList"> <section> <actions> - <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleShoppingList"/> @@ -36,6 +35,9 @@ under the License. <decorator-section name="body"> <platform-specific><html><html-template location="component://ecommerce/template/shoppinglist/EditShoppingList.ftl"/></html></platform-specific> </decorator-section> + <decorator-section name="right-column"> + <include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/> + </decorator-section> </decorator-screen> </widgets> </section> |
Free forum by Nabble | Edit this page |