From 6e8b84a935ce88ca2108d53fbdb6cd7b256135de Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Fri, 26 Nov 2010 20:07:01 +0100
Subject: [PATCH] fixes for HTML5 semantic block-level elements

---
 content/static/style/default.css | 6 ++++++
 xsl/common.xsl                   | 8 ++++----
 xsl/xhtml5.xsl                   | 2 --
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/content/static/style/default.css b/content/static/style/default.css
index 2f20872f4..b3dc9f61f 100644
--- a/content/static/style/default.css
+++ b/content/static/style/default.css
@@ -779,3 +779,9 @@ a.flattr:hover {
     text-decoration: none;    
     border-bottom: none;
 }
+
+/* CSS reset for deficient HTML5 support */
+article,aside,details,figcaption,figure,
+footer,header,hgroup,menu,nav,section {
+    display: block;
+}
\ No newline at end of file
diff --git a/xsl/common.xsl b/xsl/common.xsl
index b64261532..d3ef9fc2d 100644
--- a/xsl/common.xsl
+++ b/xsl/common.xsl
@@ -161,7 +161,7 @@
 
   <xsl:template name="chaosupdates">
     <xsl:param name="limit" select="5"/>
-    <div id="news">
+    <div id="news"><aside>
       <h2>
         <a href="{document('../chaosupdates.xml')/atom:feed/atom:link[not(@rel = 'self')]/@href}">
           <xsl:value-of select="document('../chaosupdates.xml')/atom:feed/atom:title"/>
@@ -176,13 +176,13 @@
           </li>
         </xsl:for-each>
       </ul>
-    </div> <!-- id="news" -->
+    </aside></div> <!-- id="news" -->
   </xsl:template>
 
   <xsl:template name="calendar-events">
     <xsl:param name="limit" select="5"/>
     <xsl:if test="document('../calendar-summary.xml')/page/calendar-summary/event[date:seconds(end) &gt;= date:seconds(date:date())]">
-      <div id="upcoming">
+      <div id="upcoming"><aside>
         <h2>
           <a href="{$baseurl}calendar.html">Kalender</a>
         </h2>
@@ -214,7 +214,7 @@
             </xsl:if>
           </xsl:for-each>
         </ul>
-      </div>
+      </aside></div>
     </xsl:if>
   </xsl:template>
 
diff --git a/xsl/xhtml5.xsl b/xsl/xhtml5.xsl
index 408fd64dc..9d8cbd7f5 100644
--- a/xsl/xhtml5.xsl
+++ b/xsl/xhtml5.xsl
@@ -147,7 +147,6 @@
                 </xsl:call-template>
               </div> <!-- id="content" -->
 
-	      <aside>
               <!-- ### News ### -->
               <xsl:comment>
                 <xsl:text> ### News ### </xsl:text>
@@ -156,7 +155,6 @@
               <xsl:call-template name="calendar-events" />
 
               <xsl:call-template name="chaosupdates" />
-	      </aside>
 
             </xsl:otherwise>
           </xsl:choose>