Reverting changes from r19403 on; something makes the build stall

svn path=/trunk/; revision=19442
This commit is contained in:
cri 2011-01-24 11:28:13 +00:00
parent 0dc39e9379
commit e40e37bfaa
5 changed files with 618 additions and 554 deletions

652
fsfe.xsl

File diff suppressed because it is too large Load Diff

View File

@ -4,31 +4,44 @@
<head>
<title>FSFE - Free Software Foundation Europe</title>
</head>
<body id='frontpage'>
<body>
<div id="campaigns-boxes">
<div id="campaign-box-1">
<h3><a href="/campaigns/pdfreaders/">We're Ending Government Advertising of Non-Free PDF Readers</a></h3>
<a href="/campaigns/pdfreaders/">
<h3>We're Ending Government Advertising of Non-Free PDF Readers</h3>
</a>
</div>
<div id="campaign-box-2">
<p><a href="/donate/donate.html" class="donate-box"><donate-label /></a></p>
<p><a href="http://fellowship.fsfe.org/join" class="fellowship-box"><join-label /></a></p>
<a href="donate/donate.html" class="donate-box">
<p><donate-label /></p>
</a>
<a href="http://fellowship.fsfe.org/join" class="fellowship-box">
<p><join-label /></p>
</a>
</div>
<div id="campaign-box-3">
</div>
</div>
<div id="feeds">
<!-- News feeds -->
<div id="news" class="section">
<h2>
<a class="rss-feed" href="/news/news.rss"><img src="/graphics/rss.png" alt="News RSS" title="news RSS feed" /></a>
<a class="ical" href="http://identi.ca/fsfe"><img src="/graphics/identica.png" alt="identica" title="follow FSFE on identi.ca"/></a>
<a href="/news/news.html"><news-label /></a>
</h2>
<all-news />
</div>
</div><!--end #news-->
<!-- Newsletters -->
<div id="newsletter" class="section">
<h2><a href="/news/newsletter.html"><newsletter-label /></a></h2>
@ -39,7 +52,6 @@
<form id="formnl" name="formnl" method="post" action="http://mail.fsfeurope.org/mailman/subscribe/newsletter-en">
<p>
<!-- TODO: This JS will not work across all browsers -->
<select id="language" name="language" onchange="var form = document.getElementById('formnl'); var sel=document.getElementById('language'); form.action='http://mail.fsfeurope.org/mailman/subscribe/newsletter-'+sel.options[sel.options.selectedIndex].value">
<option value="en" selected="selected">English</option>
<option value="el">Ελληνικά</option>
@ -54,31 +66,38 @@
</select>
<input id="email" name="email" type="email" placeholder="email address" />
<subscribe-button />
</p>
</form>
<ul>
<all-newsletters />
<li><a href="news/newsletter.html"><more-label />...</a></li>
</ul>
<p>
<a href="/news/newsletter.html"><more-label /></a>
</p>
</div><!-- /.entry -->
</div> <!-- /#newsletter -->
<!-- Events list -->
<div id="events" class="section">
<h2>
<a class="rss-feed" href="/events/events.rss"><img src="/graphics/rss.png" alt="Events RSS" title="events RSS feed" /></a>
<a class="ical" href="webcal://fsfe.org/events/events.ics"><img src="/graphics/ical.png" alt="iCal" title="FSFE events as iCal feed" /></a>
<a href="/events/events.html"><events-label /></a>
</h2>
<all-events />
</div>
</div> <!-- /#feeds-->
</div><!--end #events-->
</div><!--end #feeds-->
</body>
<timestamp>$Date$ $Author$</timestamp>

View File

@ -20,90 +20,96 @@
<xsl:apply-templates select="node()"/>
</xsl:template>
<!-- Display dynamic list of news items -->
<!--display dynamic list of news items-->
<xsl:template match="all-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag">front-page</xsl:with-param>
<xsl:with-param name="nb-items" select="5" />
</xsl:call-template>
</xsl:template>
<!-- Display dynamic list of newsletters items -->
<!--display dynamic list of newsletters items-->
<xsl:template match="all-newsletters">
<xsl:call-template name="fetch-newsletters">
<xsl:with-param name="nb-items" select="2" />
</xsl:call-template>
</xsl:template>
<!-- Display dynamic list of event items -->
<!--display dynamic list of event items-->
<xsl:template match="all-events">
<!-- Current events -->
<xsl:call-template name="fetch-events">
<xsl:with-param name="wanted-time" select="'present'" />
<xsl:with-param name="tag">front-page</xsl:with-param>
<xsl:with-param name="wanted-time" select="'present'" />
<xsl:with-param name="tag">front-page</xsl:with-param>
</xsl:call-template>
<!-- Future events -->
<xsl:call-template name="fetch-events">
<xsl:with-param name="wanted-time" select="'future'" />
<xsl:with-param name="tag">front-page</xsl:with-param>
<xsl:with-param name="display-details" select="'yes'" />
<xsl:with-param name="nb-items" select="3" />
<xsl:with-param name="wanted-time" select="'future'" />
<xsl:with-param name="tag">front-page</xsl:with-param>
<xsl:with-param name="display-details" select="'yes'" />
<xsl:with-param name="nb-items" select="3" />
</xsl:call-template>
</xsl:template>
<!-- Translated word "newsletter" -->
<!--display labels-->
<!--translated word "newsletter"-->
<xsl:template match="newsletter-label">
<xsl:call-template name="gettext">
<xsl:with-param name="id" select="'newsletter'" />
</xsl:call-template>
</xsl:template>
<!-- Translated sentence "receive-newsletter" -->
<!--translated sentence "receive-newsletter"-->
<xsl:template match="receive-newsletter">
<xsl:call-template name="gettext">
<xsl:with-param name="id" select="'receive-newsletter'" />
</xsl:call-template>
</xsl:template>
<!-- Translated word "news" -->
<!--translated word "news"-->
<xsl:template match="news-label">
<xsl:call-template name="gettext">
<xsl:with-param name="id" select="'news'" />
</xsl:call-template>
</xsl:template>
<!-- Translated word "events" -->
<!--translated word "events"-->
<xsl:template match="events-label">
<xsl:call-template name="gettext">
<xsl:with-param name="id" select="'events'" />
</xsl:call-template>
</xsl:template>
<!-- Translated word "more" -->
<!--translated word "more"-->
<xsl:template match="more-label">
<xsl:call-template name="gettext">
<xsl:with-param name="id" select="'more'" />
</xsl:call-template>
</xsl:template>
<!-- Translated word "donate" -->
<!--translated word "donate"-->
<xsl:template match="donate-label">
<xsl:call-template name="gettext">
<xsl:with-param name="id" select="'donate'" />
</xsl:call-template>
</xsl:template>
<!-- ranslated word "join" -->
<!--translated word "join"-->
<xsl:template match="join-label">
<xsl:call-template name="gettext">
<xsl:with-param name="id" select="'join'" />
</xsl:call-template>
</xsl:template>
<!-- Generate subscribe button in correct language -->
<!--generate subscribe button in correct language-->
<xsl:template match="subscribe-button">
<xsl:element name="input">
<xsl:attribute name="id">submit</xsl:attribute>

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,6 @@
/*
Styling for input fields and input-related stuff.
*/
* Styling for input fields and input-related stuff.
*/
input[type=input],
input[type=text],
@ -15,7 +13,19 @@ textarea {
text-decoration: none;
font-family: "Lucida Grande", "Helvetica", "Arial", sans-serif;
font-size: 9pt;
padding: 3px 5px;
/*
background-image: url("/graphics/input-bg.png");
background-repeat: repeat-x;
background-position: 0 0;
border-top: 1px solid rgb(132,132,132);
border-left: 1px solid rgb(193,193,193);
border-bottom: 1px solid rgb(225,225,225);
border-right: 1px solid rgb(193,193,193);
border-radius: 11px;
-moz-border-radius: 11px;
-webkit-border-radius: 11px;
*/
padding: 5px 8px;
margin: 5px 0 0 0;
}
@ -24,6 +34,23 @@ input[type="image"] {
position: absolute;
}
/*
input[type=submit],
button,
.button {
background: white url("../images/input/input-bg.png") repeat-x bottom left;
border-radius: 6px;
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
cursor: pointer;
/*text-shadow: rgb(120,120,120) .5px .5px 3px;*/
/*
* Opera and WebKit listens to border-radius, while Firefox requires the
* prefix.
*
}
*/
input[_placeholder_on] {
color: rgb(120,120,120);
}
@ -69,6 +96,30 @@ input[_placeholder_on] {
border-right: 1px solid rgb(200,200,200);
}
/*
input.left,
button.left,
.button.left {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-right: 0;
}
input.right,
button.right,
.button.right {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
input.middle,
button.middle,
.button.middle {
border-radius: 0;
border-right: 0;
}
*/
input[type=submit]:hover,
input[type=submit]:focus,
button:hover,