svn commit: r430083 - in /incubator/ofbiz/trunk: applications/accounting/widget/AgreementScreens.xml framework/common/webcommon/includes/simple.fo.ftl framework/common/widget/CommonScreens.xml

[jacopoc]

Author: jacopoc
Date: Wed Aug  9 09:12:57 2006
New Revision: 430083

URL: http://svn.apache.org/viewvc?rev=430083&view=rev
Log:
Misc small improvements to the global widget decorator for pdf reports.

Modified:
    incubator/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
    incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl
    incubator/ofbiz/trunk/framework/common/widget/CommonScreens.xml

Modified: incubator/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=430083&r1=430082&r2=430083&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Wed Aug  9 09:12:57 2006
@@ -326,9 +326,8 @@
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
 
-                <set field="logoImageUrl" value="http://localhost:8080/images/ofbiz_logo.jpg"/>
+            <!--<set field="logoImageUrl" value="http://localhost:8080/images/ofbiz_logo.jpg"/>-->
                 
                 <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
                 <entity-one entity-name="AgreementItem" value-name="agreementItem"/>

Modified: incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl?rev=430083&r1=430082&r2=430083&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl (original)
+++ incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl Wed Aug  9 09:12:57 2006
@@ -22,9 +22,9 @@
         <fo:simple-page-master master-name="main-page"
             margin-top="0.3in" margin-bottom="0.3in"
             margin-left="0.4in" margin-right="0.3in">
-          <fo:region-body margin-top="1in" margin-bottom="0.5in"/>  <#-- main body -->
-            <fo:region-after extent="0.5in" />  <#-- a footer -->
-            <fo:region-before extent="1in"/>  <#-- a header -->
+          <fo:region-body margin-top="1in" margin-bottom="0.5in"/>
+            <fo:region-after extent="0.5in" />
+            <fo:region-before extent="1in"/>
         </fo:simple-page-master>
     </fo:layout-master-set>
   
@@ -42,7 +42,8 @@
                         </#if>
                         </fo:table-cell>
                         <fo:table-cell>
-                            <fo:block font-weight="bold" space-after="0.03in">${title?if_exists}</fo:block>
+                            <fo:block font-weight="bold" space-after="0.03in"><#if titleProperty?exists>${titleProperty}<#else>${title?if_exists}</#if></fo:block>
+                            <fo:block>${uiLabelMap.CommonUsername}: <#if userLogin?exists>${userLogin.userLoginId?if_exists}</#if></fo:block>
                             <fo:block>${uiLabelMap.CommonDate}: ${nowTimestamp?if_exists}</fo:block>
                         </fo:table-cell>
                     </fo:table-row>

Modified: incubator/ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=430083&r1=430082&r2=430083&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ incubator/ofbiz/trunk/framework/common/widget/CommonScreens.xml Wed Aug  9 09:12:57 2006
@@ -166,9 +166,10 @@
     <screen name="FoDecorator">
         <section>
             <actions>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="logoImageUrl" value="http://localhost:8080/images/ofbiz_logo.jpg"/>
             </actions>
             <widgets>
-                <!-- render header -->
                 <platform-specific><html><html-template location="component://common/webcommon/includes/simple.fo.ftl"/></html></platform-specific>
             </widgets>
         </section>