From fee091a741b144fb73b689ce39af903392790011 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Wed, 13 Oct 2010 18:41:16 +0200
Subject: [PATCH] datenspuren/xhtml.xsl: fix schedule pull & remove stale css

---
 content/static/datenspuren/css/fahrplan.css  |  21 ---
 content/static/datenspuren/css/general.css   |   6 -
 content/static/datenspuren/css/reset.css     | 164 -------------------
 content/static/datenspuren/css/reset_ie.css  |  90 ----------
 content/static/datenspuren/css/structure.css |  68 --------
 content/static/datenspuren/css/type.css      |  53 ------
 xsl/datenspuren/xhtml.xsl                    |   8 +-
 7 files changed, 2 insertions(+), 408 deletions(-)
 delete mode 100644 content/static/datenspuren/css/fahrplan.css
 delete mode 100644 content/static/datenspuren/css/general.css
 delete mode 100644 content/static/datenspuren/css/reset.css
 delete mode 100644 content/static/datenspuren/css/reset_ie.css
 delete mode 100644 content/static/datenspuren/css/structure.css
 delete mode 100644 content/static/datenspuren/css/type.css

diff --git a/content/static/datenspuren/css/fahrplan.css b/content/static/datenspuren/css/fahrplan.css
deleted file mode 100644
index f5def3e8f..000000000
--- a/content/static/datenspuren/css/fahrplan.css
+++ /dev/null
@@ -1,21 +0,0 @@
-table.schedule {
-    margin-top: 0.2em;
-    margin-bottom: 1em;
-}
-table.schedule tr th {
-    background-color: #eee;
-}
-table.schedule tr td.odd {
-    background-color: #eee;
-}
-table.schedule tr td.event {
-    background-color: #eee;
-    padding: 0 0.2em;
-}
-table.schedule tr td.event ul {
-    list-style-type: none;
-    font-size: 50%;
-}
-table.schedule tr td.event ul li {
-    display: inline-block;
-}
\ No newline at end of file
diff --git a/content/static/datenspuren/css/general.css b/content/static/datenspuren/css/general.css
deleted file mode 100644
index a377f659d..000000000
--- a/content/static/datenspuren/css/general.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@import "reset.css";
-@import "reset_ie.css";
-@import "structure.css";
-@import "type.css";
-@import "fahrplan.css";
-
diff --git a/content/static/datenspuren/css/reset.css b/content/static/datenspuren/css/reset.css
deleted file mode 100644
index 50f9429e9..000000000
--- a/content/static/datenspuren/css/reset.css
+++ /dev/null
@@ -1,164 +0,0 @@
-* {
-margin:0;
-padding:0;
-}
-option {
-padding-left:0.4em;
-}
-* html body * {
-overflow:visible;
-}
-* html iframe, * html frame {
-overflow:auto;
-}
-* html frameset {
-overflow:hidden;
-}
-html {
-height:100%;
-margin-bottom:1px;
-}
-body {
-background:#FFFFFF none repeat scroll 0 0;
-color:#000000;
-font-size:100.01%;
-text-align:left;
-}
-fieldset, img {
-border:0 solid;
-}
-ul, ol, dl {
-margin:0;
-}
-li {
-line-height:1.5em;
-margin-left:1.5em;
-}
-dt {
-font-weight:700;
-}
-dd {
-margin:0 0 1em 2em;
-}
-blockquote {
-margin:0 0 1em 1.5em;
-}
-#header {
-position:relative;
-}
-#topnav {
-text-align:right;
-}
-#header #topnav {
-position:absolute;
-right:10px;
-top:10px;
-}
-#header, #nav, #main, #footer {
-clear:both;
-}
-#col1 {
-float:left;
-width:200px;
-}
-#col2 {
-float:right;
-width:200px;
-}
-#col3 {
-margin:0 200px;
-width:auto;
-}
-#col1_content, #col2_content, #col3_content {
-position:relative;
-}
-.hideboth #col3 {
-margin-left:0;
-margin-right:0;
-}
-.hidecol1 #col3 {
-margin-left:0;
-margin-right:200px;
-}
-.hidecol2 #col3 {
-margin-left:200px;
-margin-right:0;
-}
-.hideboth #col1, .hideboth #col2, .hidecol1 #col1, .hidecol2 #col2 {
-display:none;
-}
-.clearfix:after {
-clear:both;
-content:".";
-display:block;
-height:0;
-visibility:hidden;
-}
-.clearfix {
-display:block;
-}
-.floatbox {
-overflow:hidden;
-}
-#ie_clearing {
-display:none;
-}
-.subcolumns {
-overflow:hidden;
-width:100%;
-}
-.subcolumns_oldgecko {
-float:left;
-width:100%;
-}
-.c50l, .c25l, .c33l, .c38l, .c66l, .c75l, .c62l {
-float:left;
-}
-.c50r, .c25r, .c33r, .c38r, .c66r, .c75r, .c62r {
-float:right;
-margin-left:-5px;
-}
-.c25l, .c25r {
-width:25%;
-}
-.c33l, .c33r {
-width:33.333%;
-}
-.c50l, .c50r {
-width:50%;
-}
-.c66l, .c66r {
-width:66.666%;
-}
-.c75l, .c75r {
-width:75%;
-}
-.c38l, .c38r {
-width:38.2%;
-}
-.c62l, .c62r {
-width:61.8%;
-}
-.subc {
-padding:0 0.5em;
-}
-.subcl {
-padding:0 1em 0 0;
-}
-.subcr {
-padding:0 0 0 1em;
-}
-.skip, .hideme, .print {
-height:1px;
-left:-1000em;
-position:absolute;
-top:-1000em;
-width:1px;
-}
-.skip:focus, .skip:active {
-height:auto;
-left:0;
-position:static;
-top:0;
-width:auto;
-}
\ No newline at end of file
diff --git a/content/static/datenspuren/css/reset_ie.css b/content/static/datenspuren/css/reset_ie.css
deleted file mode 100644
index 376279010..000000000
--- a/content/static/datenspuren/css/reset_ie.css
+++ /dev/null
@@ -1,90 +0,0 @@
-html {
-height:auto;
-margin-bottom:0;
-margin-right:1px;
-}
-* html textarea {
-overflow-x:hidden;
-overflow-y:scroll;
-}
-* html input {
-overflow:hidden;
-}
-body {
-height:1%;
-position:relative;
-}
-* html body {
-position:static;
-}
-#main {
-position:relative;
-}
-.clearfix {
-display:inline-block;
-}
-.clearfix {
-display:block;
-}
-* html .clearfix {
-height:1%;
-}
-* html .floatbox {
-width:100%;
-}
-.slidebox {
-height:1%;
-margin-right:-1000px;
-position:relative;
-}
-* html #col1, * html #col2, * html #col3 {
-position:relative;
-}
-#page_margins, #page, #header, #nav, #main, #footer {
-}
-#page_margins, #page {
-height:1%;
-}
-* html #header, * html #nav, * html #main, * html #footer {
-width:auto;
-}
-* html ul, * html ol, * html dl {
-position:relative;
-}
-body ol li {
-display:list-item;
-}
-#ie_clearing {
-display:block;
-font-size:0;
-margin:-2px 0 -1em 1px;
-position:static;
-width:100%;
-}
-* html #ie_clearing {
-margin:-2px 0 -1em;
-}
-#col3_content {
-margin-bottom:-2px;
-}
-* html {
-margin-right:0;
-}
-#col3 {
-position:relative;
-z-index:-1;
-}
-* html body a, * html body a:hover {
-background-color:transparent;
-}
-#col1, #col2, .c50l, .c25l, .c33l, .c38l, .c66l, .c75l, .c62l, .c50r, .c25r, .c33r, .c38r, .c66r, .c75r, .c62r {
-display:inline;
-}
-* html #col1_content, * html #col2_content, * html #col3_content {
-}
-* html .subcolumns .subc, * html .subcolumns .subcl, * html .subcolumns .subcr {
-overflow:hidden;
-}
-#col3 {
-height:1%;
-}
\ No newline at end of file
diff --git a/content/static/datenspuren/css/structure.css b/content/static/datenspuren/css/structure.css
deleted file mode 100644
index bf864e7ae..000000000
--- a/content/static/datenspuren/css/structure.css
+++ /dev/null
@@ -1,68 +0,0 @@
-body {
-}
-
-div#header {
-        margin-bottom:1em;
-}
-
-div#header h1 {
-        margin-top:-44px;
-        margin-left:170px;
-}
-
-div#container {
-        width:768px;
-        margin-left:155px;
-        padding:1em;
-}
-
-div#main, div#right {
-        float:left;
-}
-
-div#main {
-        width:500px;
-        margin-right:1em;
-}
-
-div#main div#intro {
-        padding-bottom:2em;
-        margin-bottom:1em;
-        border-bottom:1px solid #eee;
-}
-
-div#right {
-        width:150px;
-}
-
-div#navigation {
-        background:url('../images/navigation_background.png') left no-repeat #fff;
-        min-height:400px;
-}
-
-div#navigation a {
-        display:block;
-        border:1px solid #999;
-        padding:0.25em 0.25em 0.25em 0.5em;
-        margin-bottom:0.25em;
-        background:#fff;
-}
-
-div#main dl.main_left {
-        float:left;
-        width:125px;
-        margin-right:25px;
-        margin-top:40px;
-} 
-
-div#main p.main_right {
-        float:left;
-        width:350px;
-}
-
-div#cccdd_logo {
-        position:fixed;
-        right:0;
-        bottom:0;
-        padding:0 20px 15px 0
-}
\ No newline at end of file
diff --git a/content/static/datenspuren/css/type.css b/content/static/datenspuren/css/type.css
deleted file mode 100644
index 280c6b613..000000000
--- a/content/static/datenspuren/css/type.css
+++ /dev/null
@@ -1,53 +0,0 @@
-body {
-        font-family: Geneva, Lucida Sans, Lucida Grande, Lucida Sans Unicode, Verdana, sans-serif;
-        font-size:0.9em;
-        color:#222;
-}
-
-h1, h2, h3, h4, h5, h6 {
-        margin-bottom:0.5em;
-        margin-top: 2em;
-}
-
-h1 {
-        color:#049000;
-}
-
-h3 {
-        font-size:1.2em;
-        font-weight:normal;
-        color:#666;
-}
-
-p {
-        line-height:1.4em;
-        margin-bottom:1em;
-}
-
-a {
-        color:#049000;
-}
-
-a:hover {
-        text-decoration:none;
-}
-
-span.date {
-        font-size:0.6em;
-        color:#999;
-        padding-left: 2em;
-}
-
-div#right {
-        text-align:right;
-}
-
-div#navigation a {
-        text-decoration:none;
-        color:#000;
-}
-
-div#navigation a#active {
-        font-weight:bold;
-        text-align:left;
-}
diff --git a/xsl/datenspuren/xhtml.xsl b/xsl/datenspuren/xhtml.xsl
index 157224e8a..3ac3570d0 100644
--- a/xsl/datenspuren/xhtml.xsl
+++ b/xsl/datenspuren/xhtml.xsl
@@ -113,18 +113,14 @@
                       <xsl:attribute name="class">event</xsl:attribute>
                       <a>
                         <xsl:attribute name="class">event</xsl:attribute>
-                        <xsl:attribute name="href"><xsl:value-of select="concat('2009/', x:p[@class='title']/x:a/@href)"/></xsl:attribute>
+                        <xsl:attribute name="href"><xsl:value-of select="x:p[@class='title']/x:a/@href"/></xsl:attribute>
                         <xsl:value-of select="x:p[@class='title']"/>
                       </a>
                       <xsl:if test="x:ul[@class='speakers']/x:li/x:a">
                         <ul>
                           <xsl:for-each select="x:ul[@class='speakers']/x:li/x:a">
                             <li>
-                              <a>
-                                <xsl:attribute name="href">
-                                  <xsl:value-of select="concat('2009/',
-                                  @href)"/>
-                                </xsl:attribute>
+                              <a href="{@href}">
                                 <xsl:value-of select="."/>
                               </a>
                             </li>