svn commit: r1740485 - in /ofbiz/trunk/specialpurpose/ecommerce: data/ template/ template/blog/ template/cart/ template/catalog/ template/customer/ template/forum/ template/includes/ template/order/ template/quote/ template/request/ template/shoppingli...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1740485 - in /ofbiz/trunk/specialpurpose/ecommerce: data/ template/ template/blog/ template/cart/ template/catalog/ template/customer/ template/forum/ template/includes/ template/order/ template/quote/ template/request/ template/shoppingli...

Deepak Dixit-5
Author: deepak
Date: Fri Apr 22 11:42:03 2016
New Revision: 1740485

URL: http://svn.apache.org/viewvc?rev=1740485&view=rev
Log:
(OFBIZ-6821) relocate .ftl files in the specialpurpose/ecommerce component
Thanks Pierre for your contribution.

Added:
    ofbiz/trunk/specialpurpose/ecommerce/template/blog/
      - copied from r1740441, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/
    ofbiz/trunk/specialpurpose/ecommerce/template/cart/
      - copied from r1740441, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/
    ofbiz/trunk/specialpurpose/ecommerce/template/catalog/
      - copied from r1740441, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/
    ofbiz/trunk/specialpurpose/ecommerce/template/customer/
      - copied from r1740441, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/
    ofbiz/trunk/specialpurpose/ecommerce/template/forum/
      - copied from r1740441, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/
    ofbiz/trunk/specialpurpose/ecommerce/template/includes/
      - copied from r1740441, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/
    ofbiz/trunk/specialpurpose/ecommerce/template/login.ftl
      - copied unchanged from r1740441, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl
    ofbiz/trunk/specialpurpose/ecommerce/template/main.ftl
      - copied unchanged from r1740441, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/main.ftl
    ofbiz/trunk/specialpurpose/ecommerce/template/order/
      - copied from r1740441, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/
    ofbiz/trunk/specialpurpose/ecommerce/template/quote/
      - copied from r1740441, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/
    ofbiz/trunk/specialpurpose/ecommerce/template/request/
      - copied from r1740441, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/
    ofbiz/trunk/specialpurpose/ecommerce/template/requirePasswordChange.ftl
      - copied unchanged from r1740441, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/requirePasswordChange.ftl
    ofbiz/trunk/specialpurpose/ecommerce/template/shoppinglist/
      - copied from r1740441, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/
Removed:
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/main.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/requirePasswordChange.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/
Modified:
    ofbiz/trunk/specialpurpose/ecommerce/data/DemoTemplateData.xml
    ofbiz/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/ContentScreens.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/CustRequestScreens.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/EmailContactListScreens.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/QuoteScreens.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/ShoppingListScreens.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml

Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoTemplateData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoTemplateData.xml?rev=1740485&r1=1740484&r2=1740485&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoTemplateData.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoTemplateData.xml Fri Apr 22 11:42:03 2016
@@ -19,5 +19,5 @@ under the License.
 -->
 
 <entity-engine-xml>
-    <DataResource dataResourceId="TPL_XML_MB" dataResourceTypeId="LOCAL_FILE" dataTemplateTypeId="FTL" objectInfo="component://ecommerce/webapp/ecommerce/content/tpl_mb_content.ftl" createdDate="2004-06-14 11:40:15.818" createdByUserLogin="admin" lastModifiedDate="2004-06-14 11:40:15.818" lastModifiedByUserLogin="admin" lastUpdatedStamp="2003-12-31 11:40:15.819"/>
+    <DataResource dataResourceId="TPL_XML_MB" dataResourceTypeId="LOCAL_FILE" dataTemplateTypeId="FTL" objectInfo="component://ecommerce/template/content/tpl_mb_content.ftl" createdDate="2004-06-14 11:40:15.818" createdByUserLogin="admin" lastModifiedDate="2004-06-14 11:40:15.818" lastModifiedByUserLogin="admin" lastUpdatedStamp="2003-12-31 11:40:15.819"/>
 </entity-engine-xml>

Modified: ofbiz/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml?rev=1740485&r1=1740484&r2=1740485&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml Fri Apr 22 11:42:03 2016
@@ -26,7 +26,7 @@ under the License.
     <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/content/contentForum.css" sequenceId="03"/>
     <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="04"/>
     <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="05"/>
-    <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/header.ftl" sequenceId="06"/>
-    <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/footer.ftl" sequenceId="07"/>
+    <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://ecommerce/template/includes/header.ftl" sequenceId="06"/>
+    <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://ecommerce/template/includes/footer.ftl" sequenceId="07"/>
     <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/images/ecdefaulttheme.jpg" sequenceId="08"/>
 </entity-engine-xml>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml?rev=1740485&r1=1740484&r2=1740485&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml Fri Apr 22 11:42:03 2016
@@ -28,7 +28,7 @@ under the License.
                 <set field="initialLocaleComplete" type="String" value="${groovy:parameters?.userLogin?.lastLocale}" default-value="${groovy:locale.toString()}"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/cart/microcart.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/cart/microcart.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -49,7 +49,7 @@ under the License.
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/cart/ShowPromoText.groovy"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/cart/minipromotext.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/cart/minipromotext.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -80,7 +80,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/cart/showcart.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/cart/showcart.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -138,7 +138,7 @@ under the License.
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/cart/ShowCart.groovy"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/cart/UpdateCart.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/cart/UpdateCart.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml?rev=1740485&r1=1740484&r2=1740485&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml Fri Apr 22 11:42:03 2016
@@ -29,7 +29,7 @@ under the License.
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/catalog/choosecatalog.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -52,7 +52,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://ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/catalog/sidedeepcategory.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -64,7 +64,7 @@ under the License.
                 <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/minireorderprods.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/catalog/minireorderprods.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -72,7 +72,7 @@ under the License.
     <screen name="miniassocprods">
         <section>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/miniassocprods.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/catalog/miniassocprods.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -84,7 +84,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://ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/catalog/minilastviewedcategories.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -96,7 +96,7 @@ under the License.
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/catalog/minilastviewedproducts.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -108,7 +108,7 @@ under the License.
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/catalog/minilastproductsearches.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -121,7 +121,7 @@ under the License.
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/catalog/miniproductsummary.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -238,7 +238,7 @@ under the License.
                 <!-- TODO/NOTE DEJ20070223: for some reason this isn't working, doing an assign within the FTL file which does work: <set field="productCategoryLink" from-field="requestAttributes.productCategoryLink"/> -->
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/catalog/ProductCategoryLink.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -283,7 +283,7 @@ under the License.
             </actions>
             <widgets>
                 <include-screen name="breadcrumbs"/>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/productdetail.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/catalog/productdetail.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -309,7 +309,7 @@ under the License.
             </actions>
             <widgets>
                 <include-screen name="breadcrumbs"/>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/catalog/configproductdetail.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -326,7 +326,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/productreview.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/catalog/productreview.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -345,7 +345,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/lastviewedproducts.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/catalog/lastviewedproducts.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -355,7 +355,7 @@ under the License.
     <screen name="detailImage">
         <section>
             <widgets>
-               <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/detailImage.ftl"/></html></platform-specific>
+               <platform-specific><html><html-template location="component://ecommerce/template/catalog/detailImage.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -368,7 +368,7 @@ under the License.
             </actions>
             <widgets>
                 <platform-specific>
-                    <html><html-template location="component://ecommerce/webapp/ecommerce/catalog/tellafriend.ftl"/></html>
+                    <html><html-template location="component://ecommerce/template/catalog/tellafriend.ftl"/></html>
                 </platform-specific>
             </widgets>
         </section>
@@ -467,7 +467,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/catalog/advancedsearch.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -479,7 +479,7 @@ under the License.
                 <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/catalog/LayeredNavBar.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -489,7 +489,7 @@ under the License.
                 <set field="productsummaryScreen" value="component://ecommerce/widget/CatalogScreens.xml#productsummary"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/catalog/LayeredCategoryDetail.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -512,7 +512,7 @@ under the License.
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/BestSellingCategory.groovy"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/ShowBestSellingCategory.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/catalog/ShowBestSellingCategory.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -524,7 +524,7 @@ under the License.
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/catalog/ProductCategories.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -586,7 +586,7 @@ under the License.
             </actions>
             <widgets>
                 <platform-specific>
-                    <html><html-template location="component://ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl"/></html>
+                    <html><html-template location="component://ecommerce/template/catalog/ajaxbreadcrumbs.ftl"/></html>
                 </platform-specific>
             </widgets>
         </section>
@@ -599,7 +599,7 @@ under the License.
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/PopularTags.groovy"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/populartags.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/catalog/populartags.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1740485&r1=1740484&r2=1740485&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml Fri Apr 22 11:42:03 2016
@@ -61,8 +61,8 @@ under the License.
                     <field-map field-name="themeResources" from-field="layoutSettings"/>
                 </service>
                 <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/>
-                <set field="headerTemplateLocation" from-field="layoutSettings.VT_HDR_TMPLT_LOC[0]" default-value="component://ecommerce/webapp/ecommerce/includes/header.ftl"/>
-                <set field="footerTemplateLocation" from-field="layoutSettings.VT_FTR_TMPLT_LOC[0]" default-value="component://ecommerce/webapp/ecommerce/includes/footer.ftl"/>
+                <set field="headerTemplateLocation" from-field="layoutSettings.VT_HDR_TMPLT_LOC[0]" default-value="component://ecommerce/template/includes/header.ftl"/>
+                <set field="footerTemplateLocation" from-field="layoutSettings.VT_FTR_TMPLT_LOC[0]" default-value="component://ecommerce/template/includes/footer.ftl"/>
                 <entity-and list="webAnalyticsConfigs" entity-name="WebAnalyticsConfig">
                     <field-map field-name="webSiteId"/>
                 </entity-and>
@@ -74,7 +74,7 @@ under the License.
                      <not><if-empty field="globalContext.productStore"/></not>
                   </condition>
                   <widgets>
-                     <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/includes/headerHead.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/webcommon/includes/openhtmlbody.ftl"/></html></platform-specific>
                      <!-- render header -->
                      <container id="header"><platform-specific><html><html-template location="${headerTemplateLocation}"/></html></platform-specific></container>
@@ -280,7 +280,7 @@ under the License.
                 <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/includes/headerHead.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/webcommon/includes/openhtmlbody.ftl"/></html></platform-specific>
                 <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
 
@@ -295,7 +295,7 @@ under the License.
     <screen name="language">
         <section>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/includes/language.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/includes/language.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -319,7 +319,7 @@ under the License.
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <platform-specific>
-                            <html><html-template location="component://ecommerce/webapp/ecommerce/main.ftl"/></html>
+                            <html><html-template location="component://ecommerce/template/main.ftl"/></html>
                         </platform-specific>
                     </decorator-section>
                 </decorator-screen>
@@ -337,11 +337,11 @@ under the License.
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <platform-specific>
-                            <html><html-template location="component://ecommerce/webapp/ecommerce/login.ftl"/></html>
+                            <html><html-template location="component://ecommerce/template/login.ftl"/></html>
                         </platform-specific>
                         <!-- <include-screen name="ListThirdPartyLogins" location="component://passport/widget/PassportScreens.xml"/> -->
                         <platform-specific>
-                            <html><html-template location="component://ecommerce/webapp/ecommerce/order/startanoncheckout.ftl"/></html>
+                            <html><html-template location="component://ecommerce/template/order/startanoncheckout.ftl"/></html>
                         </platform-specific>
                     </decorator-section>
                 </decorator-screen>
@@ -359,7 +359,7 @@ under the License.
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <platform-specific>
-                            <html><html-template location="component://ecommerce/webapp/ecommerce/requirePasswordChange.ftl"/></html>
+                            <html><html-template location="component://ecommerce/template/requirePasswordChange.ftl"/></html>
                         </platform-specific>
                     </decorator-section>
                 </decorator-screen>
@@ -382,14 +382,14 @@ under the License.
                     <widgets>
                         <container style="responseSelected">
                             <container style="responsetext">
-                                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/messageDisplay.ftl"/></html></platform-specific>
+                                <platform-specific><html><html-template location="component://ecommerce/template/forum/messageDisplay.ftl"/></html></platform-specific>
                             </container>
                         </container>
                     </widgets>
                     <fail-widgets>
                         <container>
                             <container style="responsetext">
-                                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/messageDisplay.ftl"/></html></platform-specific>
+                                <platform-specific><html><html-template location="component://ecommerce/template/forum/messageDisplay.ftl"/></html></platform-specific>
                             </container>
                         </container>
                     </fail-widgets>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ContentScreens.xml?rev=1740485&r1=1740484&r2=1740485&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/ContentScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/ContentScreens.xml Fri Apr 22 11:42:03 2016
@@ -30,7 +30,7 @@ under the License.
             </actions>
 
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/content/minipoll.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/content/minipoll.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -38,7 +38,7 @@ under the License.
     <screen name="content_categories">
         <section>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/content/content_categories.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/content/content_categories.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -46,7 +46,7 @@ under the License.
     <screen name="factoids">
         <section>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/content/factoids.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/content/factoids.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -57,7 +57,7 @@ under the License.
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/content/Mrv.groovy"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/content/recentlyviewed.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/content/recentlyviewed.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -78,7 +78,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/content/defaultcontent.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/content/defaultcontent.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -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://ecommerce/webapp/ecommerce/content/showcontenttree.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/content/showcontenttree.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -129,7 +129,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/content/searchContent.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/content/searchContent.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -152,7 +152,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/content/viewcontent.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/content/viewcontent.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CustRequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CustRequestScreens.xml?rev=1740485&r1=1740484&r2=1740485&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CustRequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CustRequestScreens.xml Fri Apr 22 11:42:03 2016
@@ -52,7 +52,7 @@ under the License.
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <platform-specific>
-                            <html><html-template location="component://ecommerce/webapp/ecommerce/request/RequestList.ftl"/></html>
+                            <html><html-template location="component://ecommerce/template/request/RequestList.ftl"/></html>
                         </platform-specific>
                     </decorator-section>
                 </decorator-screen>
@@ -88,7 +88,7 @@ under the License.
                             <widgets>
                                 <container style="lefthalf">
                                     <platform-specific>
-                                        <html><html-template location="component://ecommerce/webapp/ecommerce/request/requestInfo.ftl"/></html>
+                                        <html><html-template location="component://ecommerce/template/request/requestInfo.ftl"/></html>
                                     </platform-specific>
                                     <platform-specific>
                                         <html><html-template location="component://order/webapp/ordermgr/request/ViewRequestItemInfo.ftl"/></html>
@@ -102,7 +102,7 @@ under the License.
                                         <html><html-template location="component://order/webapp/ordermgr/request/requestContactMech.ftl"/></html>
                                     </platform-specific>
                                     <platform-specific>
-                                        <html><html-template location="component://ecommerce/webapp/ecommerce/request/requestRoles.ftl"/></html>
+                                        <html><html-template location="component://ecommerce/template/request/requestRoles.ftl"/></html>
                                     </platform-specific>
                                 </container>
                             </widgets>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml?rev=1740485&r1=1740484&r2=1740485&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml Fri Apr 22 11:42:03 2016
@@ -62,7 +62,7 @@ under the License.
                         <platform-specific>
                             <html>
                                 <html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/>                                
-                                <html-template location="component://ecommerce/webapp/ecommerce/customer/editcontactmech.ftl"/>
+                                <html-template location="component://ecommerce/template/customer/editcontactmech.ftl"/>
                             </html>
                         </platform-specific>
                     </decorator-section>
@@ -81,7 +81,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/editcreditcard.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/customer/editcreditcard.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -96,7 +96,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/editeftaccount.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/customer/editeftaccount.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -111,7 +111,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/editgiftcard.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/customer/editgiftcard.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -127,7 +127,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/changepassword.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/customer/changepassword.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -144,7 +144,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/editperson.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/customer/editperson.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -164,7 +164,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/customer/giftcardbalance.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -183,7 +183,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/giftcardlink.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/customer/giftcardlink.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -199,7 +199,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/customersurvey.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/customer/customersurvey.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -221,7 +221,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/newmsg.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/customer/newmsg.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -260,7 +260,7 @@ under the License.
                     </actions>
                     <widgets></widgets>
                 </section>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/messagelist.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/customer/messagelist.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -273,7 +273,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/messagedetail.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/customer/messagedetail.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -294,7 +294,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/newmsg.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/customer/newmsg.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -316,7 +316,7 @@ under the License.
                         <section>
                             <condition><if-compare field="productStore.enableDigProdUpload" operator="equals" value="Y"/></condition>
                             <widgets>
-                                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl"/></html></platform-specific>
+                                <platform-specific><html><html-template location="component://ecommerce/template/customer/digitalproductlist.ftl"/></html></platform-specific>
                             </widgets>
                             <fail-widgets>
                                 <container><label style="head2" text="${uiLabelMap.EcommerceSorryDigitalProductUploadNotEnabled}"></label></container>
@@ -369,7 +369,7 @@ under the License.
                         <section>
                             <condition><if-compare field="productStore.enableDigProdUpload" operator="equals" value="Y"/></condition>
                             <widgets>
-                                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl"/></html></platform-specific>
+                                <platform-specific><html><html-template location="component://ecommerce/template/customer/digitalproductedit.ftl"/></html></platform-specific>
                             </widgets>
                             <fail-widgets>
                                 <container><label style="head2" text="${uiLabelMap.EcommerceSorryDigitalProductUploadNotEnabled}"></label></container>
@@ -417,7 +417,7 @@ under the License.
                                         </entity-one>
                                     </actions>
                                     <widgets>
-                                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl"/></html></platform-specific>
+                                        <platform-specific><html><html-template location="component://ecommerce/template/customer/FinAccountDetail.ftl"/></html></platform-specific>
                                     </widgets>
                                 </section>
                             </iterate-section>
@@ -452,7 +452,7 @@ under the License.
                     <widgets>
                         <platform-specific>
                             <html>
-                                <html-template location="component://ecommerce/webapp/ecommerce/customer/SerializedInventorySummary.ftl"/>
+                                <html-template location="component://ecommerce/template/customer/SerializedInventorySummary.ftl"/>
                             </html>
                         </platform-specific>
                     </widgets>
@@ -484,7 +484,7 @@ under the License.
                     <widgets>
                         <platform-specific>
                             <html>
-                                <html-template location="component://ecommerce/webapp/ecommerce/customer/SubscriptionSummary.ftl"/>
+                                <html-template location="component://ecommerce/template/customer/SubscriptionSummary.ftl"/>
                             </html>
                         </platform-specific>
                     </widgets>
@@ -515,7 +515,7 @@ under the License.
                         <platform-specific>
                             <html>
                                 <html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/>
-                                <html-template location="component://ecommerce/webapp/ecommerce/customer/newcustomer.ftl"/>
+                                <html-template location="component://ecommerce/template/customer/newcustomer.ftl"/>
                             </html>
                         </platform-specific>
                     </decorator-section>
@@ -538,7 +538,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/viewprofile.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/customer/viewprofile.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -558,7 +558,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/customer/profile/NewCustomer.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -582,7 +582,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/customer/profile/ViewProfile.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -602,7 +602,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/customer/profile/EditProfile.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -624,7 +624,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/customer/profile/ManageAddress.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -646,7 +646,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/AnonContactus.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/customer/AnonContactus.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -668,7 +668,7 @@ under the License.
                       </not>
                     </condition>
                     <widgets>
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/viewreviews.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/customer/viewreviews.ftl"/></html></platform-specific>
                     </widgets>
               </section>
             </widgets>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/EmailContactListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/EmailContactListScreens.xml?rev=1740485&r1=1740484&r2=1740485&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/EmailContactListScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/EmailContactListScreens.xml Fri Apr 22 11:42:03 2016
@@ -45,7 +45,7 @@ under the License.
                 <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/customer/miniSignUpForContactList.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml?rev=1740485&r1=1740484&r2=1740485&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml Fri Apr 22 11:42:03 2016
@@ -41,7 +41,7 @@ under the License.
                 </entity-condition>
             </actions>
             <widgets><platform-specific><html>
-                <html-template location="component://ecommerce/webapp/ecommerce/forum/forums.ftl"/>
+                <html-template location="component://ecommerce/template/forum/forums.ftl"/>
             </html></platform-specific>
             </widgets>
         </section>
@@ -98,9 +98,9 @@ under the License.
                                           </link>
                                     </widgets>
                                 </section>
-                                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/forumPaging.ftl"/></html></platform-specific>
-                                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/showforum.ftl"/></html></platform-specific>
-                                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/forumPaging.ftl"/></html></platform-specific>
+                                <platform-specific><html><html-template location="component://ecommerce/template/forum/forumPaging.ftl"/></html></platform-specific>
+                                <platform-specific><html><html-template location="component://ecommerce/template/forum/showforum.ftl"/></html></platform-specific>
+                                <platform-specific><html><html-template location="component://ecommerce/template/forum/forumPaging.ftl"/></html></platform-specific>
                             </widgets>
                         </section>
                     </decorator-section>
@@ -197,7 +197,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/createforumarticle.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/forum/createforumarticle.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -244,7 +244,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/editforumarticle.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/forum/editforumarticle.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -290,7 +290,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/editforumarticle.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/forum/editforumarticle.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -341,7 +341,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/createforumresponse.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/forum/createforumresponse.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -382,7 +382,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/editforuminfo.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/forum/editforuminfo.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -435,7 +435,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/editaddforumdata.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/forum/editaddforumdata.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -481,7 +481,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/editaddimage.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/forum/editaddimage.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=1740485&r1=1740484&r2=1740485&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml Fri Apr 22 11:42:03 2016
@@ -29,7 +29,7 @@ under the License.
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/AnonymousTrail.groovy"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/anonymoustrail.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/order/anonymoustrail.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -37,7 +37,7 @@ under the License.
     <screen name="genericaddress">
         <section>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/genericaddress.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/order/genericaddress.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -45,7 +45,7 @@ under the License.
     <screen name="orderheader">
         <section>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/orderheader.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/order/orderheader.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -53,7 +53,7 @@ under the License.
     <screen name="orderitems">
         <section>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/orderitems.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/order/orderitems.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -66,7 +66,7 @@ under the License.
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/AnonymousCheckoutLinks.groovy"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/anonymousCheckoutLinks.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/order/anonymousCheckoutLinks.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -103,7 +103,7 @@ under the License.
             <widgets>
                 <decorator-screen name="anonymousCheckoutDecorator">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/custsettings.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/custsettings.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -123,7 +123,7 @@ under the License.
             <widgets>
                 <decorator-screen name="anonymousCheckoutDecorator">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/shipsettings.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/shipsettings.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -143,7 +143,7 @@ under the License.
             <widgets>
                 <decorator-screen name="anonymousCheckoutDecorator">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/optionsettings.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/optionsettings.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -164,7 +164,7 @@ under the License.
             <widgets>
                 <decorator-screen name="anonymousCheckoutDecorator">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/paymentoptions.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/paymentoptions.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -185,7 +185,7 @@ under the License.
             <widgets>
                 <decorator-screen name="anonymousCheckoutDecorator">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/paymentinformation.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/paymentinformation.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -202,7 +202,7 @@ under the License.
             <widgets>
                 <decorator-screen name="anonymousCheckoutDecorator">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/checkoutreview.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/checkoutreview.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -223,7 +223,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/billsettings.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/billsettings.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -280,7 +280,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/checkoutshippingoptions.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -296,7 +296,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/splitship.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/splitship.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -313,7 +313,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/checkoutreview.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/checkoutreview.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -329,7 +329,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/ordercomplete.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/ordercomplete.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -348,7 +348,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/orderhistory.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/orderhistory.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -368,7 +368,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/orderstatus.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/orderstatus.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -387,7 +387,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/requestreturn.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/requestreturn.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -399,7 +399,7 @@ under the License.
     <screen name="quickAnonOrderHeader">
         <section>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/order/quickAnonOrderHeader.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -411,7 +411,7 @@ under the License.
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCheckoutLinks.groovy"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/quickAnonCheckoutLinks.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/order/quickAnonCheckoutLinks.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -450,7 +450,7 @@ under the License.
             <widgets>
                 <decorator-screen name="quickAnonCheckoutDecorator">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/quickAnonCustSettings.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -473,7 +473,7 @@ under the License.
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonOptionSettings.groovy"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/order/quickAnonOptionSettings.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -486,7 +486,7 @@ under the License.
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/StorePaymentOptions.groovy"/>
             </actions>
             <widgets>
-               <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl"/></html></platform-specific>
+               <platform-specific><html><html-template location="component://ecommerce/template/order/quickAnonPaymentInformation.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -501,7 +501,7 @@ under the License.
             <widgets>
                 <decorator-screen name="quickAnonCheckoutDecorator">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/quickAnonCheckoutReview.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -523,7 +523,7 @@ under the License.
             </actions>
             <widgets>
                 <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/ccinfo.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/order/ccinfo.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -543,7 +543,7 @@ under the License.
             </actions>
             <widgets>
                 <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/eftinfo.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/order/eftinfo.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -563,7 +563,7 @@ under the License.
             </actions>
             <widgets>
               <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
-              <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/gcinfo.ftl"/></html></platform-specific>
+              <platform-specific><html><html-template location="component://ecommerce/template/order/gcinfo.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -582,7 +582,7 @@ under the License.
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonPaymentInformation.groovy"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/orderitems.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/order/orderitems.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -601,7 +601,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/OnePageCheckoutProcess.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/QuoteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/QuoteScreens.xml?rev=1740485&r1=1740484&r2=1740485&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/QuoteScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/QuoteScreens.xml Fri Apr 22 11:42:03 2016
@@ -40,7 +40,7 @@ under the License.
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <platform-specific>
-                            <html><html-template location="component://ecommerce/webapp/ecommerce/quote/QuoteList.ftl"/></html>
+                            <html><html-template location="component://ecommerce/template/quote/QuoteList.ftl"/></html>
                         </platform-specific>
                     </decorator-section>
                 </decorator-screen>
@@ -76,7 +76,7 @@ under the License.
                             </condition>
                             <widgets>
                                 <platform-specific>
-                                    <html><html-template location="component://ecommerce/webapp/ecommerce/quote/CreateOrderQuote.ftl"/></html>
+                                    <html><html-template location="component://ecommerce/template/quote/CreateOrderQuote.ftl"/></html>
                                 </platform-specific>
                                 <include-screen name="ViewQuoteTemplate" location="component://order/widget/ordermgr/QuoteScreens.xml"/>
                             </widgets>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ShoppingListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ShoppingListScreens.xml?rev=1740485&r1=1740484&r2=1740485&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/ShoppingListScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/ShoppingListScreens.xml Fri Apr 22 11:42:03 2016
@@ -34,7 +34,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/shoppinglist/editShoppingList.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -59,7 +59,7 @@ under the License.
                 <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/shoppinglist/editShoppingList.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml?rev=1740485&r1=1740484&r2=1740485&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml Fri Apr 22 11:42:03 2016
@@ -116,7 +116,7 @@
                                 <widgets>
                                     <container style="blogwrapper">
                                         <include-menu name="view_edit" location="component://ecommerce/widget/blog/BlogMenus.xml"/>
-                                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/blog/blogContentAltLink.ftl"/></html></platform-specific>
+                                        <platform-specific><html><html-template location="component://ecommerce/template/blog/blogContentAltLink.ftl"/></html></platform-specific>
                                         <!--<link text="${blog.contentName} [${blog.contentId}]" target="ViewBlogArticle" style="blogheader">
                                             <parameter param-name="contentId" from-field="blog.contentId"/>
                                             <parameter param-name="blogContentId"/>
@@ -140,7 +140,7 @@
                                     <container style="blogwrapper">
                                         <include-menu name="view_edit" location="component://ecommerce/widget/blog/BlogMenus.xml"/>
                                         <!--<label text="${blog.contentName} [${blog.contentId}]" style="blogheader"/>-->
-                                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/blog/blogContentAltLink.ftl"/></html></platform-specific>
+                                        <platform-specific><html><html-template location="component://ecommerce/template/blog/blogContentAltLink.ftl"/></html></platform-specific>
                                         <!--<link text="${blog.contentName} [${blog.contentId}]" target="ViewBlogArticle" style="blogheader">
                                             <parameter param-name="contentId" from-field="blog.contentId"/>
                                             <parameter param-name="blogContentId"/>
@@ -692,7 +692,7 @@
             <widgets>
                 <platform-specific>
                     <html>
-                        <html-template location="component://ecommerce/webapp/ecommerce/blog/blogs.ftl"/>
+                        <html-template location="component://ecommerce/template/blog/blogs.ftl"/>
 
                     </html>
                 </platform-specific>