svn commit: r1737703 - in /ofbiz/trunk/specialpurpose/hh
Locked
svn commit: r1737703 - in /ofbiz/trunk/specialpurpose/hh
 
|
Author: jleroux
Date: Mon Apr 4 16:22:01 2016 New Revision: 1737703 URL: http://svn.apache.org/viewvc?rev=1737703&view=rev Log: A patch from Pierre Smits for "relocate .ftl files in the specialpurpose/hhfacility component" https://issues.apache.org/jira/browse/OFBIZ-6835 jleroux: OFBIZ-6835-hhfacility-widget-ftl-relocation.patch applied, ftl files moved by hand in Eclipse Added: ofbiz/trunk/specialpurpose/hhfacility/template/ ofbiz/trunk/specialpurpose/hhfacility/template/facilities.ftl - copied unchanged from r1737691, ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl ofbiz/trunk/specialpurpose/hhfacility/template/includes/ - copied from r1737691, ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/ ofbiz/trunk/specialpurpose/hhfacility/template/login.ftl - copied unchanged from r1737691, ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl ofbiz/trunk/specialpurpose/hhfacility/template/main.ftl - copied unchanged from r1737691, ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/main.ftl ofbiz/trunk/specialpurpose/hhfacility/template/menu.ftl - copied unchanged from r1737691, ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl ofbiz/trunk/specialpurpose/hhfacility/template/productstocktake.ftl - copied unchanged from r1737691, ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/productstocktake.ftl ofbiz/trunk/specialpurpose/hhfacility/template/receipt.ftl - copied unchanged from r1737691, ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl ofbiz/trunk/specialpurpose/hhfacility/template/setFocusOnField.ftl - copied unchanged from r1737691, ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/setFocusOnField.ftl ofbiz/trunk/specialpurpose/hhfacility/template/stocktake.ftl - copied unchanged from r1737691, ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/stocktake.ftl Removed: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/main.ftl ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/productstocktake.ftl ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/setFocusOnField.ftl ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/stocktake.ftl Modified: ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml Modified: ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml?rev=1737703&r1=1737702&r2=1737703&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml (original) +++ ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml Mon Apr 4 16:22:01 2016 @@ -32,18 +32,18 @@ under the License. <include-screen name="GlobalActions" location="component://common/widget/CommonScreens.xml" /> <platform-specific> <html> - <html-template location="component://hhfacility/webapp/hhfacility/includes/header.ftl" /> + <html-template location="component://hhfacility/template/includes/header.ftl" /> </html> </platform-specific> <platform-specific> <html> - <html-template location="component://hhfacility/webapp/hhfacility/includes/messages.ftl" /> + <html-template location="component://hhfacility/template/includes/messages.ftl" /> </html> </platform-specific> <decorator-section-include name="body" /> <platform-specific> <html> - <html-template location="component://hhfacility/webapp/hhfacility/includes/footer.ftl" /> + <html-template location="component://hhfacility/template/includes/footer.ftl" /> </html> </platform-specific> </widgets> @@ -98,7 +98,7 @@ under the License. <decorator-screen name="CommonDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://hhfacility/webapp/hhfacility/login.ftl"/></html> + <html><html-template location="component://hhfacility/template/login.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -114,7 +114,7 @@ under the License. <widgets> <decorator-screen name="FacilityDecorator"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/menu.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://hhfacility/template/menu.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -129,7 +129,7 @@ under the License. <widgets> <decorator-screen name="FacilityDecorator"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/receipt.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://hhfacility/template/receipt.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -175,7 +175,7 @@ under the License. <decorator-screen name="FacilityDecorator"> <decorator-section name="body"> <include-form name="ProductEnter" location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/> - <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/setFocusOnField.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://hhfacility/template/setFocusOnField.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -193,7 +193,7 @@ under the License. <decorator-screen name="FacilityDecorator"> <decorator-section name="body"> <include-form name="ProductQtyEnter" location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/> - <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/setFocusOnField.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://hhfacility/template/setFocusOnField.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -253,7 +253,7 @@ under the License. <decorator-screen name="FacilityDecorator"> <decorator-section name="body"> <include-form name="FindProductStock" location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/> - <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/stocktake.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://hhfacility/template/stocktake.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -273,7 +273,7 @@ under the License. <decorator-section name="body"> <include-form name="ProductStocktake" location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/> <include-form name="UpdateProductStocktake" location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/> - <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/productstocktake.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://hhfacility/template/productstocktake.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -290,7 +290,7 @@ under the License. </entity-condition> </actions> <widgets> - <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/facilities.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://hhfacility/template/facilities.ftl"/></html></platform-specific> </widgets> </section> </screen> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |