fixed the display of news and newsletter on front page

svn path=/trunk/; revision=19556
2011-02-08 16:29:09 +00:00 · 2011-02-08 16:29:09 +00:00 · 3dcd7b9b0d
parent 0cafe1996b
commit 3dcd7b9b0d
15 changed files with 76 additions and 35 deletions
--- a/news/nl/nl-201012.de.xhtml
+++ b/news/nl/nl-201012.de.xhtml
@ -203,6 +203,11 @@ Spende</a> unterstützen oder auf regelmäßiger Basis, indem Sie ein
 <a href="/contact/community.html">Freie-Software-Diskussionen</a> </p>
 </body>

+<tags>
+  <tag>newsletter</tag>  
+  <tag>Matthias Kirschner</tag>
+</tags>
+
 <timestamp>$Date: 2010-12-07 22:04:40 +0100 (Tue, 07 Dec 2010) $ $Author: guest-enz $</timestamp>
 <translator>Markus Enzenberger</translator>
 </html>
--- a/news/nl/nl-201012.el.xhtml
+++ b/news/nl/nl-201012.el.xhtml
@ -209,11 +209,12 @@ Libri ή το Amazon για να αγοράσετε δώρα, παρακαλού
 της Κοινότητας</a><br />
 <a href="/contact/community.html">Διάλογοι για το Ελεύθερο Λογισμικό</a> </p>
 </body>
+
 <tags>
  <tag>newsletter</tag>  
-  <tag>Matthias Kirschner</tag> 
-
+  <tag>Matthias Kirschner</tag>
 </tags>
+
 <timestamp>$Date: 2010-12-01 17:21:04 +0200 (mer. 01 sept. 2010) $ $Author: mk $</timestamp>
 </html>
 <!--
--- a/news/nl/nl-201012.en.xhtml
+++ b/news/nl/nl-201012.en.xhtml
@ -161,11 +161,13 @@ donation </a> or on a regular basis by
 <a href="http://planet.fsfe.org/en/rss20.xml">Fellowship Blog Aggregation</a><br />
 <a href="/contact/community.html">Free Software Discussions</a> </p>
 </body>
+
 <tags>
  <tag>newsletter</tag>  
-  <tag>Matthias Kirschner</tag> 
-
+  <tag>Matthias Kirschner</tag>
 </tags>
+
+
 <timestamp>$Date: 2010-12-01 17:21:04 +0200 (mer. 01 sept. 2010) $ $Author: mk $</timestamp>
 </html>
 <!--
--- a/news/nl/nl-201012.fr.xhtml
+++ b/news/nl/nl-201012.fr.xhtml
@ -71,11 +71,12 @@ Agrégation des Blogs de la
 <a href="http://planet.fsfe.org/fr/rss20.xml">des blogs en français</a><br />
 <a href="/contact/community.html">Discussions sur le Logiciel Libre</a> </p>
 </body>
+
 <tags>
  <tag>newsletter</tag>  
-  <tag>Matthias Kirschner</tag> 
-
+  <tag>Matthias Kirschner</tag>
 </tags>
+
 <timestamp>$Date: 2010-12-01 17:21:04 +0200 (mer. 01 sept. 2010) $ $Author: mk $</timestamp>
 <translator>Maëlle</translator>
 </html>
--- a/news/nl/nl-201012.nl.xhtml
+++ b/news/nl/nl-201012.nl.xhtml
@ -68,11 +68,12 @@ Reconquer </a> (Verdeel en Herover). Deze was gericht op het probleem van de tre
 <a href="http://planet.fsfe.org/en/rss20.xml">Fellowship Blogverzameling</a><br />
 <a href="/contact/community.html">Vrije Software discussies</a> </p>
 </body>
+
 <tags>
  <tag>newsletter</tag>  
-  <tag>Matthias Kirschner</tag> 
-
+  <tag>Matthias Kirschner</tag>
 </tags>
+
 <timestamp>$Date: 2010-12-01 17:21:04 +0200 (mer. 01 sept. 2010) $ $Author: mk $</timestamp>
 </html>
 <!--
--- a/news/nl/nl-201101.de.xhtml
+++ b/news/nl/nl-201101.de.xhtml
@ -115,9 +115,12 @@ Freie-Software-Aktivisten auf der ganzen Welt.</p>
 <a href="http://planet.fsfe.org/en/rss20.xml">Fellowship-Blog-Aggregation</a><br/>
 <a href="/contact/community.de.html">Freie-Software-Diskussionen</a> </p>
 </body>
+
 <tags>
-  <tag>front-page</tag>
+  <tag>newsletter</tag>  
+  <tag>Matthias Kirschner</tag>
 </tags>
+
 <timestamp>$Date: 2011-01-06 21:51:55 +0100 (jeu. 06 janv. 2011) $ $Author: guest-enz $</timestamp>
 <translator>Onsemeliot</translator>
 </html>
--- a/news/nl/nl-201101.el.xhtml
+++ b/news/nl/nl-201101.el.xhtml
@ -119,9 +119,12 @@ Guido</a>
 της Κοινότητας</a><br />
 <a href="/contact/community.html">Διάλογοι για το Ελεύθερο Λογισμικό</a> </p>
 </body>
+
 <tags>
-  <tag>front-page</tag> 
+  <tag>newsletter</tag>  
+  <tag>Matthias Kirschner</tag>
 </tags>
+
 <timestamp>$Date: 2011-01-01 12:05:50 +0200 (Sat, 01 Jan 2011) $ $Author: mk $</timestamp>
 </html>
 <!--
--- a/news/nl/nl-201101.en.xhtml
+++ b/news/nl/nl-201101.en.xhtml
@ -112,9 +112,12 @@ help Free Software activists all over the world.</p>
 <a href="http://planet.fsfe.org/en/rss20.xml">Fellowship Blog Aggregation</a><br />
 <a href="/contact/community.html">Free Software Discussions</a> </p>
 </body>
+
 <tags>
-  <tag>front-page</tag>
+  <tag>newsletter</tag>  
+  <tag>Matthias Kirschner</tag>
 </tags>
+
 <timestamp>$Date: 2011-01-02 13:25:29 +0100 (Sun, 02 Jan 2011) $ $Author: mk $</timestamp>
 </html>
 <!--
--- a/news/nl/nl-201101.fr.xhtml
+++ b/news/nl/nl-201101.fr.xhtml
@ -112,9 +112,12 @@ du Logiciel Libre du monde entier.</p>
 <a href="http://planet.fsfe.org/en/rss20.xml">Fellowship Blog Aggregation</a><br />
 <a href="/contact/community.html">Discussions sur le logiciel libre</a> </p>
 </body>
+
 <tags>
-  <tag>front-page</tag>
+  <tag>newsletter</tag>  
+  <tag>Matthias Kirschner</tag>
 </tags>
+
 <timestamp>$Date: 2011-01-04 23:00:47 +0100 (Tue, 04 Jan 2011) $ $Author: mk $</timestamp>
 <translator>maelle , schnouki</translator>
 </html>
--- a/news/nl/nl-201101.nl.xhtml
+++ b/news/nl/nl-201101.nl.xhtml
@ -51,9 +51,12 @@
 <a href="http://planet.fsfe.org/en/rss20.xml">Fellowship Blog Aggregation</a><br />
 <a href="/contact/community.html">Free Software Discussions</a> </p>
 </body>
+
 <tags>
-  <tag>front-page</tag>
+  <tag>newsletter</tag>  
+  <tag>Matthias Kirschner</tag>
 </tags>
+
 <timestamp>$Date: 2011-01-01 11:05:50 +0100 (Sat, 01 Jan 2011) $ $Author: mk $</timestamp>
 <translator>Jelle Hermsen</translator>
 </html>
--- a/news/nl/nl-201102.el.xhtml
+++ b/news/nl/nl-201102.el.xhtml
@ -163,9 +163,12 @@ Oracle, Apple και EMC. Διαβάστε τις λεπτομέρειες στ
 </ul>

 </body>
+
 <tags>
-  <tag>front-page</tag>
+  <tag>newsletter</tag>  
+  <tag>Matthias Kirschner</tag>
 </tags>
+
 <timestamp>$Date: 2011-01-02 13:25:29 +0100 (Sun, 02 Jan 2011) $ $Author: mk $</timestamp>
 </html>
 <!--
--- a/news/nl/nl-201102.en.xhtml
+++ b/news/nl/nl-201102.en.xhtml
@ -109,9 +109,12 @@ improve fsfe.org even further.
 <a href="/contact/community.html">Free Software Discussions</a> </p>

 </body>
+
 <tags>
-  <tag>front-page</tag>
+  <tag>newsletter</tag>  
+  <tag>Matthias Kirschner</tag>
 </tags>
+
 <timestamp>$Date: 2011-01-02 13:25:29 +0100 (Sun, 02 Jan 2011) $ $Author: mk $</timestamp>
 </html>
 <!--
--- a/news/nl/nl-201102.fr.xhtml
+++ b/news/nl/nl-201102.fr.xhtml
@ -72,9 +72,12 @@ L'équipe Web de la FSFE a besoin d'aide&#160;! Nous avons besoin de nouvelles i
 </ul>

 </body>
+
 <tags>
-  <tag>front-page</tag>
+  <tag>newsletter</tag>  
+  <tag>Matthias Kirschner</tag>
 </tags>
+
 <timestamp>$Date: 2011-01-02 13:25:29 +0100 (Sun, 02 Jan 2011) $ $Author: mk $</timestamp>
 <translator>Schnouki</translator>
 </html>
--- a/news/nl/nl-201102.it.xhtml
+++ b/news/nl/nl-201102.it.xhtml
@ -96,9 +96,12 @@ migliorare fsfe.org ancora di più.
  <a href="irc://irc.freenode.net/fsfe-web">#fsfe-web</a> on freenode</li>

 </body>
+
 <tags>
-  <tag>front-page</tag>
+  <tag>newsletter</tag>  
+  <tag>Matthias Kirschner</tag>
 </tags>
+
 <timestamp>$Date: 2011-01-02 13:25:29 +0100 (Sun, 02 Jan 2011) $ $Author: mk $</timestamp>
 <translator>Massimo Barbieri</translator>
 </html>
--- a/tools/xsltsl/tagging.xsl
+++ b/tools/xsltsl/tagging.xsl
@ -15,28 +15,32 @@
 		<xsl:param name="today" select="/html/@date" />
 		<xsl:param name="nb-items" select="''" />
 		
-        <xsl:for-each select="/html/set/news[ translate (@date, '-', '') &lt;= translate ($today, '-', '') and (tags/tag = $tag or $tag='') ]">
-			<xsl:sort select="@date" order="descending" />
-			<xsl:if test="position() &lt;= $nb-items or $nb-items=''">
-				<xsl:call-template name="news" />
-			</xsl:if>
+    <xsl:for-each select="/html/set/news[ translate (@date, '-', '') &lt;= translate ($today, '-', '')
+                          and (tags/tag = $tag or $tag='')
+                          and tags/tag != 'newsletter' ]">
+	    <xsl:sort select="@date" order="descending" />
+	    <xsl:if test="position() &lt;= $nb-items or $nb-items=''">
+		    <xsl:call-template name="news" />
+	    </xsl:if>
 		</xsl:for-each>
 		
 	</xsl:template>
 	
-    <!--display dynamic list of (not yet tagged) newsletters items-->
-    <xsl:template name="fetch-newsletters">
-        <xsl:param name="today" select="/html/@date" />
-        <xsl:param name="nb-items" select="''" />
-        
-        <xsl:for-each select="/html/set/news [translate(@date, '-', '') &lt;= translate($today, '-', '') and (@type = 'newsletter')]">
-            <xsl:sort select="@date" order="descending" />
-            <xsl:if test="position()&lt;= $nb-items or $nb-items=''">
-                <xsl:call-template name="newsletter" />
-            </xsl:if>
-        </xsl:for-each>
-        
-    </xsl:template>
+  <!--display dynamic list of (not yet tagged) newsletters items-->
+  <xsl:template name="fetch-newsletters">
+    <xsl:param name="today" select="/html/@date" />
+    <xsl:param name="nb-items" select="''" />
+    
+    <xsl:for-each select="/html/set/news [translate(@date, '-', '') &lt;= translate($today, '-', '')
+                          and (tags/tag = 'newsletter'
+                               or @type = 'newsletter' ) ]"> <!-- @type = 'newsletter' is for legacy -->
+      <xsl:sort select="@date" order="descending" />
+      <xsl:if test="position()&lt;= $nb-items or $nb-items=''">
+        <xsl:call-template name="newsletter" />
+      </xsl:if>
+    </xsl:for-each>
+    
+  </xsl:template>
    
 	<!--display dynamic list of tagged event items-->
 	<xsl:template name="fetch-events">