From 9be2727160ef6b2dddefca132ed4242245c1949f Mon Sep 17 00:00:00 2001
From: toidinamai <toidinamai@31f61c52-7bfb-0310-b897-fc00f8a278f0>
Date: Thu, 8 Jun 2006 12:51:44 +0000
Subject: [PATCH] git-svn-id: svn://svn.c3d2.de/c3d2-web/trunk@384
 31f61c52-7bfb-0310-b897-fc00f8a278f0

---
 Makefile      |  5 ++++-
 xsl/xhtml.xsl | 55 ++++++++++++++++++++++++---------------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Makefile b/Makefile
index c4977704c..bded80e3d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
 ### Programme ###
 # XSLT-Prozessor:
 PROCESSOR=xsltproc
-PFLAGS=--catalogs
+PFLAGS=--catalogs --stringparam baseurl $(BASEURL)
+BASEURL=""
 # XML-Validator
 VALIDATOR=xmllint
 VFLAGS=--noout --valid --catalogs
@@ -87,9 +88,11 @@ $(NEWSFILES): news.xml $(NAVIGATION) $(STYLE)
 build/%.html: content/pages/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES)
 	$(call xml_to_html)
 
+build/news/%.html : BASEURL="../"
 build/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES)
 	$(call xml_to_html)
 
+build/cgi-bin/search.html : BASEURL="../"
 build/cgi-bin/search.html: content/cgi-bin/search.xml $(STYLE) $(NAVIGATION)
 	$(call xml_to_html)
 
diff --git a/xsl/xhtml.xsl b/xsl/xhtml.xsl
index 6b1eb1867..b7739d0ed 100644
--- a/xsl/xhtml.xsl
+++ b/xsl/xhtml.xsl
@@ -19,10 +19,6 @@
             doctype-system="DTD/xhtml1-strict.dtd"
             indent="yes"/>
 
-  <xsl:variable name="baseurl">
-    <xsl:if test="name(/*)='item'">../</xsl:if>
-  </xsl:variable>
-
   <xsl:template match="/page">
     <xsl:variable name="title">
       <xsl:choose>
@@ -56,6 +52,8 @@
   <xsl:template name="body">
     <xsl:param name="title" />
 
+    <xsl:variable name="issearchpage" select="$title = 'Suche'" />
+
     <xsl:element name="html">
       <!--xsl:attribute name="xmlns">http://www.w3.org/1999/xhtml</xsl:attribute-->
       <xsl:attribute name="lang">de</xsl:attribute>
@@ -86,8 +84,7 @@
           </xsl:comment>
           <div id="navigation">
 
-
-          <xsl:if test="$title != 'Suche'">
+          <xsl:if test="not($issearchpage)">
             <!-- ### Search ### -->
             <xsl:comment>
               <xsl:text> ### Search ### </xsl:text>
@@ -112,7 +109,14 @@
           </xsl:comment>
 
           <xsl:choose>
-            <xsl:when test="$title != 'Suche'">
+            <xsl:when test="$issearchpage">
+              <div id="search">
+                <xsl:comment>ESTFORM</xsl:comment>
+                <xsl:comment>ESTRESULT</xsl:comment>
+                <xsl:comment>ESTINFO</xsl:comment>
+              </div> <!-- id="search" -->
+            </xsl:when>
+            <xsl:otherwise> <!-- normale Seite -->
               <div id="content">
                 <h2>
                   <xsl:if test="name(.) = 'item'">
@@ -122,33 +126,26 @@
                   <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>
+                <!-- 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/>
+                <xsl:apply-templates/>
               </div> <!-- id="content" -->
-            </xsl:when>
-            <xsl:otherwise>
-              <div id="search">
-                <xsl:comment>ESTFORM</xsl:comment>
-                <xsl:comment>ESTRESULT</xsl:comment>
-                <xsl:comment>ESTINFO</xsl:comment>
-              </div> <!-- id="search" -->
+
+              <!-- ### News ### -->
+              <xsl:comment>
+                <xsl:text> ### News ### </xsl:text>
+              </xsl:comment>
+
+              <xsl:call-template name="chaosupdates" />
+
             </xsl:otherwise>
           </xsl:choose>
 
-          <!-- ### News ### -->
-          <xsl:comment>
-            <xsl:text> ### News ### </xsl:text>
-          </xsl:comment>
-
-          <xsl:call-template name="chaosupdates" />
-
           </div> <!-- id="body" -->
 
         <!-- ### Footer ### -->