From 7632013f773dea5d9b7ee169cc871f0e08b4ac24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 25 Jul 2012 11:45:21 +0000
Subject: [PATCH] =?UTF-8?q?Anpassung=20Layout=20Zutrittskarte=20lt=20UK=20?=
 =?UTF-8?q?-=20Datum=20mit=20Punkt=20getrennt=20-=20Titelpost=20mit=20","?=
 =?UTF-8?q?=20getrennt=20-=20Matr.-Nr.=20vor=20der=20Matrikelnummer=20-=20?=
 =?UTF-8?q?Mitarbeiterdaten=20oben=20mehr=20Abstand=20-=20unten=20b=C3=BCn?=
 =?UTF-8?q?dig=20mit=20Bild?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/zutrittskarte.php    |  6 +++---
 system/xsl/Zutrittskarte.xsl | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/content/zutrittskarte.php b/content/zutrittskarte.php
index 32e15cb87..38a070f62 100755
--- a/content/zutrittskarte.php
+++ b/content/zutrittskarte.php
@@ -111,7 +111,7 @@ if(copy($zipfile, $tempname_zip))
 					<titelpre>".$bn->titelpre."</titelpre>
 					<titelpost>".$bn->titelpost."</titelpost>
 					<personalnummer>".$ma->personalnummer."</personalnummer>
-					<ausstellungsdatum>".date('d/m/Y')."</ausstellungsdatum>
+					<ausstellungsdatum>".date('d.m.Y')."</ausstellungsdatum>
 				</mitarbeiter>";
 			}
 			else
@@ -152,9 +152,9 @@ if(copy($zipfile, $tempname_zip))
 						<nachname>".$bn->nachname."</nachname>
 						<titelpre>".$bn->titelpre."</titelpre>
 						<titelpost>".$bn->titelpost."</titelpost>
-						<gebdatum>".$datum_obj->formatDatum($bn->gebdatum,'d/m/Y')."</gebdatum>
+						<gebdatum>".$datum_obj->formatDatum($bn->gebdatum,'d.m.Y')."</gebdatum>
 						<matrikelnummer>".$student->matrikelnr."</matrikelnummer>
-						<gueltigbis>".$datum_obj->formatDatum($gueltigbis,'d/m/Y')."</gueltigbis>
+						<gueltigbis>".$datum_obj->formatDatum($gueltigbis,'d.m.Y')."</gueltigbis>
 					</student>";
 				}
 			}
diff --git a/system/xsl/Zutrittskarte.xsl b/system/xsl/Zutrittskarte.xsl
index 7d973aa76..66bfa55c7 100755
--- a/system/xsl/Zutrittskarte.xsl
+++ b/system/xsl/Zutrittskarte.xsl
@@ -85,28 +85,28 @@ xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:off
   		<draw:frame draw:style-name="fr1" draw:name="Grafik_{$uid}" text:anchor-type="char" svg:x="0.55cm" svg:y="2.3cm" svg:width="2cm" svg:height="2.6cm" draw:z-index="{$idx}5">
           <draw:image xlink:href="Pictures/{$uid}.jpg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
         </draw:frame>
-         <draw:frame text:anchor-type="paragraph" draw:z-index="{$idx}0" draw:style-name="gr1" draw:text-style-name="P7" svg:width="5cm" svg:height="0.3cm" svg:x="2.94cm" svg:y="2.4cm">
+         <draw:frame text:anchor-type="paragraph" draw:z-index="{$idx}0" draw:style-name="gr1" draw:text-style-name="P7" svg:width="5cm" svg:height="0.3cm" svg:x="2.94cm" svg:y="2.95cm">
           <draw:text-box>
             <text:p text:style-name="P7">
               <text:span text:style-name="T1"><xsl:value-of select="titelpre"/></text:span>
             </text:p>
           </draw:text-box>
         </draw:frame>
-         <draw:frame text:anchor-type="paragraph" draw:z-index="{$idx}1" draw:style-name="gr1" draw:text-style-name="P7" svg:width="5cm" svg:height="0.3cm" svg:x="2.94cm" svg:y="2.93cm">
+         <draw:frame text:anchor-type="paragraph" draw:z-index="{$idx}1" draw:style-name="gr1" draw:text-style-name="P7" svg:width="5cm" svg:height="0.3cm" svg:x="2.94cm" svg:y="3.35cm">
           <draw:text-box>
             <text:p text:style-name="P7">
               <text:span text:style-name="T1"><xsl:value-of select="vorname"/></text:span>
             </text:p>
           </draw:text-box>
         </draw:frame>
-        <draw:frame text:anchor-type="paragraph" draw:z-index="{$idx}2" draw:style-name="gr1" draw:text-style-name="P7" svg:width="5cm" svg:height="0.3cm" svg:x="2.94cm" svg:y="3.46cm">
+        <draw:frame text:anchor-type="paragraph" draw:z-index="{$idx}2" draw:style-name="gr1" draw:text-style-name="P7" svg:width="5cm" svg:height="0.3cm" svg:x="2.94cm" svg:y="3.75cm">
           <draw:text-box>
             <text:p text:style-name="P7">
-              <text:span text:style-name="T1"><xsl:value-of select="nachname"/><xsl:text> </xsl:text><xsl:value-of select="titelpost"/></text:span>
+              <text:span text:style-name="T1"><xsl:value-of select="nachname"/><xsl:if test="string-length(titelpost) &gt; 0"><xsl:text>, </xsl:text><xsl:value-of select="titelpost"/></xsl:if></text:span>
             </text:p>
           </draw:text-box>
         </draw:frame>
-        <draw:frame text:anchor-type="paragraph" draw:z-index="{$idx}3" draw:style-name="gr1" draw:text-style-name="P7" svg:width="5cm" svg:height="0.3cm" svg:x="2.94cm" svg:y="3.99cm">
+        <draw:frame text:anchor-type="paragraph" draw:z-index="{$idx}3" draw:style-name="gr1" draw:text-style-name="P7" svg:width="5cm" svg:height="0.3cm" svg:x="2.94cm" svg:y="4.15cm">
           <draw:text-box>
             <text:p text:style-name="P7">
               <text:span text:style-name="T1">Pers.-Nr. <xsl:value-of select="personalnummer"/></text:span>
@@ -156,7 +156,7 @@ xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:off
         <draw:frame text:anchor-type="paragraph" draw:z-index="{$idx}2" draw:style-name="gr1" draw:text-style-name="P7" svg:width="5.806cm" svg:height="0.3cm" svg:x="2.7cm" svg:y="3.05cm">
           <draw:text-box>
             <text:p text:style-name="P7">
-              <text:span text:style-name="T1"><xsl:value-of select="nachname"/><xsl:text> </xsl:text><xsl:value-of select="titelpost"/></text:span>
+              <text:span text:style-name="T1"><xsl:value-of select="nachname"/><xsl:if test="string-length(titelpost) &gt; 0"><xsl:text>, </xsl:text><xsl:value-of select="titelpost"/></xsl:if></text:span>
             </text:p>
           </draw:text-box>
         </draw:frame>
@@ -172,7 +172,7 @@ xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:off
 		<draw:frame text:anchor-type="paragraph" draw:z-index="{$idx}4" draw:style-name="gr1" draw:text-style-name="P7" svg:width="5.79cm" svg:height="0.3cm" svg:x="2.7cm" svg:y="3.85cm">
           <draw:text-box>
             <text:p text:style-name="P7">
-              <text:span text:style-name="T1"><xsl:value-of select="matrikelnummer"/></text:span>
+              <text:span text:style-name="T1">Matr.-Nr.<xsl:value-of select="matrikelnummer"/></text:span>
             </text:p>
           </draw:text-box>
         </draw:frame>