Author: jleroux
Date: Sun Apr 3 21:40:33 2016 New Revision: 1737608 URL: http://svn.apache.org/viewvc?rev=1737608&view=rev Log: Just stumbled upon it by chance, these changes needed in ecommerce were missing in r1736868 for OFBIZ-6819 (order) I will double-check all screens changes kept in r1737557 (ie initially committed for subtasks 25 to 32 of OFBIZ-6810) From 1st investigation I believe there are no others (at least dependency in specialpurpose from applications, I did not check specialpurpose interdependencies yet...) Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml?rev=1737608&r1=1737607&r2=1737608&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml Sun Apr 3 21:40:33 2016 @@ -39,7 +39,7 @@ under the License. <set field="hidebottomlinks" value="N"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/minicart.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/cart/minicart.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -57,7 +57,7 @@ under the License. <screen name="promoUseDetailsInline"> <section> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/cart/promoUseDetailsInline.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -101,7 +101,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/webapp/ordermgr/entry/cart/showAllPromotions.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/cart/showAllPromotions.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml?rev=1737608&r1=1737607&r2=1737608&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml Sun Apr 3 21:40:33 2016 @@ -40,7 +40,7 @@ under the License. <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearchOptions.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/keywordsearchbox.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -135,7 +135,8 @@ under the License. <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/productsummary.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/productsummary.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/productsummary.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -147,7 +148,7 @@ under the License. <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/SideDeepCategory.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/breadcrumbs.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -214,7 +215,7 @@ under the License. <set field="paginateEcommerceStyle" value="Y"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/categorydetail.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/categorydetail.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -294,7 +295,7 @@ under the License. <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/inlineProductDetail.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -389,7 +390,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/webapp/ordermgr/entry/catalog/quickadd.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/quickadd.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -402,7 +403,7 @@ under the License. <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/quickaddsummary.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -423,7 +424,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/webapp/ordermgr/entry/catalog/keywordsearch.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/keywordsearch.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -446,7 +447,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/webapp/ordermgr/entry/catalog/tagsearch.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/catalog/tagsearch.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml?rev=1737608&r1=1737607&r2=1737608&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml Sun Apr 3 21:40:33 2016 @@ -33,7 +33,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/webapp/ordermgr/entry/survey.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/survey.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml?rev=1737608&r1=1737607&r2=1737608&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml Sun Apr 3 21:40:33 2016 @@ -242,7 +242,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/webapp/ordermgr/entry/checkoutoptions.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/checkoutoptions.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -261,7 +261,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/webapp/ordermgr/entry/checkoutshippingaddress.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://order/template/entry/checkoutshippingaddress.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> |
Free forum by Nabble | Edit this page |