OFBiz › OFBiz - Commits

svn commit: r1851141 - in /ofbiz/ofbiz-plugins/branches/release18.12: ./ ecommerce/widget/CommonScreens.xml

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

Deepak Dixit-5

svn commit: r1851141 - in /ofbiz/ofbiz-plugins/branches/release18.12: ./ ecommerce/widget/CommonScreens.xml

Author: deepak
Date: Sat Jan 12 06:48:31 2019
New Revision: 1851141

URL: http://svn.apache.org/viewvc?rev=1851141&view=rev
Log:
Applied fix from trunk for revision: 1851139
===

Only formatting , No function chages
(OFBIZ-10790)

Modified:
ofbiz/ofbiz-plugins/branches/release18.12/ (props changed)
ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CommonScreens.xml

Propchange: ofbiz/ofbiz-plugins/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 12 06:48:31 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,1851135
+/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139

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=1851141&r1=1851140&r2=1851141&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:48:31 2019
@@ -51,61 +51,61 @@ under the License.
<set field="layoutSettings.javaScripts[]" value="/common/js/util/miscAjaxFunctions.js" global="true" />
</actions>
<widgets>
- <section>
- <condition>
- <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>
- 
- <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">
- 
- <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>
+ <section>
+ <condition>
+ <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>
+ 
+ <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">
+ 
+ <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>
- 
- <container id="footer">
- <platform-specific><html><html-template location="${footerTemplateLocation}"/></html></platform-specific>
- </container>
- </container>
+ <container id="div4" style="endcolumns"/>
+ </container>
+ 
+ <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."/>
- </fail-widgets>
- </section>
+ <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."/>
+ </fail-widgets>
+ </section>
</widgets>
</section>
</screen>