From cbcc857358ef59c8efd3b97556f5244d277bd2d1 Mon Sep 17 00:00:00 2001
From: astro <astro@31f61c52-7bfb-0310-b897-fc00f8a278f0>
Date: Tue, 25 Jul 2006 21:24:59 +0000
Subject: [PATCH] =?UTF-8?q?3=20Parameter=20f=C3=BCr=20xhtml.xsl:=20-=20pag?=
 =?UTF-8?q?etitle=20um=20Seitentitel=20aus=20der=20Makefile=20zu=20=C3=BCb?=
 =?UTF-8?q?erschreiben=20-=20newsbodies=20('off',=20damit=20nur=20News?=
 =?UTF-8?q?=C3=BCberschriften=20angezeigt=20werden)=20-=20newscategory=20u?=
 =?UTF-8?q?m=20News=20optional=20nach=20Kategorie=20zu=20filtern=20Hauptne?=
 =?UTF-8?q?wsseite=20hat=20jetzt=20unten=20Links=20zu=20ATOM,=20RSS=20&=20?=
 =?UTF-8?q?Archiv=20Hauptnewsseite=20hat=20nur=20noch=2010=20News=20Makefi?=
 =?UTF-8?q?le-Rules=20f=C3=BCr=20dynamische=20Seiten=20(themenabende,=20ne?=
 =?UTF-8?q?ws-archiv)=20nichtexistierende=20pages=20k=C3=B6nnen=20jetzt=20?=
 =?UTF-8?q?auch=20in=20die=20navigation.xml,=20falls=20ein=20title=20angeg?=
 =?UTF-8?q?eben=20ist=20themenabende=20in=20die=20navigation=20news/rwx.xm?=
 =?UTF-8?q?l=20nach=20news/ta-rwx.html=20umbenannt=20xsl:element-=20und=20?=
 =?UTF-8?q?xsl:attribute-reduktion?=
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@452 31f61c52-7bfb-0310-b897-fc00f8a278f0
---
 Makefile                              | 16 +++++-
 content/navigation.xml                |  2 +
 content/news/{rwx.xml => ta-rwx.html} |  2 +-
 xsl/common.xsl                        | 26 +++++----
 xsl/xhtml.xsl                         | 77 +++++++++++++++++----------
 5 files changed, 83 insertions(+), 40 deletions(-)
 rename content/news/{rwx.xml => ta-rwx.html} (97%)

diff --git a/Makefile b/Makefile
index e204db8ea..a1d27d5a4 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ WWW_CCC_DE_UPDATES=chaosupdates.rdf
 
 ### Ziele ###
 # Dateinamen der zu erzeugenden html-Dateien:
-CONTENT=$(PAGES) $(NEWS_PAGES) $(DS_PAGES) $(NEWSFILES) $(SEARCH_TMPL)
+CONTENT=$(PAGES) $(NEWS_PAGES) $(DS_PAGES) $(NEWSFILES) $(SEARCH_TMPL) $(DYNAMIC)
 
 # 'normale' Seiten:
 PAGES:=$(patsubst content/pages/%.xml, build/%.html, $(wildcard content/pages/*.xml))
@@ -48,6 +48,8 @@ NEWSFILES:=build/news.html build/news-rss.xml build/news-atom.xml
 DS_PAGES:=$(patsubst content/datenspuren/%.xml, build/datenspuren/%.html, $(wildcard content/datenspuren/*.xml)) build/datenspuren/schedule.html
 # Suchseiten-Template
 SEARCH_TMPL:=build/cgi-bin/search.html
+# Dynamische Seiten:
+DYNAMIC:=build/themenabende.html build/news-archiv.html
 
 # Quellen
 NEWSITEMS:=$(wildcard content/news/*.xml)
@@ -86,13 +88,25 @@ news.xml: $(NEWSITEMS)
 $(NEWSFILES): news.xml $(NAVIGATION) $(STYLE)
 	$(call xml_process)
 
+# Pages:
 build/%.html: content/pages/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES)
 	$(call xml_process)
 
+# News:
 build/news/%.html : BASEURL="../"
 build/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES)
 	$(call xml_process)
 
+# Dynamisches:
+build/news-archiv.html : PFLAGS+=--stringparam pagetitle News-Archiv --stringparam newsbodies off
+build/news-archiv.html: news.xml $(NAVIGATION) $(STYLE)
+	$(call xml_process)
+
+build/themenabende.html : PFLAGS+=--stringparam pagetitle Themenabende --stringparam newsbodies off --stringparam newscategory Themenabend
+build/themenabende.html: news.xml $(NAVIGATION) $(STYLE)
+	$(call xml_process)
+
+# Suche:
 build/cgi-bin/search.html : BASEURL="../"
 build/cgi-bin/search.html: content/cgi-bin/search.xml $(STYLE) $(NAVIGATION)
 	$(call xml_process)
diff --git a/content/navigation.xml b/content/navigation.xml
index 875228161..6ebaa5668 100644
--- a/content/navigation.xml
+++ b/content/navigation.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <navigation>
+  <file title='News'>news</file>
   <file>whois</file>
   <file>kontakt</file>
   <file>mailingliste</file>
   <file>treff</file>
+  <file title='Themenabende'>themenabende</file>
   <file>projekte</file>
   <file>wiki</file>
   <file>silc</file>
diff --git a/content/news/rwx.xml b/content/news/ta-rwx.html
similarity index 97%
rename from content/news/rwx.xml
rename to content/news/ta-rwx.html
index 33d4e93f5..bb96cefd9 100644
--- a/content/news/rwx.xml
+++ b/content/news/ta-rwx.html
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
 <?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
-<item title="Themenabend: Beyond rwxr-x---" date="2006-06-14T23:05:50" author="Alien8" category="TA">
+<item title="Themenabend: Beyond rwxr-x---" date="2006-06-14T23:05:50" author="Alien8" category="Themenabend">
   <image title="rwx">rwx.png</image>
   <p>
     Was es so alles außer <em>chmod a+s *</em> auf aktuellen Betriebssystemen gibt, um Zugriffsrechte zu kontrollieren, füllt am 22.6.2006 eine Nacht. Das Programm ist congresswürdig.
diff --git a/xsl/common.xsl b/xsl/common.xsl
index d6eb8e708..6eef62759 100644
--- a/xsl/common.xsl
+++ b/xsl/common.xsl
@@ -95,25 +95,31 @@
   <xsl:template name="navitem">
     <xsl:param name="file"/>
     <xsl:param name="baseurl"/>
+    <xsl:param name="title"/>
     <li>
-      <xsl:element name="a">
-        <xsl:attribute name="href"><xsl:value-of select="concat($baseurl, $file, '.html')"/></xsl:attribute>
-        <xsl:if test="document(concat('../content/pages/', $file, '.xml'))/page/@pagetitle">
-          <xsl:attribute name="title"><xsl:value-of select="document(concat('../content/pages/', $file, '.xml'))/page/@pagetitle"/></xsl:attribute>
-        </xsl:if>
-        <xsl:value-of select="document(concat('../content/pages/', $file, '.xml'))/page/@title"/>
-      </xsl:element>
+      <a href="{$baseurl}{$file}.html">
+        <xsl:choose>
+          <xsl:when test="string-length($title) = 0">
+            <xsl:if test="document(concat('../content/pages/', $file, '.xml'))/page/@pagetitle">
+              <xsl:attribute name="title"><xsl:value-of select="document(concat('../content/pages/', $file, '.xml'))/page/@pagetitle"/></xsl:attribute>
+            </xsl:if>
+
+            <xsl:value-of select="document(concat('../content/pages/', $file, '.xml'))/page/@title"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="$title"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </a>
     </li>
   </xsl:template>
 
   <xsl:template name="navitems">
      <ul>
-       <li>
-         <a href="{$baseurl}news.html" title="News">News</a>
-       </li>
        <xsl:for-each select="document('../content/navigation.xml')/navigation/file">
          <xsl:call-template name="navitem">
            <xsl:with-param name="file" select="."/>
+           <xsl:with-param name="title" select="@title"/>
            <xsl:with-param name="baseurl" select="$baseurl"/>
          </xsl:call-template>
        </xsl:for-each>
diff --git a/xsl/xhtml.xsl b/xsl/xhtml.xsl
index ab027f1be..7fff4dd64 100644
--- a/xsl/xhtml.xsl
+++ b/xsl/xhtml.xsl
@@ -7,6 +7,11 @@
   exclude-result-prefixes="xsl rss rdf">
 
 
+<xsl:param name="newsbodies"/>
+<xsl:param name="newscategory"/>
+<xsl:param name="pagetitle"/>
+
+
 <xsl:include href="common.xsl" />
 <xsl:include href="date.xsl" />
 <xsl:include href="header.xsl" />
@@ -22,6 +27,9 @@
   <xsl:template match="/page">
     <xsl:variable name="title">
       <xsl:choose>
+        <xsl:when test="$pagetitle != ''">
+          <xsl:value-of select="$pagetitle"/>
+        </xsl:when>
         <xsl:when test="/page/@pagetitle">
           <xsl:value-of select="/page/@pagetitle"/>
         </xsl:when>
@@ -174,44 +182,57 @@
   <xsl:template match="/page/news">
     <xsl:for-each select="newsfile">
       <xsl:sort select="date:seconds(document(concat('../', .))/item/@date)" data-type="number" order="descending" />
-      <xsl:if test="position() &lt;= 15">
+      <xsl:if test="(position() &lt;= 10) or ($newsbodies = 'off')">
   
         <xsl:variable name="newsfile"><xsl:value-of select="."/></xsl:variable>
         <xsl:variable name="itemposition" select="position()"/>
   
         <xsl:for-each select="document(concat('../', $newsfile))/item">
-  
-          <h3 class="news">
-            <a href="{substring-before(substring-after($newsfile, 'content/'), '.xml')}.html">
-              <xsl:value-of select="@title"/>
-            </a>
-          </h3>
-  
-          <xsl:call-template name="news-meta"/>
-  
-          <div class="news">
-            <xsl:apply-templates>
-              <xsl:with-param name="itemposition" select="$itemposition"/>
-            </xsl:apply-templates>
-  
-            <xsl:call-template name="include-resources">
-              <xsl:with-param name="include-hidden">no</xsl:with-param>
-            </xsl:call-template>
-  
-            <xsl:if test="//addendum">
-              <p>
-                <a href="{substring-before(substring-after($newsfile, 'content/'), '.xml')}.html">
-                  Weiterlesen...
-                </a>
-              </p>
+
+          <xsl:if test="($newscategory = '') or ($newscategory = @category)">
+    
+            <h3 class="news">
+              <a href="{substring-before(substring-after($newsfile, 'content/'), '.xml')}.html">
+                <xsl:value-of select="@title"/>
+              </a>
+            </h3>
+    
+            <xsl:call-template name="news-meta"/>
+    
+            <xsl:if test="$newsbodies != 'off'">
+              <div class="news">
+                <xsl:apply-templates>
+                  <xsl:with-param name="itemposition" select="$itemposition"/>
+                </xsl:apply-templates>
+      
+                <xsl:call-template name="include-resources">
+                  <xsl:with-param name="include-hidden">no</xsl:with-param>
+                </xsl:call-template>
+      
+                <xsl:if test="//addendum">
+                  <p>
+                    <a href="{substring-before(substring-after($newsfile, 'content/'), '.xml')}.html">
+                      Weiterlesen...
+                    </a>
+                  </p>
+                </xsl:if>
+              </div>
+    
+              <hr class="news"/>
             </xsl:if>
-          </div>
-  
-          <hr class="news"/>
+
+          </xsl:if>
   
         </xsl:for-each>
       </xsl:if>
     </xsl:for-each>
+
+    <xsl:if test="$newsbodies != 'off'">
+      <p>
+        Die Neuigkeiten des C3D2 sind auch als <a href="{$baseurl}news-atom.xml">ATOM</a> und <a href="{$baseurl}news-rss.xml">RSS</a> abrufbar.
+        Mehr News gibts im <a href="{$baseurl}news-archiv.html">Archiv</a>.
+      </p>
+    </xsl:if>
   </xsl:template>
 
   <xsl:template name="news-meta">