svn commit: r660107 - in /ofbiz/trunk: applications/accounting/widget
Locked
svn commit: r660107 - in /ofbiz/trunk: applications/accounting/widget
 
|
Author: jacopoc
Date: Sun May 25 23:25:57 2008 New Revision: 660107 URL: http://svn.apache.org/viewvc?rev=660107&view=rev Log: Set correct template type for xsl-fo platform dependent templates: this is now required because the platform-dependent element can now accept different templates for different types. Thanks to Jacques Le Roux for the report. Modified: ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml ofbiz/trunk/applications/content/widget/CommonScreens.xml ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml ofbiz/trunk/framework/common/widget/CommonScreens.xml ofbiz/trunk/framework/webtools/widget/EntityScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Modified: ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml?rev=660107&r1=660106&r2=660107&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml Sun May 25 23:25:57 2008 @@ -47,7 +47,7 @@ <section> <widgets> <platform-specific> - <html><html-template location="component://accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl"/></html> + <xsl-fo><html-template location="component://accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -56,10 +56,10 @@ <section> <widgets> <platform-specific> - <html><html-template location="component://accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl"/></html> + <xsl-fo><html-template location="component://accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl"/></xsl-fo> </platform-specific> <platform-specific> - <html><html-template location="component://accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl"/></html> + <xsl-fo><html-template location="component://accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -76,7 +76,7 @@ </actions> <widgets> <platform-specific> - <html><html-template location="component://accounting/webapp/accounting/payment/printCheck.fo.ftl"/></html> + <xsl-fo><html-template location="component://accounting/webapp/accounting/payment/printCheck.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=660107&r1=660106&r2=660107&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Sun May 25 23:25:57 2008 @@ -527,7 +527,7 @@ </actions> <widgets> <platform-specific> - <html><html-template location="component://accounting/webapp/accounting/payment/PrintChecks.fo.ftl"/></html> + <xsl-fo><html-template location="component://accounting/webapp/accounting/payment/PrintChecks.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=660107&r1=660106&r2=660107&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Sun May 25 23:25:57 2008 @@ -349,7 +349,7 @@ <section> <widgets> <platform-specific> - <html><html-template location="component://content/webapp/content/fonts.fo.ftl"/></html> + <xsl-fo><html-template location="component://content/webapp/content/fonts.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> Modified: ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml?rev=660107&r1=660106&r2=660107&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml Sun May 25 23:25:57 2008 @@ -48,7 +48,7 @@ <section> <widgets> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -58,15 +58,15 @@ <widgets> <!-- the contach mechanisms, terms, payment and shipping methods are shown in the first page --> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl"/></xsl-fo> </platform-specific> <!-- order items and totals --> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/order/orderReportBody.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/order/orderReportBody.fo.ftl"/></xsl-fo> </platform-specific> <!-- return policies and notes are shown in the last page --> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/order/orderReportConditions.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/order/orderReportConditions.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=660107&r1=660106&r2=660107&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Sun May 25 23:25:57 2008 @@ -416,7 +416,7 @@ </actions> <widgets> <platform-specific> - <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl"/></html> + <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml?rev=660107&r1=660106&r2=660107&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml Sun May 25 23:25:57 2008 @@ -65,8 +65,7 @@ </actions> <widgets> <platform-specific> - <!-- NOTE: this is really generating XSL:FO, but the HTML oriented renderer should do fine, the screen will need to be called differently though to get binary output from it --> - <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl"/></html> + <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -88,8 +87,7 @@ </actions> <widgets> <platform-specific> - <!-- NOTE: this is really generating XSL:FO, but the HTML oriented renderer should do fine, the screen will need to be called differently though to get binary output from it --> - <html><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl"/></html> + <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -114,8 +112,7 @@ </actions> <widgets> <platform-specific> - <!-- NOTE: this is really generating XSL:FO, but the HTML oriented renderer should do fine, the screen will need to be called differently though to get binary output from it --> - <html><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl"/></html> + <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -138,8 +135,7 @@ </actions> <widgets> <platform-specific> - <!-- NOTE: this is really generating XSL:FO, but the HTML oriented renderer should do fine, the screen will need to be called differently though to get binary output from it --> - <html><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl"/></html> + <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -190,8 +186,7 @@ </actions> <widgets> <platform-specific> - <!-- NOTE: this is really generating XSL:FO, but the HTML oriented renderer should do fine, the screen will need to be called differently though to get binary output from it --> - <html><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl"/></html> + <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -240,8 +235,7 @@ </actions> <widgets> <platform-specific> - <!-- NOTE: this is really generating XSL:FO, but the HTML oriented renderer should do fine, the screen will need to be called differently though to get binary output from it --> - <html><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsProductsAndOrder.fo.ftl"/></html> + <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsProductsAndOrder.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -265,8 +259,7 @@ </actions> <widgets> <platform-specific> - <!-- NOTE: this is really generating XSL:FO, but the HTML oriented renderer should do fine, the screen will need to be called differently though to get binary output from it --> - <html><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl"/></html> + <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -283,8 +276,8 @@ <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.bsh"/> </actions> <widgets> - <platform-specific> - <html><html-template location="component://manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl"/></html> + <platform-specific> + <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -302,7 +295,7 @@ </actions> <widgets> <platform-specific> - <html><html-template location="component://manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl"/></html> + <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -319,8 +312,8 @@ <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.bsh"/> </actions> <widgets> - <platform-specific> - <html><html-template location="component://manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl"/></html> + <platform-specific> + <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml?rev=660107&r1=660106&r2=660107&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml Sun May 25 23:25:57 2008 @@ -49,7 +49,7 @@ <section> <widgets> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -59,15 +59,15 @@ <widgets> <!-- the contach mechanisms, terms, payment and shipping methods are shown in the first page --> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl"/></xsl-fo> </platform-specific> <!-- order items and totals --> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/order/orderReportBody.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/order/orderReportBody.fo.ftl"/></xsl-fo> </platform-specific> <!-- return policies and notes are shown in the last page --> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/order/orderReportConditions.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/order/orderReportConditions.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -82,7 +82,7 @@ <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh"/> </actions> <widgets> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/order/companyHeader.fo.ftl"/></html></platform-specific> + <platform-specific><xsl-fo><html-template location="component://order/webapp/ordermgr/order/companyHeader.fo.ftl"/></xsl-fo></platform-specific> </widgets> </section> </screen> @@ -111,7 +111,7 @@ <section> <widgets> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/return/returnReportHeaderInfo.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/return/returnReportHeaderInfo.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -121,15 +121,15 @@ <widgets> <!-- the contach mechanisms, terms, payment and shipping methods are shown in the first page --> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/return/returnReportContactMechs.fo.ftl"/></xsl-fo> </platform-specific> <!-- order items and totals --> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/return/returnReportBody.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/return/returnReportBody.fo.ftl"/></xsl-fo> </platform-specific> <!-- return policies and notes are shown in the last page --> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/return/returnReportConditions.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/return/returnReportConditions.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -160,7 +160,7 @@ <section> <widgets> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/order/shipGroups.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/order/shipGroups.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=660107&r1=660106&r2=660107&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Sun May 25 23:25:57 2008 @@ -183,7 +183,7 @@ <section> <widgets> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -193,11 +193,11 @@ <widgets> <!-- the contach mechanisms, terms, payment and shipping methods are shown in the first page --> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl"/></xsl-fo> </platform-specific> <!-- quote items and totals --> <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/quote/quoteReportBody.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/quote/quoteReportBody.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=660107&r1=660106&r2=660107&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Sun May 25 23:25:57 2008 @@ -128,8 +128,7 @@ </actions> <widgets> <platform-specific> - <!-- NOTE: this is really generating XSL:FO, but the HTML oriented renderer should do fine, the screen will need to be called differently though to get binary output from it --> - <html><html-template location="component://order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -169,8 +168,7 @@ </actions> <widgets> <platform-specific> - <!-- NOTE: this is really generating XSL:FO, but the HTML oriented renderer should do fine, the screen will need to be called differently though to get binary output from it --> - <html><html-template location="component://order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -211,8 +209,7 @@ </actions> <widgets> <platform-specific> - <!-- NOTE: this is really generating XSL:FO, but the HTML oriented renderer should do fine, the screen will need to be called differently though to get binary output from it --> - <html><html-template location="component://order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -297,8 +294,7 @@ </actions> <widgets> <platform-specific> - <!-- NOTE: this is really generating XSL:FO, but the HTML oriented renderer should do fine, the screen will need to be called differently though to get binary output from it --> - <html><html-template location="component://order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl"/></html> + <xsl-fo><html-template location="component://order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=660107&r1=660106&r2=660107&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Sun May 25 23:25:57 2008 @@ -1362,7 +1362,7 @@ </actions> <widgets> <platform-specific> - <html><html-template location="component://product/webapp/facility/facility/Picklist.fo.ftl"/></html> + <xsl-fo><html-template location="component://product/webapp/facility/facility/Picklist.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -1486,7 +1486,7 @@ <section> <widgets> <platform-specific> - <html><html-template location="component://product/webapp/facility/facility/batchPrintShippingLabels.fo.ftl"/></html> + <xsl-fo><html-template location="component://product/webapp/facility/facility/batchPrintShippingLabels.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml?rev=660107&r1=660106&r2=660107&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml Sun May 25 23:25:57 2008 @@ -304,7 +304,7 @@ <section> <widgets> <platform-specific> - <html><html-template location="component://product/webapp/facility/shipment/PackingSlipShipmentBarCode.fo.ftl"/></html> + <xsl-fo><html-template location="component://product/webapp/facility/shipment/PackingSlipShipmentBarCode.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -313,7 +313,7 @@ <section> <widgets> <platform-specific> - <html><html-template location="component://product/webapp/facility/shipment/PackingSlip.fo.ftl"/></html> + <xsl-fo><html-template location="component://product/webapp/facility/shipment/PackingSlip.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -334,7 +334,7 @@ </actions> <widgets> <platform-specific> - <html><html-template location="component://product/webapp/facility/shipment/ShipmentBarCode.fo.ftl"/></html> + <xsl-fo><html-template location="component://product/webapp/facility/shipment/ShipmentBarCode.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -365,7 +365,7 @@ <section> <widgets> <platform-specific> - <html><html-template location="component://product/webapp/facility/shipment/PackingSlipShipmentBarCode.fo.ftl"/></html> + <xsl-fo><html-template location="component://product/webapp/facility/shipment/PackingSlipShipmentBarCode.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -374,7 +374,7 @@ <section> <widgets> <platform-specific> - <html><html-template location="component://product/webapp/facility/shipment/ShipmentManifest.fo.ftl"/></html> + <xsl-fo><html-template location="component://product/webapp/facility/shipment/ShipmentManifest.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=660107&r1=660106&r2=660107&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Sun May 25 23:25:57 2008 @@ -256,7 +256,7 @@ <!--<set field="defaultFontFamily" value="Arial"/>--> </actions> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/reportTemplate.fo.ftl"/></html></platform-specific> + <platform-specific><xsl-fo><html-template location="component://common/webcommon/includes/reportTemplate.fo.ftl"/></xsl-fo></platform-specific> </widgets> </section> </screen> @@ -269,14 +269,14 @@ </actions> <widgets> <platform-specific> - <html> + <xsl-fo> <html-template location="component://common/webcommon/includes/fo/start.fo.ftl"/> <html-template location="component://common/webcommon/includes/fo/basic-header.fo.ftl"/> <html-template location="component://common/webcommon/includes/fo/basic-footer.fo.ftl"/> - </html> + </xsl-fo> </platform-specific> <decorator-section-include name="body"/> - <platform-specific><html><html-template location="component://common/webcommon/includes/fo/end.fo.ftl"/></html></platform-specific> + <platform-specific><xsl-fo><html-template location="component://common/webcommon/includes/fo/end.fo.ftl"/></xsl-fo></platform-specific> </widgets> </section> </screen> @@ -291,7 +291,7 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> -<!-- <platform-specific><html><html-template location="component://common/webcommon/error.fo.ftl"/></html></platform-specific> --> +<!-- <platform-specific><xsl-fo><html-template location="component://common/webcommon/error.fo.ftl"/></xsl-fo></platform-specific> --> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/framework/webtools/widget/EntityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntityScreens.xml?rev=660107&r1=660106&r2=660107&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/EntityScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/EntityScreens.xml Sun May 25 23:25:57 2008 @@ -387,9 +387,9 @@ </actions> <widgets> <platform-specific> - <html> + <xsl-fo> <html-template location="component://webtools/webapp/webtools/entity/EntityRefReport.fo.ftl"/> - </html> + </xsl-fo> </platform-specific> </widgets> </section> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=660107&r1=660106&r2=660107&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Sun May 25 23:25:57 2008 @@ -394,7 +394,7 @@ <decorator-screen name="GlobalFoDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl"/></html> + <xsl-fo><html-template location="component://assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl"/></xsl-fo> </platform-specific> </decorator-section> </decorator-screen> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |