Merge branch 'master' of svn.c3d2.de:c3d2-web

2012-02-07 13:14:40 +01:00 · 2012-02-07 13:14:40 +01:00 · e329dc7938
parent 793a0ac9d2 05e90193fa
commit e329dc7938
7 changed files with 61 additions and 14 deletions
--- a/content/events.xml
+++ b/content/events.xml
@ -1037,4 +1037,9 @@
    <location>Albertplatz</location>
    <link>http://wiki.stoppacta-protest.info/DE:Demo:Dresden</link>
  </event>
+  <event title="Spring-Roo-Treffen">
+    <start>2012-02-14T19:00:00</start>
+    <location>SLUB</location>
+    <link>http://eventle.com/wdcmdresden/1883</link>
+  </event>
 </calendar>
--- a/content/news/pentacast-42-android.xml
+++ b/content/news/pentacast-42-android.xml
@ -40,16 +40,15 @@
 		<li><link href="http://de.wikipedia.org/wiki/Android_Market">WP: Android Market</link></li>
 		<li><link href="http://de.wikipedia.org/wiki/Google_Maps">WP: Google Maps</link></li>
 		<li><link href="http://de.wikipedia.org/wiki/Windows_Phone_7">WP: Windows Phone 7</link></li>
-		<li><link href="http://de.wikipedia.org/wiki/Andy_Rubin">WP: Andy Rubin (Gründer von Android)</link></li>
+		<li><link href="http://de.wikipedia.org/wiki/Andy_Rubin">WP: Andy Rubin (Begründer von Android)</link></li>
 		<li><link href="http://de.wikipedia.org/wiki/CyanogenMod">WP: CyanogenMod</link></li>
 		<li><link href="http://de.wikipedia.org/wiki/JDK">WP: JDK</link></li>
 		<li><link href="http://de.wikipedia.org/wiki/Software_Development_Kit">WP: SDK</link></li>
-		<li><link href="http://de.wikipedia.org/wiki/Software_Development_Kit">WP: SDK</link></li>
 		<li><link href="http://de.wikipedia.org/wiki/Integrierte_Entwicklungsumgebung">WP: IDE</link></li>
 		<li><link href="http://de.wikipedia.org/wiki/Debugger">WP: Debugger</link></li>
 		<li><link href="http://developer.android.com/guide/developing/tools/adb.html">Android Debug Bridge</link></li>
 		<li><link href="http://de.wikipedia.org/wiki/FreeBSD">WP: FreeBSD</link></li>
-		<li><link href="http://developer.android.com/guide/index.html">Android developer docu</link></li>
+		<li><link href="http://developer.android.com/guide/index.html">Android Developer's Guide</link></li>
 		<li><link href="http://de.wikipedia.org/wiki/OpenGL_ES">WP: OpenGL ES</link></li>
 		<li><link href="http://de.wikipedia.org/wiki/Asymmetrisches_Kryptosystem">WP: Asymmetrische Kryptographie</link></li>
 		<li><link href="http://www.heise.de/open/artikel/Die-Woche-Apple-vs-Open-Source-1169290.html">Heise: Keine GPL Apps für Apple App Store </link></li>
@ -67,7 +66,7 @@
 		<li><link href="http://de.wikipedia.org/wiki/Open-Xchange">WP: Open Xchange</link></li>
 		<li><link href="http://de.wikipedia.org/wiki/Apache_Harmony">WP: Apache Harmony</link></li>
 		<li><link href="http://de.wikipedia.org/wiki/Nokia_Lumia_800">WP: Nokia Lumia 800</link></li>
-		<li><link href="http://de.wikipedia.org/wiki/BlackBerry">WP: BlackBerryNokia Lumia 800</link></li>
+		<li><link href="http://de.wikipedia.org/wiki/BlackBerry">WP: BlackBerry 800</link></li>
 		<li><link href="http://de.wikipedia.org/wiki/Trusted_Platform_Module">WP: Trusted Platform Module</link></li>
 		<li><link href="http://de.wikipedia.org/wiki/Extensible_Firmware_Interface">WP: EFI</link></li>
 		<li><link href="https://plus.google.com/103529712146023544869">Blitz bei Google+</link></li>
--- a/content/news/ta-erlang.xml
+++ b/content/news/ta-erlang.xml
@ -25,12 +25,6 @@
      der
      <link href="http://en.wikipedia.org/wiki/Erlang_(programming_language)">Wikipedia</link>.
    </p>
-    <p>
-      Die Quelldateien der Folien und der IRC-Server können mit dem
-      Versionskontrollsystem <link href="http://git.or.cz/">Git</link>
-      heruntergeladen werden:
-    </p>
-    <pre>git clone http://cthulhu.c3d2.de/~astro/git/ta-erlang.git/</pre>
    <p>
      Das Video zum Schluss kann bei Chaosradio geschaut werden:
      <link href="http://chaosradio.ccc.de/ctv068.html">Erlang -
--- a/xsl/atom.xsl
+++ b/xsl/atom.xsl
@ -90,6 +90,15 @@
              length="{@size}" />
      </xsl:for-each>

+      <xsl:variable name="flattr_link">
+	<xsl:call-template name="make-flattr-link">
+	  <xsl:with-param name="newsfile" select="$newsfile"/>
+	</xsl:call-template>
+      </xsl:variable>
+      <xsl:if test="string-length($flattr_link) &gt; 0">
+	<link rel="payment" href="{$flattr_link}" type="text/html"/>
+      </xsl:if>
+
    </entry>
  </xsl:template>

--- a/xsl/common.xsl
+++ b/xsl/common.xsl
@ -561,4 +561,21 @@
    </xsl:choose>
  </xsl:template>

+  <xsl:template name="make-flattr-link">
+    <xsl:param name="newsfile"/>
+
+    <xsl:choose>
+      <xsl:when test="contains($newsfile, '/')">
+	<!-- Recurse w/o directory part until bare filename -->
+	<xsl:call-template name="make-flattr-link">
+	  <xsl:with-param name="newsfile" select="substring-after($newsfile, '/')"/>
+	</xsl:call-template>
+      </xsl:when>
+
+      <xsl:when test="starts-with($newsfile, 'pentaradio24-')">https://flattr.com/thing/51034/Pentaradio-24</xsl:when>
+      <xsl:when test="starts-with($newsfile, 'pentacast-')">https://flattr.com/thing/51037/Pentacast</xsl:when>
+      <xsl:when test="starts-with($newsfile, 'pentamusic-')">https://flattr.com/thing/51039/Pentamusic</xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
 </xsl:stylesheet>
--- a/xsl/podcast.xsl
+++ b/xsl/podcast.xsl
@ -9,6 +9,7 @@
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  xmlns:date="http://exslt.org/dates-and-times"
  xmlns:content="http://purl.org/rss/1.0/modules/content/" 
+  xmlns:atom="http://www.w3.org/2005/Atom"
  exclude-result-prefixes="xsl date">

  <xsl:output method="xml"
@ -41,8 +42,9 @@
            <itunes:category text="Technology">
              <itunes:category text="Tech News"/>
            </itunes:category>
+            <atom:link rel="payment" href="https://flattr.com/thing/51034/Pentaradio-24" type="text/html"/>
          </xsl:when>
-          <xsl:when test="$selection = 'pentacast' or $selection = 'pentamedia'">
+          <xsl:when test="$selection = 'pentacast'">
            <title>Pentacast</title>
            <link><xsl:value-of select="$baseurl"/>podcast.html</link>
            <description>C3D2 Pentacast</description>
@ -56,8 +58,9 @@
            <itunes:image href="{$baseurl}images/pentacast.png" />
            <itunes:category text="Society &amp; Culture"/>
            <itunes:category text="Technology"/>
+            <atom:link rel="payment" href="https://flattr.com/thing/51037/Pentacast" type="text/html"/>
          </xsl:when>
-          <xsl:when test="$selection = 'pentamusic' or $selection = 'pentamedia'">
+          <xsl:when test="$selection = 'pentamusic'">
            <title>Pentamusic</title>
            <link><xsl:value-of select="$baseurl"/>pentamusic.html</link>
            <description>C3D2 Pentamusic</description>
@ -69,9 +72,10 @@
              Mikro zu holen um diese einer breiteren Öffentlichkeit
              bekannt zu machen.
            </itunes:summary>
-            <itunes:image href="{$baseurl}images/pentacast.png" />
+            <itunes:image href="{$baseurl}images/pentamusic.png" />
            <itunes:category text="Society &amp; Culture"/>
            <itunes:category text="Music"/>
+            <atom:link rel="payment" href="https://flattr.com/thing/51039/Pentamusic" type="text/html"/>
          </xsl:when>
          <xsl:otherwise>
            <title>C3D2 Podcast</title>
@ -81,11 +85,12 @@
            <copyright>http://creativecommons.org/licenses/by-sa/2.0/de/</copyright>
            <itunes:subtitle>Radio &amp; Podcasts vom CCC Dresden</itunes:subtitle>
            <itunes:summary>
-              Pentaradio &amp; Pentacast vom Chaos Computer Club Dresden.
+              Pentaradio, Pentacast &amp; Pentamusic vom Chaos Computer Club Dresden.
            </itunes:summary>
            <itunes:image href="{$baseurl}images/pentaradio.png" />
            <itunes:category text="Society &amp; Culture"/>
            <itunes:category text="Technology"/>
+            <atom:link rel="payment" href="https://flattr.com/thing/51034/Pentaradio-24" type="text/html"/>
          </xsl:otherwise>
        </xsl:choose>
        <itunes:author>Chaos Computer Club Dresden</itunes:author>
@ -241,6 +246,14 @@
      <itunes:subtitle><xsl:value-of select="$resource_title"/></itunes:subtitle>
      <itunes:author>CCC Dresden</itunes:author>

+      <xsl:variable name="flattr_link">
+	<xsl:call-template name="make-flattr-link">
+	  <xsl:with-param name="newsfile" select="$newsfile"/>
+	</xsl:call-template>
+      </xsl:variable>
+      <xsl:if test="string-length($flattr_link) &gt; 0">
+	<atom:link rel="payment" href="{$flattr_link}" type="text/html"/>
+      </xsl:if>
    </item>
  </xsl:template>

--- a/xsl/rss.xsl
+++ b/xsl/rss.xsl
@ -3,6 +3,7 @@
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  xmlns:date="http://exslt.org/dates-and-times"
  xmlns:content="http://purl.org/rss/1.0/modules/content/" 
+  xmlns:atom="http://www.w3.org/2005/Atom"
  exclude-result-prefixes="xsl date">
  
  <xsl:include href="common.xsl" />
@ -108,6 +109,15 @@
 	</div>
 	<xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
      </content:encoded>
+
+      <xsl:variable name="flattr_link">
+	<xsl:call-template name="make-flattr-link">
+	  <xsl:with-param name="newsfile" select="$newsfile"/>
+	</xsl:call-template>
+      </xsl:variable>
+      <xsl:if test="string-length($flattr_link) &gt; 0">
+	<atom:link rel="payment" href="{$flattr_link}" type="text/html"/>
+      </xsl:if>
    </item>
  </xsl:template>