Schedule fuer zwei Tage passt jetzt auch auf eine Seite

git-svn-id: svn://svn.c3d2.de/c3d2-web/trunk@293 31f61c52-7bfb-0310-b897-fc00f8a278f0

xslfo/datenspuren/guide/guide.xml

@@ -1,11 +1,6 @@
 <?xml version="1.0"?>
 
 <guide xmlns='http://www.datenspuren.de/#guide'>
-  <title-page>
-    <section title='Programm'>
-      <pull-schedule-table file='../../../www/datenspuren/fahrplan/days.de.html'/>
-    </section>
-  </title-page>
 
   <title-page>
     <!--title>Datenspuren</title>
@@ -84,7 +79,13 @@
     </section>
   </page-sequence>
 
-  <title-page>
+  <!--title-page>
     <logo>images/flyer-back.jpg</logo>
+  </title-page-->
+
+  <title-page>
+    <section title='Programm'>
+      <pull-schedule-table file='../../../www/datenspuren/fahrplan/days.de.html'/>
+    </section>
   </title-page>
 </guide>

xslfo/datenspuren/guide/guide.xsl

@@ -12,7 +12,10 @@
 
       <fo:layout-master-set>
 
-        <fo:simple-page-master master-name="TitlePage">
+        <fo:simple-page-master master-name="TitlePage"
+           page-width="210mm"   page-height="297mm"
+           margin-top="20mm"  margin-bottom="20mm"
+           margin-left="20mm" margin-right="20mm">
           <fo:region-body display-align="center"/>
         <!--fo:region-after
               extent="0.8in"
@@ -134,8 +137,8 @@
       <fo:block font-size='18pt' font-weight='bold' font-family='serif' text-align='center'
                 border-top-style='solid' border-bottom-style='solid'
                 border-top-color='black' border-bottom-color='black'
-                border-top-width='0.5mm' border-bottom-width='0.5mm'
-                padding='3mm 5mm 2mm'
+                border-top-width='0.3mm' border-bottom-width='0.3mm'
+                padding='3mm 5mm 2mm' margin='0mm -0.5mm'
                 keep-together.within-column="always" keep-with-next.within-column="always"
                 id="{generate-id()}">
         <xsl:value-of select='@title'/>

xslfo/datenspuren/guide/schedule.xsl

@@ -11,28 +11,38 @@
   <xsl:template match='/schedule/day/room'>
     <fo:block padding='10mm 2mm' font-size='14pt' font-family='serif' text-align='center'
               keep-together.within-column="always" keep-with-next.within-column="always">
-      Tag <xsl:value-of select='../@index'/>, <xsl:value-of select='@name'/>
+      <fo:block padding='5mm 0mm'>
+        <xsl:choose>
+          <xsl:when test='../@index="1"'>Samstag, 13. Mai</xsl:when>
+          <xsl:when test='../@index="2"'>Sonntag, 14. Mai</xsl:when>
+        </xsl:choose>,
+      </fo:block>
+      <fo:block padding='5mm 0mm'>
+        <xsl:value-of select='@name'/>
+      </fo:block>
     </fo:block>
 
     <xsl:apply-templates/>
   </xsl:template>
 
   <xsl:template match='/schedule/day/room/event'>
-    <fo:block font-size='14pt' padding='1mm 1mm 0mm'
+    <fo:block font-size='14pt' padding='1mm 1mm'
               border-top-style='solid' border-bottom-style='solid'
               border-top-color='black' border-bottom-color='black'
               border-top-width='0.15mm' border-bottom-width='0.15mm'
-              keep-together.within-column="always" keep-with-next.within-column="always">
-      <fo:inline font-weight='bold'>
+              keep-together.within-column="always" keep-with-next.within-column="always"
+              text-align='center'>
+      <fo:block font-weight='bold' font-size='14pt' font-family='serif'>
         <xsl:value-of select='title'/>
-      </fo:inline>
-      (<xsl:value-of select='start'/> Uhr)
+      </fo:block>
+      <fo:block font-size='12pt'>
+        <xsl:value-of select='subtitle'/>
+      </fo:block>
+      <fo:block font-size='10pt'>
+        <xsl:value-of select='start'/> Uhr
+      </fo:block>
     </fo:block>
 
-    <fo:block font-style='italic' padding='2mm 0mm 0mm'
-              keep-together.within-column="always" keep-with-next.within-column="always">
-      <xsl:value-of select='subtitle'/>
-    </fo:block>
     <fo:block font-style='italic' padding='2mm 0mm 0mm'
               keep-together.within-column="always" keep-with-next.within-column="always">
       <xsl:for-each select='person'>
@@ -72,8 +82,19 @@
       <xsl:for-each select='document($file)//xhtml:table'>
         <xsl:if test='($day = string(position())) or not($day)'>
 
-          <fo:table table-layout='fixed' width='100%' border-spacing='2mm' border-collapse='collapse'>
-            <fo:table-column column-width="20mm"/>
+          <xsl:if test='not($day)'>
+            <fo:block font-size='12pt' font-family='serif' font-weight='bold'
+                padding='5mm 0mm 1mm' text-align='center'
+                keep-together.within-column="always" keep-with-next.within-column="always">
+              <xsl:choose>
+                <xsl:when test='position() = "1"'>Samstag, 13. Mai</xsl:when>
+                <xsl:when test='position() = "2"'>Sonntag, 14. Mai</xsl:when>
+              </xsl:choose>
+            </fo:block>
+          </xsl:if>
+
+          <fo:table table-layout='fixed' width='100%' border-spacing='0.5mm' border-collapse='collapse'>
+            <fo:table-column column-width="12mm"/>
             <!--fo:table-column column-width="72mm"-->
             <fo:table-column column-width="proportional-column-width(1)">
               <xsl:attribute name='number-columns-repeated'>
@@ -86,7 +107,7 @@
               <fo:table-row>
                 <xsl:for-each select='xhtml:thead/xhtml:tr/xhtml:th'>
                   <fo:table-cell>
-                    <fo:block text-align='center' font-size='12pt' font-weight='bold'>
+                    <fo:block text-align='center' font-size='10pt' font-weight='bold'>
                       <xsl:value-of select='.'/>
                     </fo:block>
                   </fo:table-cell>
@@ -98,7 +119,7 @@
               <xsl:for-each select='xhtml:tbody/xhtml:tr'>
                 <fo:table-row>
                   <xsl:for-each select='xhtml:td'>
-                    <fo:table-cell padding='1mm' border='0.2mm dotted red' vertical-align='center' display-align='center'>
+                    <fo:table-cell padding='0.2mm' border='0.2mm dotted red' vertical-align='center' display-align='center'>
                       <xsl:attribute name="number-rows-spanned">
                         <xsl:value-of select="@rowspan"/>
                       </xsl:attribute>
@@ -111,11 +132,11 @@
                         </xsl:when>
                         <xsl:when test='@class="room event "'>
                           <xsl:attribute name='border'>0.2mm solid black</xsl:attribute>
-                          <fo:block font-size='16pt' font-family='serif' padding='2mm'
+                          <fo:block font-size='12pt' font-family='serif' padding='0.5mm'
                               text-align='left' vertical-align='top' display-align='top'>
                             <xsl:value-of select='xhtml:p[@class="title"]/xhtml:a'/>
                           </fo:block>
-                          <fo:block font-size='10pt' text-align='right' padding='2mm'
+                          <fo:block font-size='10pt' text-align='right' padding='0.5mm'
                               vertical-align='bottom' display-align='after'>
                             <xsl:for-each select='xhtml:ul[@class="speakers"]/xhtml:li/xhtml:a'>
                               <xsl:if test='position() &gt; 1'>, </xsl:if>
@@ -125,7 +146,7 @@
                         </xsl:when>
                         <xsl:otherwise>
                           <xsl:attribute name='background-color'>#e0e0e0</xsl:attribute>
-                          <fo:block height='1em' font-size='12pt'/>
+                          <fo:block height='1em' font-size='10pt'/>
                         </xsl:otherwise>
                       </xsl:choose>