git-svn-id: svn://svn.c3d2.de/c3d2-web/trunk@384 31f61c52-7bfb-0310-b897-fc00f8a278f0
This commit is contained in:
parent
ca0bfe19f5
commit
9be2727160
5
Makefile
5
Makefile
|
@ -1,7 +1,8 @@
|
||||||
### Programme ###
|
### Programme ###
|
||||||
# XSLT-Prozessor:
|
# XSLT-Prozessor:
|
||||||
PROCESSOR=xsltproc
|
PROCESSOR=xsltproc
|
||||||
PFLAGS=--catalogs
|
PFLAGS=--catalogs --stringparam baseurl $(BASEURL)
|
||||||
|
BASEURL=""
|
||||||
# XML-Validator
|
# XML-Validator
|
||||||
VALIDATOR=xmllint
|
VALIDATOR=xmllint
|
||||||
VFLAGS=--noout --valid --catalogs
|
VFLAGS=--noout --valid --catalogs
|
||||||
|
@ -87,9 +88,11 @@ $(NEWSFILES): news.xml $(NAVIGATION) $(STYLE)
|
||||||
build/%.html: content/pages/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES)
|
build/%.html: content/pages/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES)
|
||||||
$(call xml_to_html)
|
$(call xml_to_html)
|
||||||
|
|
||||||
|
build/news/%.html : BASEURL="../"
|
||||||
build/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES)
|
build/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES)
|
||||||
$(call xml_to_html)
|
$(call xml_to_html)
|
||||||
|
|
||||||
|
build/cgi-bin/search.html : BASEURL="../"
|
||||||
build/cgi-bin/search.html: content/cgi-bin/search.xml $(STYLE) $(NAVIGATION)
|
build/cgi-bin/search.html: content/cgi-bin/search.xml $(STYLE) $(NAVIGATION)
|
||||||
$(call xml_to_html)
|
$(call xml_to_html)
|
||||||
|
|
||||||
|
|
|
@ -19,10 +19,6 @@
|
||||||
doctype-system="DTD/xhtml1-strict.dtd"
|
doctype-system="DTD/xhtml1-strict.dtd"
|
||||||
indent="yes"/>
|
indent="yes"/>
|
||||||
|
|
||||||
<xsl:variable name="baseurl">
|
|
||||||
<xsl:if test="name(/*)='item'">../</xsl:if>
|
|
||||||
</xsl:variable>
|
|
||||||
|
|
||||||
<xsl:template match="/page">
|
<xsl:template match="/page">
|
||||||
<xsl:variable name="title">
|
<xsl:variable name="title">
|
||||||
<xsl:choose>
|
<xsl:choose>
|
||||||
|
@ -56,6 +52,8 @@
|
||||||
<xsl:template name="body">
|
<xsl:template name="body">
|
||||||
<xsl:param name="title" />
|
<xsl:param name="title" />
|
||||||
|
|
||||||
|
<xsl:variable name="issearchpage" select="$title = 'Suche'" />
|
||||||
|
|
||||||
<xsl:element name="html">
|
<xsl:element name="html">
|
||||||
<!--xsl:attribute name="xmlns">http://www.w3.org/1999/xhtml</xsl:attribute-->
|
<!--xsl:attribute name="xmlns">http://www.w3.org/1999/xhtml</xsl:attribute-->
|
||||||
<xsl:attribute name="lang">de</xsl:attribute>
|
<xsl:attribute name="lang">de</xsl:attribute>
|
||||||
|
@ -86,8 +84,7 @@
|
||||||
</xsl:comment>
|
</xsl:comment>
|
||||||
<div id="navigation">
|
<div id="navigation">
|
||||||
|
|
||||||
|
<xsl:if test="not($issearchpage)">
|
||||||
<xsl:if test="$title != 'Suche'">
|
|
||||||
<!-- ### Search ### -->
|
<!-- ### Search ### -->
|
||||||
<xsl:comment>
|
<xsl:comment>
|
||||||
<xsl:text> ### Search ### </xsl:text>
|
<xsl:text> ### Search ### </xsl:text>
|
||||||
|
@ -112,7 +109,14 @@
|
||||||
</xsl:comment>
|
</xsl:comment>
|
||||||
|
|
||||||
<xsl:choose>
|
<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">
|
<div id="content">
|
||||||
<h2>
|
<h2>
|
||||||
<xsl:if test="name(.) = 'item'">
|
<xsl:if test="name(.) = 'item'">
|
||||||
|
@ -129,18 +133,8 @@
|
||||||
<xsl:call-template name="news-meta"/>
|
<xsl:call-template name="news-meta"/>
|
||||||
</xsl:if>
|
</xsl:if>
|
||||||
|
|
||||||
|
|
||||||
<xsl:apply-templates/>
|
<xsl:apply-templates/>
|
||||||
</div> <!-- id="content" -->
|
</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" -->
|
|
||||||
</xsl:otherwise>
|
|
||||||
</xsl:choose>
|
|
||||||
|
|
||||||
<!-- ### News ### -->
|
<!-- ### News ### -->
|
||||||
<xsl:comment>
|
<xsl:comment>
|
||||||
|
@ -149,6 +143,9 @@
|
||||||
|
|
||||||
<xsl:call-template name="chaosupdates" />
|
<xsl:call-template name="chaosupdates" />
|
||||||
|
|
||||||
|
</xsl:otherwise>
|
||||||
|
</xsl:choose>
|
||||||
|
|
||||||
</div> <!-- id="body" -->
|
</div> <!-- id="body" -->
|
||||||
|
|
||||||
<!-- ### Footer ### -->
|
<!-- ### Footer ### -->
|
||||||
|
|
Loading…
Reference in New Issue