From: john <john>
Date: Fri, 27 Sep 2002 11:53:57 +0000 (+0000)
Subject: this actually works now!
X-Git-Tag: BEFORE_MERGE_1_1~533
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=2f58c905b9a14d5f2165cb66166a8bf284de7646;p=mir.git

this actually works now!
---

diff --git a/templates-dist/producer/printablecontent.template b/templates-dist/producer/printablecontent.template
index 11157ec5..2c7a5995 100755
--- a/templates-dist/producer/printablecontent.template
+++ b/templates-dist/producer/printablecontent.template
@@ -48,7 +48,7 @@
             space-after.optimum="5pt"
             background-color="black"
             text-align="start">
-<fo:external-graphic  src="file:/some/dir/printbanner.gif"  />
+<fo:external-graphic  src="file://${config["Producer.Image.Path"]}/banner.png"  />
       </fo:block>
 <fo:block font-size="10pt" 
  	font-family="serif" 
@@ -87,7 +87,7 @@ an attribution of copyright/left rights, etc.  the possibilities are endless.
                 line-height="18pt"
                 space-after.optimum="3pt"
                 text-align="center">      	
-      ${article.title}
+      ${article.content.title}
       </fo:block>
       
       <!-- here is the article author and date-->
@@ -96,7 +96,7 @@ an attribution of copyright/left rights, etc.  the possibilities are endless.
                 line-height="13pt"
                 space-after.optimum="3pt"
                 text-align="end">      	
-      ${article.creator},  ${article.webdb_create_formatted}
+      ${article.content.creator},  ${article.content.webdb_create_formatted}
       </fo:block>
 
 
@@ -107,27 +107,27 @@ an attribution of copyright/left rights, etc.  the possibilities are endless.
                 line-height="13pt"
                 space-after.optimum="3pt"
                 text-align="justify">      	
-      ${article.description_parsed}
+      ${article.content.description_parsed}
       </fo:block>
 
 
 	      <!-- here is the header stuff -->
-<if article.creator_main_url || article.creator_email>
+<if article.content.creator_main_url || article.content.creator_email>
 	<fo:block><fo:leader leader-pattern="rule" leader-length="18cm"
             rule-thickness="1pt" color="black"/></fo:block>
 </if>
-      <if article.creator_email>
+      <if article.content.creator_email>
       <fo:block font-size="10pt" 
                 font-family="sans-serif" 
                 line-height="12pt">
-      Email:   	${article.creator_email}
+      Email:   	${article.content.creator_email}
       </fo:block>
       </if>
-      <if article.creator_main_url>
+      <if article.content.creator_main_url>
       <fo:block font-size="10pt" 
                 font-family="sans-serif" 
                 line-height="12pt">
-      URL:  	${article.creator_main_url}
+      URL:  	${article.content.creator_main_url}
       </fo:block>
       </if> 
       <fo:block><fo:leader leader-pattern="rule" leader-length="18cm"
@@ -139,19 +139,22 @@ an attribution of copyright/left rights, etc.  the possibilities are endless.
                 line-height="15pt"
                 space-after.optimum="3pt"
                 text-align="justify">
-	${article.content_data_parsed}
 <list data.formatted_content as fc>
 <if fc.hasImage == "1">
-<fo:table text-align="justify">
-  <fo:table-column column-width="16cm-${fc.img_width}px"/>
+<fo:table>
   <fo:table-column column-width="${fc.img_width}px"/>
+  <fo:table-column column-width="8px"/>
+  <fo:table-column column-width="${fc.text_widthCM}cm"/>
   <fo:table-body>
     <fo:table-row>
-      <fo:table-cell>
-      <fo:block>${fc.text}</fo:block>
+      <fo:table-cell display-align="center">
+      <fo:external-graphic src="file://${config["Producer.Image.Path"]}${fc.img_src}" content-height="${fc.img_height}px" content-width="${fc.img_width}px" height="${fc.img_height}px" width="${fc.img_width}px" />
+<fo:block font-weight="bold">${fc.img_title}</fo:block>
       </fo:table-cell>
-      <fo:table-cell>
-      <fo:external-graphic src="file://${fc.img_src}" content-height="${fc.img_height}px" content-width="${fc.img_width}px" height="${fc.img_height}px" width="${fc.img_width}px" />
+      <fo:table-cell >
+      </fo:table-cell>
+      <fo:table-cell >
+      <fo:block text-align="justify">${fc.text}</fo:block>
       </fo:table-cell>
     </fo:table-row>
   </fo:table-body> 
@@ -161,10 +164,10 @@ an attribution of copyright/left rights, etc.  the possibilities are endless.
 </if>
 
 </list>
-        <list article.to_media_images as media>
+<!--        <list article.content.to_media_images as media>
 	<fo:external-graphic  src="file:${config["Producer.Image.Path"]}/${media["publish_path"]}"  />
 	     ${media["description"]}
-        </list>
+        </list>-->
       </fo:block>