From caf99b7c603fcc772e59f9f09b338b8c4b4d7eef Mon Sep 17 00:00:00 2001
From: astro <astro@31f61c52-7bfb-0310-b897-fc00f8a278f0>
Date: Tue, 6 Jun 2006 19:46:00 +0000
Subject: [PATCH] =?UTF-8?q?Metainfo=20f=C3=BCr=20News=20+=20CSS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.c3d2.de/c3d2-web/trunk@370 31f61c52-7bfb-0310-b897-fc00f8a278f0
---
 content/static/style/default.css |  6 ++---
 xsl/xhtml.xsl                    | 46 +++++++++++++++++++++-----------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/content/static/style/default.css b/content/static/style/default.css
index 196309bac..f6b4d656f 100644
--- a/content/static/style/default.css
+++ b/content/static/style/default.css
@@ -146,7 +146,7 @@ pre {
 }
 
 #content h3 {
-  font-size: 150%;
+  font-size: 130%;
   margin-top: 30px;
   color: #555;
 }
@@ -173,11 +173,11 @@ pre {
   font-weight: bold;
 }
 
-#content h3.news {
+#content h2.news, #content h3.news {
   border-bottom: #ebc63c 3px solid;
   padding: 0px;
   line-height: 1.1em;
-  font-size: 130%;
+  margin-bottom: 0px;
 }
 
 #content h3.news a {
diff --git a/xsl/xhtml.xsl b/xsl/xhtml.xsl
index 7c2c68158..5fde31597 100644
--- a/xsl/xhtml.xsl
+++ b/xsl/xhtml.xsl
@@ -23,7 +23,7 @@
     <xsl:if test="name(/*)='item'">../</xsl:if>
   </xsl:variable>
           
-  <xsl:template match="/page|/news">
+  <xsl:template match="/page">
     <xsl:variable name="title">
       <xsl:choose>
         <xsl:when test="/page/@pagetitle">
@@ -110,9 +110,21 @@
           </xsl:comment>
           <div id="content">
             <h2>
+              <xsl:if test="name(.) = 'item'">
+                <xsl:attribute name="class">news</xsl:attribute>
+              </xsl:if>
+
               <xsl:value-of select="$title" />
             </h2>
 
+            <!-- Für Seiten, die nur ein Newsitem beinhalten,
+                 Newsmetadaten anzeigen
+             -->
+            <xsl:if test="name(.) = 'item'">
+              <xsl:call-template name="news-meta"/>
+            </xsl:if>
+
+
             <xsl:apply-templates/>
           </div> <!-- id="content" -->
 
@@ -158,20 +170,7 @@
           </a>
         </h3>
 
-        <small class="news_author">
-          <xsl:value-of select="@author"/>
-        </small>
-
-        <xsl:variable name="datestring">
-          <xsl:call-template name="get-datestring">
-            <xsl:with-param name="date" select="@date" />
-          </xsl:call-template>
-        </xsl:variable>
-
-        <xsl:element name="small">
-          <xsl:attribute name="class">news_date</xsl:attribute>
-          <xsl:value-of select="concat(' @ ', $datestring)"/>
-        </xsl:element>
+        <xsl:call-template name="news-meta"/>
 
         <div class="news">
           <xsl:apply-templates>
@@ -193,6 +192,23 @@
     </xsl:for-each>
   </xsl:template>
 
+  <xsl:template name="news-meta">
+    <small class="news_author">
+      <xsl:value-of select="@author"/>
+    </small>
+
+    <xsl:variable name="datestring">
+      <xsl:call-template name="get-datestring">
+        <xsl:with-param name="date" select="@date" />
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:element name="small">
+      <xsl:attribute name="class">news_date</xsl:attribute>
+      <xsl:value-of select="concat(' @ ', $datestring)"/>
+    </xsl:element>
+  </xsl:template>
+
   <xsl:template match="item/image">
     <xsl:param name="itemposition"/>