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

content/static/style/default.css

@@ -251,23 +251,6 @@ pre {
   text-decoration: underline;
 }
 
-/* -- Location hints -- */
-ul.location-hints {
-  display: none;
-  position: fixed;
-  background-color: white;
-  margin: 0;
-  padding: 0.1em 0.3em;
-  border: 2px solid #ebc63c;
-}
-ul.location-hints li {
-  list-style-type: none;
-  list-style-image: none;
-}
-dl:hover dd ul.location-hints {
-  display: inline;
-}
-
 /* -- Upcoming -- */
 #upcoming {
   text-align: left;
@@ -307,17 +290,13 @@ dl:hover dd ul.location-hints {
 }
 
 #upcoming ul li .location { 
-  /*display: none;*/
-  visibility: hidden;
-  white-space: nowrap;
+  display: none;
   overflow: hidden;
   font-size: xx-small;
   font-weight: bold;
 }
-#upcoming ul li:hover .location { 
-  /*display: inline;*/
-  visibility: visible;
-  background-color: white;
+#upcoming ul li:hover .location {
+  display: inline;
 }
 
 /* -- footer -- */

xsl/common.xsl

@@ -5,7 +5,7 @@
   xmlns:atom="http://www.w3.org/2005/Atom"
   xmlns:date="http://exslt.org/dates-and-times"
   xmlns:str="http://exslt.org/strings"
-  exclude-result-prefixes="xsl atom date str">
+  exclude-result-prefixes="xsl atom date">
 
   <xsl:template match="pre">
     <pre><xsl:apply-templates/></pre>
@@ -260,39 +260,7 @@
   <xsl:template match="item/event/location">
     <dl>
       <dt>Ort</dt>
-      <dd>
-        <!-- Extra <span/>, damit die location-hints nicht mit ins
-             Microformat rutschen
-          -->
-        <span class="location">
-          <xsl:apply-templates/>
-        </span>
-
-        <ul class="location-hints">
-          <xsl:variable name="location">
-            <xsl:choose>
-              <!-- Extrem schmutziger Hack:
-                   Google Maps versteht keine Raum-Angaben
-                -->
-              <xsl:when test="contains(., 'Raum')">
-                <xsl:value-of select="substring-before(., 'Raum')"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="."/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:variable>
-          <xsl:variable name="location-encoded"
-                        select="str:encode-uri($location, true())"/>
-          <li>
-            <a href="http://maps.google.com/maps?q={$location-encoded}">Google Maps</a>
-          </li>
-          <!-- Hier bitte weitere Anbieter einfügen, wir sind
-               doch nicht Google-zentrisch. Ich habe nur gerade
-               keine akzeptablen gefunden.   Astro
-            -->
-        </ul>
-      </dd>
+      <dd class="location"><xsl:apply-templates/></dd>
     </dl>
   </xsl:template>