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

Makefile

@@ -214,7 +214,7 @@ build/%.html.xhtml5-validate: build/%.html
 ### Die neuesten Chaosupdates holen ###
 $(WWW_CCC_DE_UPDATES).orig: $(DATESTAMP)
 	$(RM) $@
-	$(WGET) -O $@ http://www.ccc.de/de/rss/updates.rdf
+	$(WGET) -O $@ -4 http://www.ccc.de/de/rss/updates.rdf
 
 $(WWW_CCC_DE_UPDATES): $(WWW_CCC_DE_UPDATES).orig
 	$(VALIDATOR) --recover $< > $@

content/static/style/default.css

@@ -191,18 +191,29 @@ pre {
   margin-top: .5em;
 }
 
-#content div.comment {
-    border: #ccc 1px solid;
-    background-color: #eee;    
+/* -- Comments -- */
+div.comments > p:first-child {
+  padding: 1em 0 0;
+  /* like h2 */
+  font-size: 1.2em;
+  font-weight: bold;
+  color: #666;
 }
 
-#content div.comment .author {
+div.comment {
+    border-bottom: #ccc 1.1px dashed !important;
+    border-top: #ccc 1.1px dashed !important;
+    padding: 1em 2em 1em !important;
+    margin: 0 -2em -1.1px;
+}
+div.comment .author {
     font-weight: bold;
 }
-#content div.comment .date {
-    padding-left: 2em;
+
+p.new_comment {
+  margin-bottom: 4em !important;
 }
-#content p.new_comment a:before {
+p.new_comment a:before {
   content: url(../images/bullet.png);
   padding-right: 4px;
 }
@@ -252,6 +263,23 @@ pre {
   text-decoration: underline;
 }
 
+/* -- Adspace -- */
+#adspace {
+  padding: 0 1em 0 2em;
+}
+
+#adspace h2 {
+  font-size: 1.2em;
+  font-style: italic;
+  color: #666;
+  padding: 0;
+}
+#adspace p {
+  margin: 0;
+  padding: 0;
+  margin-bottom: 1em;
+}
+
 /* -- Upcoming -- */
 #upcoming {
   padding: 0 1em 0 2em;

xsl/common.xsl

@@ -69,6 +69,30 @@
       class="{@class}"/>
   </xsl:template>
 
+  <!-- Bilder in News-Einträgen haben Pfad immer relativ zu /images/news/ -->
+  <xsl:template match="item/image">
+    <xsl:variable name="path">
+      <xsl:call-template name="normalize-path">
+	<xsl:with-param name="path">
+	  <xsl:choose>
+	    <xsl:when test="contains(., '://')">
+	      <xsl:value-of select="."/>
+	    </xsl:when>
+	    <xsl:otherwise>
+	      <xsl:value-of select="concat($baseurl, 'images/news/', .)"/>
+	    </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:with-param>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <img
+      src="{$path}"
+      title="{@title}"
+      alt="{@title}"
+      class="{@class}"/>
+  </xsl:template>
+
   <xsl:template match="link">
     <xsl:variable name="href">
       <xsl:call-template name="make-href">
@@ -160,6 +184,19 @@
      </ul>
   </xsl:template>
 
+  <xsl:template name="adspace">
+    <div id="adspace">
+      <h2>Podcast-Portal</h2>
+      <p>
+	<a href="http://pentamedia.org/">
+	  <img title="pentamedia.org"
+	       alt="pentamedia"
+	       src="{concat($baseurl, '/images/pentamedia.png')}"/>
+	</a>
+      </p>
+    </div>
+  </xsl:template>
+
   <xsl:template name="chaosupdates">
     <xsl:param name="limit" select="5"/>
     <div id="news">

xsl/podcast.xsl

@@ -38,11 +38,10 @@
               Pentaradio sind die Sendungen des Chaos Computer Club Dresden auf coloRadio, bestehend aus einem informativen Rahmenprogramm und Beiträgen zu einem sendungsspezifischen Thema.
             </itunes:summary>
             <itunes:image href="{$baseurl}images/pentaradio.png" />
-            <itunes:category text="Society &amp; culture"/>
-            <itunes:category text="Talk">
-              <itunes:category text="Radio"/>
+            <itunes:category text="Society &amp; Culture"/>
+            <itunes:category text="Technology">
+              <itunes:category text="Tech News"/>
             </itunes:category>
-            <itunes:category text="Technology"/>
           </xsl:when>
           <xsl:when test="$selection = 'pentacast' or $selection = 'pentamedia'">
             <title>Pentacast</title>
@@ -56,10 +55,7 @@
               Computer Club Dresden.
             </itunes:summary>
             <itunes:image href="{$baseurl}images/pentacast.png" />
-            <itunes:category text="Society &amp; culture"/>
-            <itunes:category text="Talk">
-              <itunes:category text="Radio"/>
-            </itunes:category>
+            <itunes:category text="Society &amp; Culture"/>
             <itunes:category text="Technology"/>
           </xsl:when>
           <xsl:when test="$selection = 'pentamusic' or $selection = 'pentamedia'">
@@ -75,6 +71,7 @@
               bekannt zu machen.
             </itunes:summary>
             <itunes:image href="{$baseurl}images/pentacast.png" />
+            <itunes:category text="Society &amp; Culture"/>
             <itunes:category text="Music"/>
           </xsl:when>
           <xsl:otherwise>
@@ -88,10 +85,7 @@
               Pentaradio &amp; Pentacast vom Chaos Computer Club Dresden.
             </itunes:summary>
             <itunes:image href="{$baseurl}images/pentaradio.png" />
-            <itunes:category text="Society &amp; culture"/>
-            <itunes:category text="Talk">
-              <itunes:category text="Radio"/>
-            </itunes:category>
+            <itunes:category text="Society &amp; Culture"/>
             <itunes:category text="Technology"/>
           </xsl:otherwise>
         </xsl:choose>

xsl/xhtml5.xsl

@@ -93,6 +93,8 @@
 	    </xsl:comment>
 
 	    <aside id="rsidebar">
+	      <xsl:call-template name="adspace" />
+
 	      <xsl:call-template name="calendar-events" />
 
 	      <xsl:call-template name="chaosupdates" />