FSFE/fsfe-website
25
31
Fork 91
Code Issues 65 Pull Requests 6 Wiki Activity

Bugfixes, and added logo in the expected place.

Browse Source 
svn path=/trunk/; revision=2959
This commit is contained in:
jonas 2003-01-18 09:37:51 +00:00
parent c481be2d94
commit c2402f639a
7 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -15,6 +15,9 @@
# or
# ftp://ftp.cogsci.ed.ac.uk/pub/richard/rxp-1.2.3.tar.gz
#
TMP=/home/fsfe/tmp/
DEST=/home/www/
# branch tag name for the stable version of the site and only its patches
STABLEBRANCH = BS_20010825
@ -170,3 +173,7 @@ syncall:
$(SSH) -l www france.fsfeurope.org 'cd fsfe/server/testbeta ; cvs -z3 -q update -I "*.html" -d -r $(STABLEBRANCH) ; ../../../bin/nightly'
@echo "Updating beta version :"
$(SSH) -l www france.fsfeurope.org 'cd fsfe/server/test/fsfe/server/testbeta ; cvs -z3 -q update -I "*.html" -d -A ; ../../../../../../bin/nightly'
new:
@tools/build.sh

4
background.de.xhtml
View File

@ -2,7 +2,9 @@
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
[<!ENTITY de-articles SYSTEM "de/articles/article-overview.xml">]>
[
<!ENTITY nbsp "&#160;">
<!ENTITY de-articles SYSTEM "de/articles/article-overview.xml">]>
<html lang="de">
<head>
<title>FSF Europe - Hintergrund</title>

18
blue-new.css
View File

@ -74,3 +74,21 @@ a.menu:hover {
color: #00389a;
text-decoration: underline;
}
a.submenu {
color: #ffffff;
text-decoration: none;
font-size: 13px;
font-weight: normal;
margin-left: 20px;
}
a.submenu:visited {
color: #eeeeee;
text-decoration: none;
}
a.submenu:hover {
background-color: #ffffff;
color: #00389a;
text-decoration: underline;
}

11
fsfe-new.xsl
View File

@ -92,12 +92,19 @@
<xsl:apply-templates select="node()"/>
</td>
<td class="menu">
<xsl:for-each select="/buildinfo/menuset/menu">
<xsl:for-each select="/buildinfo/menuset/menu[@parent='']">
<xsl:sort select="@id" />
<xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
<a class="menu" href="{.}">
<xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
<xsl:value-of select="/buildinfo/textset/text[@id=$id]" />
</a> <br />
<xsl:for-each select="/buildinfo/menuset/menu[@parent=$id]">
<xsl:sort select="@id" />
<a class="submenu" href="{.}">
<xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
<xsl:value-of select="/buildinfo/textset/text[@id=$id]" />
</a> <br />
</xsl:for-each>
</xsl:for-each>
</td>
</tr>

BIN
graphics/global/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.3 KiB

16
tools/build.pl
View File

@ -98,7 +98,8 @@ my %bases;
foreach (grep(/\.xhtml$/, @files)) {
my ($lang) = ($_ =~ /\.([a-z][a-z])\.xhtml$/);
unless ($lang) { $lang = "en"; }
$_ =~ s/\.[a-z][a-z]\.xhtml//;
$_ =~ s/\.[a-z][a-z]\.xhtml$//;
$_ =~ s/\.xhtml$//;
$bases{$_}{$lang} = 1;
}
@ -199,7 +200,7 @@ while (my ($file, $langs) = each %bases) {
my $source = $opts{i}."/$file.$lang.xhtml";
unless (-f $source) {
if ($lang eq "en" && -f $opts{i}."/$file.xhtml") {
if (-f $opts{i}."/$file.xhtml") {
$document->setAttribute("language", "en");
$source = $opts{i}."/$file.xhtml";
} elsif (-f $opts{i}."/$file.en.xhtml") {
@ -215,6 +216,7 @@ while (my ($file, $langs) = each %bases) {
}
}
#
# Here begins automated magic for those pages which we need to
# assemble other sets of informations for first (automatically
@ -333,7 +335,6 @@ while (my ($file, $langs) = each %bases) {
# global menu here, then we add any information that is specific to
# the focus.
#
# FIXME: Allow for headings and subitems.
foreach ($root->getElementsByTagName("menuset")) {
$root->removeChild($_);
}
@ -343,20 +344,17 @@ while (my ($file, $langs) = each %bases) {
if (-f $opts{i}."/tools/menu-$_.xml") {
my $menudoc = $parser->parse_file($opts{i}."/tools/menu-$_.xml");
foreach my $n ($menudoc->documentElement->getElementsByTagName("menu")) {
$menu{$n->getAttribute("id")} = $n->textContent;
$menu{$n->getAttribute("id")} = $n;
}
}
}
my $menuroot = $dom->createElement("menuset");
while (my ($id, $href) = each %menu) {
my $m = $dom->createElement("menu");
$m->setAttribute("id", $id);
$m->appendText($href);
while (my ($id, $n) = each %menu) {
my $m = $n->cloneNode(1);
$menuroot->appendChild($m);
}
$root->appendChild($menuroot);
#
# Do the actual transformation.
#

4
tools/menu-global.xml
View File

@ -3,6 +3,10 @@
<menuset>
<menu id="menu/about">/about/about.html</menu>
<menu id="menu/projects">/projects/projects.html</menu>
<menu id="menu/projects/technical" parent="menu/projects">/projects/technical.html</menu>
<menu id="menu/projects/other" parent="menu/projects">/projects/other.html</menu>
<menu id="menu/projects/legal" parent="menu/projects">/projects/legal.html</menu>
<menu id="menu/projects/awareness" parent="menu/projects">/projects/awareness.html</menu>
<menu id="menu/documents">/documents/documents.html</menu>
<menu id="menu/events">/events/events.html</menu>
<menu id="menu/help">/help/help.html</menu>