svn commit: r591256 - in /ofbiz/trunk: applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh framework/common/widget/CommonScreens.xml framework/webapp/config/fop.xconf

[jacopoc]

Author: jacopoc
Date: Fri Nov  2 01:12:14 2007
New Revision: 591256

URL: http://svn.apache.org/viewvc?rev=591256&view=rev
Log:
Set the base url for FOP for resolving relative URLs: the default value is '<a href="http://localhost:8080'">http://localhost:8080'. Issue OFBIZ-242.

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh
    ofbiz/trunk/framework/common/widget/CommonScreens.xml
    ofbiz/trunk/framework/webapp/config/fop.xconf

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh?rev=591256&r1=591255&r2=591256&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh Fri Nov  2 01:12:14 2007
@@ -60,7 +60,7 @@
 }
 
 // defaults:
-logoImageUrl = null; // "http://localhost:8080/images/ofbiz_powered.gif";
+logoImageUrl = null; // the default value, "/images/ofbiz_powered.gif", is set in the screen decorators
 partyId = null;
 
 // get the logo partyId from order or invoice - note that it is better to do comparisons this way in case the there are null values

Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=591256&r1=591255&r2=591256&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Fri Nov  2 01:12:14 2007
@@ -209,7 +209,7 @@
         <section>
             <actions>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="logoImageUrl" value="http://localhost:8080/images/ofbiz_logo.jpg"/>
+                <set field="logoImageUrl" value="/images/ofbiz_logo.jpg"/>
                 <!--<set field="defaultFontFamily" value="Arial"/>-->
             </actions>
             <widgets>
@@ -223,7 +223,7 @@
         <section>
             <actions>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="logoImageUrl" value="http://localhost:8080/images/ofbiz_logo.jpg"/>
+                <set field="logoImageUrl" value="/images/ofbiz_logo.jpg"/>
                 <!--<set field="defaultFontFamily" value="Arial"/>-->
             </actions>
             <widgets>
@@ -237,7 +237,7 @@
         <section>
             <actions>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="logoImageUrl" value="http://localhost:8080/images/ofbiz_logo.jpg"/>
+                <set field="logoImageUrl" value="/images/ofbiz_logo.jpg"/>
                 <!--<set field="defaultFontFamily" value="Arial"/>-->
             </actions>
             <widgets>

Modified: ofbiz/trunk/framework/webapp/config/fop.xconf
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/config/fop.xconf?rev=591256&r1=591255&r2=591256&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/config/fop.xconf (original)
+++ ofbiz/trunk/framework/webapp/config/fop.xconf Fri Nov  2 01:12:14 2007
@@ -31,7 +31,7 @@
 <fop version="1.0">
 
   <!-- Base URL for resolving relative URLs -->
-  <base>.</base>
+  <base>http://localhost:8080</base>
   
   <!-- Source resolution in dpi (dots/pixels per inch) for determining the size of pixels in SVG and bitmap images, default: 72dpi -->
   <source-resolution>72</source-resolution>