Got impressum working, after a multi-hour struggle

1 files changed, 41 insertions, 5 deletions

diff --git a/xsl/webpage.xsl b/xsl/webpage.xsl
index c6310e2..26a167a 100644
--- a/xsl/webpage.xsl
+++ b/xsl/webpage.xsl
@@ -104,11 +104,11 @@
 		</section>
 	</xsl:template>
 
-	<!-- Subsections -->
-	<xsl:template match="webpage:pitch|webpage:nav|webpage:subsection">
+	<!-- Columns -->
+	<xsl:template match="webpage:pitch|webpage:nav">
 		<div>
-			<xsl:variable name="seqNo"><xsl:number level="any" count="webpage:pitch|webpage:nav|webpage:subsection" format="1"/></xsl:variable>
-			<xsl:variable name="class">subsection<xsl:if test="self::webpage:pitch"> pitch</xsl:if><xsl:if test="self::webpage:nav"> nav</xsl:if> <xsl:if test="$seqNo = 1"> first</xsl:if></xsl:variable>
+			<xsl:variable name="seqNo"><xsl:number level="any" count="webpage:pitch|webpage:nav" format="1"/></xsl:variable>
+			<xsl:variable name="class">column<xsl:if test="self::webpage:pitch"> pitch</xsl:if><xsl:if test="self::webpage:nav"> nav</xsl:if> <xsl:if test="$seqNo = 1"> first</xsl:if></xsl:variable>
 			<xsl:attribute name="class">
 				<xsl:value-of select="$class"/>
 			</xsl:attribute>
@@ -116,7 +116,7 @@
 		</div>
 	</xsl:template>
 
-	<!-- Titles and subtitles -->
+	<!-- Titles and subtitles in sections -->
 	<xsl:template match="title">
 		<xsl:if test="webpage:text">
 			<h1><xsl:apply-templates select="webpage:text"/></h1>
@@ -128,6 +128,15 @@
 		</xsl:if>
 	</xsl:template>
 
+	<!-- Subsections -->
+
+	<xsl:template match="webpage:subsection">
+		<div>
+			<xsl:apply-templates select="subtitle"/>
+			<xsl:apply-templates select="webpage:*"/>
+		</div>
+	</xsl:template>
+
 	<!-- Paragraphs -->
 	<xsl:template match="webpage:paragraph">
 		<p>
@@ -149,6 +158,33 @@
 		<span class="ipa"> [<xsl:value-of select="pronunciation"/>] </span>
 	</xsl:template>
 
+	<!-- addresses -->
+
+	<xsl:template match="webpage:contact">
+		<dl>
+			<xsl:apply-templates select="webpage:address|webpage:mail|webpage:phone"/>
+		</dl>
+	</xsl:template>
+
+	<xsl:template match="webpage:address">
+		<dt>Adresse:</dt>
+		<dd>
+			<dl>
+				<dd class="name"><xsl:value-of select="name"/></dd>
+				<dd class="street"><xsl:value-of select="street"/><xsl:text> </xsl:text><xsl:value-of select="number"/></dd>
+				<dd class="city"><xsl:value-of select="plz"/><xsl:text> </xsl:text><xsl:value-of select="city"/></dd>
+			</dl>
+		</dd>
+	</xsl:template>
+
+	<xsl:template match="webpage:mail">
+		<dt>E-Mail:</dt><dd><xsl:value-of select="."/></dd>
+	</xsl:template>
+
+	<xsl:template match="webpage:phone">
+		<dt>Telefon:</dt><dd><xsl:value-of select="."/></dd>
+	</xsl:template>
+
 	<!-- Footnotes -->
 	<!-- Adapted from: http://www.microhowto.info/howto/create_a_list_of_numbered_footnotes_using_xslt.html -->
 	<xsl:template match="webpage:footnote">