c3d2/c3d2-web
c3d2
/
c3d2-web
38
3
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge branch 'html5' into html5-drafts

This commit is contained in:
Astro 2010-11-27 19:42:51 +01:00
parent 730eda12ed 6847f18743
commit fab3bca1f5
7 changed files with 112 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
content/static/images/top-left.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 425 B

BIN
content/static/images/top-right.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 309 B

2
content/static/script/play-resources.js
View File

@ -121,7 +121,7 @@ $(document).ready(function() {
return r.type;
}).some(canPlay)) {
var liEl = $('<li></li>');
((alternativeEls.length < 1) ? $(this) : alternativeEls.last()).after(liEl);
$(this).before(liEl);
var player = addButton(liEl, res);
}
});

63
content/static/style/default.css
View File

@ -15,12 +15,10 @@ pre {
/* -- Logo -- */
#logo::before {
background: transparent url(../images/top-right.png) scroll no-repeat top right;
margin-bottom: -20px;
height: 30px;
display: block;
border: none;
content: url(../images/top-left.png);
padding: 0;
line-height: 0.1em;
font-size: 1px;
@ -31,24 +29,33 @@ pre {
height: 150px;
background: url(../images/c3d2_blue.jpg);
text-align: left;
border-top-left-radius: 30px;
-moz-border-radius-topleft: 30px;
-webkit-border-top-left-radius: 30px;
border-top-right-radius: 30px;
-moz-border-radius-topright: 30px;
-webkit-border-top-right-radius: 30px;
}
#logo h1 {
position: relative;
top: 23px;
top: 47px;
left: 23px;
padding: 65px 0 0 0;
overflow: hidden;
background-image: url(../images/logo.png);
background-repeat: no-repeat;
height: 0px !important;
height /**/:65px;
}
/* -- Body -- */
#body {
display: block;
float: left;
border: thin solid #ccc;
border-top: none;
background-color: white;
margin: 0 2em 0 2em;
background: #fff url(../images/background_bottom.png) no-repeat left bottom;
}
/* -- Navigation -- */
@ -56,9 +63,9 @@ pre {
#navigation {
float: left;
text-align: left;
width: 12%;
margin-left: 2em;
padding: 1em;
width: 14em;
margin: 0;
padding: 0 1em;
padding-top: 100px;
background: url(../images/ck.png) top center no-repeat;
}
@ -99,13 +106,13 @@ pre {
/* -- Content -- */
#content {
text-align: left;
float: left;
width: 50%;
border-left: #ccc 1.1px dashed;
border-right: #ccc 1.1px dashed;
line-height: 1.3em;
padding: 2em;
min-height: 200px;
min-height: 300px;
min-width: 30em;
margin: 0 24em 0 16em;
}
#content p {
@ -158,7 +165,7 @@ pre {
#content hr.news {
visibility: hidden;
clear: both;
/*clear: both;*/
}
#content div.news {
@ -210,17 +217,21 @@ pre {
padding-right: 4px;
}
/* -- Sidebar right -- */
#rsidebar {
width: 24em;
float: right;
margin: 0;
padding: 0;
font-size: small;
text-align: left;
}
/* -- News -- */
#news {
text-align: left;
float: right;
margin-right: 1em;
margin-left: -5%;
width: 19%;
background: url(../images/pesthoernchen.png) top center no-repeat;
padding: 2em;
padding-top: 90px;
font-size: small;
}
#news h2 {
@ -254,13 +265,7 @@ pre {
/* -- Upcoming -- */
#upcoming {
text-align: left;
float: right;
margin-right: 1em;
margin-left: -5%;
width: 19%;
padding: 2em;
font-size: small;
padding: 1.5em;
}
#upcoming h2 {
@ -273,7 +278,6 @@ pre {
list-style-type: none;
font-size: small;
margin-left: -1em;
max-width: 10em !important;
}
#upcoming ul li {
@ -302,12 +306,9 @@ pre {
/* -- footer -- */
#footer {
margin: 0 2em 2em 2em;
margin: 0 2em;
text-align: center;
font-size: small;
border: #ccc 1px solid;
border-top: none;
background: #fff url(../images/background_bottom.png) no-repeat left bottom;
}
#footer ul, #footer li {
@ -768,6 +769,8 @@ p.blockquote {
background-color: #fafafa;
}
/* -- Flattr button -- */
a.flattr {
content: url(../images/flattrthis.png);
opacity: 0.8;

8
xsl/common.xsl
View File

@ -161,7 +161,7 @@
<xsl:template name="chaosupdates">
<xsl:param name="limit" select="5"/>
<div id="news"><aside>
<div id="news">
<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>
</aside></div> <!-- id="news" -->
</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"><aside>
<div id="upcoming">
<h2>
<a href="{$baseurl}calendar.html">Kalender</a>
</h2>
@ -214,7 +214,7 @@
</xsl:if>
</xsl:for-each>
</ul>
</aside></div>
</div>
</xsl:if>
</xsl:template>

73
xsl/footer.xsl
View File

@ -7,56 +7,53 @@
xmlns:date="http://exslt.org/dates-and-times" exclude-result-prefixes="xsl rss rdf">
<xsl:template name="footer">
<footer>
<!-- ### Footer ### -->
<xsl:comment>
<xsl:text> ### Footer ### </xsl:text>
</xsl:comment>
<div id="footer">
<ul>
<li><a href="{$baseurl}impressum.html">Impressum</a></li>
<li>
<!-- Creative Commons License -->
<footer id="footer">
<!-- ### Footer ### -->
<xsl:comment>
<xsl:text> Creative Commons License </xsl:text>
<xsl:text> ### Footer ### </xsl:text>
</xsl:comment>
<a rel="license" href="http://creativecommons.org/licenses/by-sa/2.0/de/deed.de">
<img alt="Creative Commons License" src="{$baseurl}images/footer/cc-somerights20.png" title="Creative Commons Attribution-ShareAlike 2.0 Germany License" />
</a>
<xsl:comment>
<xsl:text>
&lt;rdf:RDF xmlns="http://web.resource.org/cc/"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"&gt;
&lt;Work rdf:about=""&gt;
<ul>
<li><a href="{$baseurl}impressum.html">Impressum</a></li>
<li>
<!-- Creative Commons License -->
<xsl:comment>
<xsl:text> Creative Commons License </xsl:text>
</xsl:comment>
<a rel="license" href="http://creativecommons.org/licenses/by-sa/2.0/de/deed.de">
<img alt="Creative Commons License" src="{$baseurl}images/footer/cc-somerights20.png" title="Creative Commons Attribution-ShareAlike 2.0 Germany License" />
</a>
<xsl:comment>
<xsl:text>
&lt;rdf:RDF xmlns="http://web.resource.org/cc/"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"&gt;
&lt;Work rdf:about=""&gt;
&lt;dc:type rdf:resource="http://purl.org/dc/dcmitype/Interactive" /&gt;
&lt;license rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/de/" /&gt;
&lt;/Work&gt;
&lt;/Work&gt;
&lt;License rdf:about="http://creativecommons.org/licenses/by-sa/2.0/de/"&gt;
&lt;License rdf:about="http://creativecommons.org/licenses/by-sa/2.0/de/"&gt;
&lt;permits rdf:resource="http://web.resource.org/cc/Reproduction" /&gt;
&lt;permits rdf:resource="http://web.resource.org/cc/Distribution" /&gt;
&lt;requires rdf:resource="http://web.resource.org/cc/Notice" /&gt;
&lt;requires rdf:resource="http://web.resource.org/cc/Attribution" /&gt;
&lt;permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" /&gt;
&lt;requires rdf:resource="http://web.resource.org/cc/ShareAlike" /&gt;
&lt;/License&gt;
&lt;/rdf:RDF&gt;
</xsl:text>
</xsl:comment>
</li>
<li>
<a href="http://validator.w3.org/check?uri=referer">
<img src="{$baseurl}images/footer/valid-xhtml10.png" alt="Valid XHTML 1.0 Strict" />
</a>
</li>
</ul>
&lt;/License&gt;
&lt;/rdf:RDF&gt;
</xsl:text>
</xsl:comment>
</li>
<li>
<a href="http://validator.w3.org/check?uri=referer">
<img src="{$baseurl}images/footer/valid-xhtml10.png" alt="Valid XHTML 1.0 Strict" />
</a>
</li>
</ul>
</div> <!-- id="footer" -->
<small class="hidden">
Cover, Concealment, Camouflage, Denial and Deception
</small>
<small class="hidden">
Cover, Concealment, Camouflage, Denial and Deception
</small>
</footer>
</xsl:template>

74
xsl/xhtml5.xsl
View File

@ -80,30 +80,42 @@
<div id="body">
<!-- ### Navigation ### -->
<xsl:comment>
<xsl:text> ### Navigation ### </xsl:text>
</xsl:comment>
<div id="navigation"><nav>
<!-- ### Navigation ### -->
<xsl:comment>
<xsl:text> ### Navigation ### </xsl:text>
</xsl:comment>
<nav id="navigation">
<xsl:if test="not($issearchpage)">
<!-- ### Search ### -->
<xsl:comment>
<xsl:text> ### Search ### </xsl:text>
</xsl:comment>
<xsl:if test="not($issearchpage)">
<!-- ### Search ### -->
<xsl:comment>
<xsl:text> ### Search ### </xsl:text>
</xsl:comment>
<form action="/cgi-bin/estseek.cgi" method="get">
<p>
<input type="text" name="phrase" size="20" value="c3d2" />
<input type="submit" name="submit" value="Suchen!" />
<a href="{$baseurl}cgi-bin/estseek.cgi"><small>Hilfe</small></a>
</p>
</form>
</xsl:if>
<form action="/cgi-bin/estseek.cgi" method="get">
<p>
<input type="text" name="phrase" size="20" value="c3d2" />
<input type="submit" name="submit" value="Suchen!" />
<a href="{$baseurl}cgi-bin/estseek.cgi"><small>Hilfe</small></a>
</p>
</form>
</xsl:if>
<xsl:call-template name="navitems" />
<xsl:call-template name="navitems" />
</nav></div> <!-- id="navigation" -->
</nav>
<!-- ### News ### -->
<xsl:comment>
<xsl:text> ### News ### </xsl:text>
</xsl:comment>
<aside id="rsidebar">
<xsl:call-template name="calendar-events" />
<xsl:call-template name="chaosupdates" />
</aside>
<!-- ### Content ### -->
<xsl:comment>
@ -112,15 +124,17 @@
<xsl:choose>
<xsl:when test="$issearchpage">
<div id="content" class="search">
<section id="content" class="search">
<h2>Suche</h2>
<xsl:comment>ESTFORM</xsl:comment>
<xsl:comment>ESTRESULT</xsl:comment>
<xsl:comment>ESTINFO</xsl:comment>
</div> <!-- id="search" -->
<xsl:call-template name="footer" />
</section> <!-- class="search" -->
</xsl:when>
<xsl:otherwise> <!-- normale Seite -->
<div id="content">
<section id="content">
<xsl:if test="event">
<xsl:attribute name="class">vevent</xsl:attribute>
</xsl:if>
@ -145,23 +159,13 @@
<xsl:call-template name="include-resources">
<xsl:with-param name="include-hidden">yes</xsl:with-param>
</xsl:call-template>
</div> <!-- id="content" -->
<!-- ### News ### -->
<xsl:comment>
<xsl:text> ### News ### </xsl:text>
</xsl:comment>
<xsl:call-template name="calendar-events" />
<xsl:call-template name="chaosupdates" />
</section> <!-- id="content" -->
<xsl:call-template name="footer" />
</xsl:otherwise>
</xsl:choose>
</div> <!-- id="body" -->
<xsl:call-template name="footer" />
</div> <!-- id="page" -->
</xsl:element> <!-- name="body" -->
</xsl:element> <!-- name="html" -->