Author: deepak
Date: Wed Jan 24 18:07:23 2018
New Revision: 1822146
URL: http://svn.apache.org/viewvc?rev=1822146&view=rev
Log:
Applied fix from trunk for revision: 1822145
===
Improved: Update markup of qucik add page according to standard markup given by
Bootstrap v4.0.0 (OFBIZ-10161)
Thanks Nitish Mishra for your contribution
Added:
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/QuickAdd.ftl
- copied unchanged from r1822145,
ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAdd.ftl
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/QuickAddSummary.ftl
- copied unchanged from r1822145,
ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAddSummary.ftl
Modified:
ofbiz/ofbiz-plugins/branches/release17.12/ (props changed)
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/AdvancedSearch.ftl
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/CatalogScreens.xml
Propchange: ofbiz/ofbiz-plugins/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 24 18:07:23 2018
@@ -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:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143
+/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145
Modified:
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/AdvancedSearch.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/AdvancedSearch.ftl?rev=1822146&r1=1822145&r2=1822146&view=diff
==============================================================================
---
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/AdvancedSearch.ftl
(original)
+++
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/AdvancedSearch.ftl
Wed Jan 24 18:07:23 2018
@@ -156,7 +156,7 @@ under the License.
<a href="<@ofbizUrl>clearSearchOptionsHistoryList</@ofbizUrl>"
class="button">
${uiLabelMap.OrderClearSearchHistory}
</a>
- <h4>${uiLabelMap.OrderClearSearchHistoryNote}</h5>
+ <h4>${uiLabelMap.OrderClearSearchHistoryNote}</h4>
</div>
<#list searchOptionsHistoryList as searchOptions>
<#-- searchOptions type is ProductSearchSession.ProductSearchOptions
-->
Modified:
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/CatalogScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/CatalogScreens.xml?rev=1822146&r1=1822145&r2=1822146&view=diff
==============================================================================
---
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/CatalogScreens.xml
(original)
+++
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/CatalogScreens.xml
Wed Jan 24 18:07:23 2018
@@ -397,7 +397,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific><html><html-template
location="component://order/template/entry/catalog/QuickAdd.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template
location="component://ecommerce/template/order/QuickAdd.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -410,7 +410,7 @@ under the License.
<script
location="component://order/groovyScripts/entry/catalog/ProductSummary.groovy"/>
</actions>
<widgets>
- <platform-specific><html><html-template
location="component://order/template/entry/catalog/QuickAddSummary.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template
location="component://ecommerce/template/order/QuickAddSummary.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
