FSFE/fsfe-website
32
34 Fork 99
Code Issues 65 Pull Requests 20 Wiki Activity

Attempting to remove table structure from front page.

Browse Source 
svn path=/trunk/; revision=12033
This commit is contained in:
att committed 2009-01-25 12:59:47 +00:00
1 parent 6134902d4f
commit 3135041051
2 files changed
+74 -73
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

fsfeurope.css
+31 -1
View File
@@ -263,6 +263,36 @@ pre.file {
/* Styles used only on some pages */
/* ------------------------------------------------------------------------- */
/* News and events on front page */
#news,
#events {
width: 49%;
}
#news h2,
#events h2 {
text-align: center;
}
#news .date,
#events .date {
color: #888;
float: right;
margin-top: -2.5em;
}
#news {
padding-right: 2%;
float: left;
}
#events {
float: right;
}
/* News and event items (old, based on table) */
table.news {
@@ -369,7 +399,7 @@ ul.spaced li, ol.spaced li { /* Spaced listings, use this instead of <br /> */
margin-right: 2em;
}
.aboutfsfe{ /* For press release section "About the FSFE" */
.aboutfsfe { /* For press release section "About the FSFE" */
font-style: italic;
margin-left: 2em;
}
index.xsl
+43 -72
View File
@@ -18,20 +18,17 @@
<!-- Show a single news item -->
<xsl:template name="news">
<tr>
<td class="newstitle"><xsl:value-of select="title" /></td>
<td class="newsdate"><xsl:value-of select="@date" /></td>
</tr>
<tr>
<td colspan="2" class="newsbody">
<div class="entry">
<h3><xsl:value-of select="title" /></h3>
<div class="date"><xsl:value-of select="@date" /></div>
<div class="text">
<xsl:apply-templates select="body/node()" />
<xsl:variable name="link"><xsl:value-of select="link" /></xsl:variable>
<xsl:if test="$link!=''">
[<a href="{link}"><xsl:value-of select="/html/text[@id='more']" /></a>]
<a class="read_more" href="{link}"><xsl:value-of select="/html/text[@id='more']" /></a>
</xsl:if>
</td>
</tr>
<tr><td colspan="2"><br /></td></tr>
</div>
</div> <!-- /entry -->
</xsl:template>
<!-- Show a single event -->
@@ -39,82 +36,56 @@
<xsl:variable name="start"><xsl:value-of select="@start" /></xsl:variable>
<xsl:variable name="end"><xsl:value-of select="@end" /></xsl:variable>
<xsl:variable name="link"><xsl:value-of select="link" /></xsl:variable>
<tr>
<td class="newstitle"><xsl:value-of select="title" /></td>
<td class="newsdate">
<div class="event">
<h3><xsl:value-of select="title" /></h3>
<div class="date">
<xsl:value-of select="@start" />
<xsl:if test="$start != $end">
<br />
<xsl:value-of select="@end" />
</xsl:if>
</td>
</tr>
<tr>
<td colspan="2" class="newsbody">
</div>
<div class="text">
<xsl:apply-templates select="body/node()" />
<xsl:if test="$link!=''">
[<a href="{link}"><xsl:value-of select="/html/text[@id='more']" /></a>]
<a class="read_more" href="{link}"><xsl:value-of select="/html/text[@id='more']" /></a>
</xsl:if>
</td>
</tr>
<tr><td colspan="2"><br /></td></tr>
</div>
</div> <!-- /event -->
</xsl:template>
<!-- In /html/body node, append dynamic content -->
<xsl:template match="/html/body">
<body>
<xsl:apply-templates />
<table style="clear:right">
<tr>
<td valign="top" width="47%">
<center>
<h2><xsl:value-of select="/html/text[@id='news']" /></h2>
</center>
<table class="news">
<xsl:for-each select="/html/set/news
[translate (@date, '-', '') &lt;= translate ($today, '-', '')]">
<xsl:sort select="@date" order="descending" />
<xsl:if test="position() &lt; 6">
<xsl:call-template name="news" />
</xsl:if>
</xsl:for-each>
</table>
<center>
<a href="news/news.html">
<xsl:value-of select="/html/text[@id='morenews']" />
</a>
<br />
<br />
<a href="news/news.rss">[RSS]</a>
</center>
</td>
<td valign="top" width="4%">
&#160;
</td>
<td valign="top" width="47%">
<center>
<h2><xsl:value-of select="/html/text[@id='events']" /></h2>
</center>
<table class="news">
<xsl:for-each select="/html/set/event
[translate (@end, '-', '') &gt;= translate ($today, '-', '')]">
<xsl:sort select="@start" />
<xsl:if test="position() &lt; 6">
<xsl:call-template name="event" />
</xsl:if>
</xsl:for-each>
</table>
<center>
<a href="events/events.html">
<xsl:value-of select="/html/text[@id='moreevents']" />
</a>
<br />
<br />
<a href="events/events.rss">[RSS]</a>
</center>
</td>
</tr>
</table>
<div id="news">
<h2><xsl:value-of select="/html/text[@id='news']" /></h2>
<xsl:for-each select="/html/set/news
[translate (@date, '-', '') &lt;= translate ($today, '-', '')]">
<xsl:sort select="@date" order="descending" />
<xsl:if test="position() &lt; 6">
<xsl:call-template name="news" />
</xsl:if>
</xsl:for-each>
<ul class="tools">
<li><a class="more_news" href="news/news.html"><xsl:value-of select="/html/text[@id='morenews']" /></a></li>
<li><a class="rss" href="news/news.rss">RSS</a></li>
</ul>
</div> <!-- /#news -->
<div id="events">
<h2><xsl:value-of select="/html/text[@id='events']" /></h2>
<xsl:for-each select="/html/set/event
[translate (@end, '-', '') &gt;= translate ($today, '-', '')]">
<xsl:sort select="@start" />
<xsl:if test="position() &lt; 6">
<xsl:call-template name="event" />
</xsl:if>
</xsl:for-each>
<ul class="tools">
<li><a class="more_events" href="events/events.html"><xsl:value-of select="/html/text[@id='moreevents']" /></a></li>
<li><a class="rss" href="events/events.rss">RSS</a></li>
</ul>
</div> <!-- /#events -->
</body>
</xsl:template>