Author: deepak
Date: Sat Jan 12 06:50:54 2019
New Revision: 1851142
URL:
http://svn.apache.org/viewvc?rev=1851142&view=revLog:
Applied fix from trunk for revision: 1851140
===
Fixed:List Request page seems distorted of ecommerce component
(OFBIZ-10621)
Thanks Garima jain for reporting the issue.
Set the col class based on right/left screen inclusion
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:50:54 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,1851139
+/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140
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=1851142&r1=1851141&r2=1851142&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:50:54 2019
@@ -49,6 +49,11 @@ under the License.
<field-map field-name="webSiteId"/>
</entity-and>
<set field="layoutSettings.javaScripts[]" value="/common/js/util/miscAjaxFunctions.js" global="true" />
+ <set field="bodyStyle" value="${groovy:
+ if(sections?.get("left-column") && sections?.get("right-column")) "col-lg-6"
+ else if (sections?.get("left-column") || sections?.get("right-column")) "col-lg-9"
+ else "col-lg-12"
+ }"/>
</actions>
<widgets>
<section>
@@ -74,7 +79,7 @@ under the License.
</container>
</widgets>
</section>
- <container id="div3" style="col-lg-6 order-lg-2 order-1">
+ <container id="div3" style="${bodyStyle} 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"/>
Locked
