You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2017/08/26 12:21:11 UTC

svn commit: r1806291 - in /ofbiz/ofbiz-plugins/trunk: ecommerce/widget/CommonScreens.xml ecommerce/widget/CustomerScreens.xml ecommerce/widget/OrderScreens.xml example/widget/example/FormWidgetExampleScreens.xml

Author: deepak
Date: Sat Aug 26 12:21:11 2017
New Revision: 1806291

URL: http://svn.apache.org/viewvc?rev=1806291&view=rev
Log:
Fixed: Stack trace on E-commerce Home page (OFBIZ-9652)
Updated common template path as now these common template moved to common-theme component.
Thanks Devanshu for your contribution. 

Modified:
    ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
    ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CustomerScreens.xml
    ofbiz/ofbiz-plugins/trunk/ecommerce/widget/OrderScreens.xml
    ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleScreens.xml

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml?rev=1806291&r1=1806290&r2=1806291&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml Sat Aug 26 12:21:11 2017
@@ -75,7 +75,7 @@ under the License.
                   </condition>
                   <widgets>
                      <platform-specific><html><html-template location="component://ecommerce/template/includes/HeaderHead.ftl"/></html></platform-specific>
-                     <platform-specific><html><html-template location="component://common/template/includes/OpenHtmlBody.ftl"/></html></platform-specific>
+                     <platform-specific><html><html-template location="component://common-theme/template/includes/OpenHtmlBody.ftl"/></html></platform-specific>
                      <!-- render header -->
                      <container id="header"><platform-specific><html><html-template location="${headerTemplateLocation}"/></html></platform-specific></container>
 
@@ -86,7 +86,7 @@ under the License.
 
                         <container id="div3" style="${MainColumnStyle}">
                            <!-- render messages -->
-                           <platform-specific><html><html-template location="component://common/template/includes/Messages.ftl"/></html></platform-specific>
+                           <platform-specific><html><html-template location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific>
                            <decorator-section-include name="body"/>
                         </container>
 
@@ -95,7 +95,7 @@ under the License.
 
                     <!-- render footer -->
                     <container id="footer"><platform-specific><html><html-template location="${footerTemplateLocation}"/></html></platform-specific></container>
-                    <platform-specific><html><html-template location="component://common/template/includes/CloseHtmlBody.ftl"/></html></platform-specific>
+                    <platform-specific><html><html-template location="component://common-theme/template/includes/CloseHtmlBody.ftl"/></html></platform-specific>
                   </widgets>
                   <fail-widgets>
                      <label text="A Product Store has not been defined for this ecommerce site.  A Product Store can be created using the ofbizsetup wizard."/>
@@ -281,12 +281,12 @@ under the License.
             </actions>
             <widgets>
                 <platform-specific><html><html-template location="component://ecommerce/template/includes/HeaderHead.ftl"/></html></platform-specific>
-                <platform-specific><html><html-template location="component://common/template/includes/OpenHtmlBody.ftl"/></html></platform-specific>
-                <platform-specific><html><html-template location="component://common/template/includes/Messages.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://common-theme/template/includes/OpenHtmlBody.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific>
 
                 <decorator-section-include name="body"/>
 
-                <platform-specific><html><html-template location="component://common/template/includes/CloseHtmlBody.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://common-theme/template/includes/CloseHtmlBody.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CustomerScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CustomerScreens.xml?rev=1806291&r1=1806290&r2=1806291&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CustomerScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CustomerScreens.xml Sat Aug 26 12:21:11 2017
@@ -61,7 +61,7 @@ under the License.
                     <decorator-section name="body">
                         <platform-specific>
                             <html>
-                                <html-template location="component://common/template/includes/SetDependentDropdownValuesJs.ftl"/>
+                                <html-template location="component://common-theme/template/includes/SetDependentDropdownValuesJs.ftl"/>
                                 <html-template location="component://ecommerce/template/customer/EditContactMech.ftl"/>
                             </html>
                         </platform-specific>
@@ -514,7 +514,7 @@ under the License.
                     <decorator-section name="body">
                         <platform-specific>
                             <html>
-                                <html-template location="component://common/template/includes/SetDependentDropdownValuesJs.ftl"/>
+                                <html-template location="component://common-theme/template/includes/SetDependentDropdownValuesJs.ftl"/>
                                 <html-template location="component://ecommerce/template/customer/NewCustomer.ftl"/>
                             </html>
                         </platform-specific>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/OrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/OrderScreens.xml?rev=1806291&r1=1806290&r2=1806291&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/OrderScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/OrderScreens.xml Sat Aug 26 12:21:11 2017
@@ -522,7 +522,7 @@ under the License.
                 <script location="component://ecommerce/groovyScripts/order/QuickAnonPaymentInformation.groovy"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://common/template/includes/Messages.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific>
                 <platform-specific><html><html-template location="component://ecommerce/template/order/CcInfo.ftl"/></html></platform-specific>
             </widgets>
         </section>
@@ -542,7 +542,7 @@ under the License.
                 <script location="component://ecommerce/groovyScripts/order/QuickAnonPaymentInformation.groovy"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://common/template/includes/Messages.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific>
                 <platform-specific><html><html-template location="component://ecommerce/template/order/EftInfo.ftl"/></html></platform-specific>
             </widgets>
         </section>
@@ -562,7 +562,7 @@ under the License.
                 <script location="component://ecommerce/groovyScripts/order/QuickAnonPaymentInformation.groovy"/>
             </actions>
             <widgets>
-              <platform-specific><html><html-template location="component://common/template/includes/Messages.ftl"/></html></platform-specific>
+              <platform-specific><html><html-template location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific>
               <platform-specific><html><html-template location="component://ecommerce/template/order/GcInfo.ftl"/></html></platform-specific>
             </widgets>
         </section>

Modified: ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleScreens.xml?rev=1806291&r1=1806290&r2=1806291&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleScreens.xml Sat Aug 26 12:21:11 2017
@@ -77,8 +77,8 @@ under the License.
                                             <set field="asm_sortable" value="false"/>
                                         </actions>
                                         <widgets>
-                                            <platform-specific><html><html-template location="component://common/template/includes/SetDependentDropdownValuesJs.ftl"/></html></platform-specific>
-                                            <platform-specific><html><html-template location="component://common/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific>
+                                            <platform-specific><html><html-template location="component://common-theme/template/includes/SetDependentDropdownValuesJs.ftl"/></html></platform-specific>
+                                            <platform-specific><html><html-template location="component://common-theme/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific>
                                             <include-form name="DropDownFieldsExampleForm" location="component://example/widget/example/FormWidgetExampleForms.xml"/>
                                             <include-form name="DropDownMultipleFieldExampleForm" location="component://example/widget/example/FormWidgetExampleForms.xml"/>
                                         </widgets>