From 2b9be5e331e4b05c1026c80688176ac15c23800a Mon Sep 17 00:00:00 2001 From: jonas Date: Sat, 1 Feb 2003 09:28:59 +0000 Subject: [PATCH] Sync. Automatically updated pages. svn path=/trunk/; revision=3103 --- blue-new.css | 39 ++++++++++++ education/project.en.xml | 2 +- fsfe-new.xsl | 21 ++++--- gbn/project.en.xml | 2 +- index.cs.xhtml | 3 - index.de.xhtml | 3 - index.es.xhtml | 3 - index.fr.xhtml | 3 - index.it.xhtml | 3 - index.pt.xhtml | 3 - news/2001/news.en.xml | 86 +++++++++++++++++++++++-- news/2002/news.en.xml | 107 ++++++++++++++++++++++++++++++++ projects/legal.en.xhtml | 11 ++++ projects/legal.sources | 8 +++ projects/legal.xsl | 36 +++++++++++ projects/mankind/project.en.xml | 2 +- projects/other.en.xhtml | 11 ++++ projects/other.sources | 8 +++ projects/other.xsl | 36 +++++++++++ projects/projects.en.xhtml | 4 ++ projects/projects.sources | 6 ++ projects/projects.xsl | 18 +++--- projects/technical.en.xhtml | 11 ++++ projects/technical.sources | 8 +++ projects/technical.xsl | 36 +++++++++++ tools/build.pl | 32 +++++++--- tools/menu-global.xml | 8 ++- tools/texts-en.xml | 4 +- 28 files changed, 462 insertions(+), 52 deletions(-) create mode 100644 projects/legal.en.xhtml create mode 100644 projects/legal.sources create mode 100644 projects/legal.xsl create mode 100644 projects/other.en.xhtml create mode 100644 projects/other.sources create mode 100644 projects/other.xsl create mode 100644 projects/technical.en.xhtml create mode 100644 projects/technical.sources create mode 100644 projects/technical.xsl diff --git a/blue-new.css b/blue-new.css index 804839094a..63a17900d0 100644 --- a/blue-new.css +++ b/blue-new.css @@ -38,11 +38,44 @@ TD.line { border-width: thin; } +TD.newstitle { + border-bottom: solid #00389a; + border-left: solid #00389a; + border-width: thin; + text-align: left; + font-size: 13px; + font-weight: bold; + margin: 0px; + padding: 4px; + } +TD.newsdate { + border-bottom: solid #00389a; + border-width: thin; + text-align: right; + font-size: 13px; + font-weight: bold; + margin: 0px; + padding: 4px; + } + +TD.newsbody { + font-size: 13px; + } +TABLE.news { + border-spacing: 0px; + padding: 4px; + margin: 0px; + } + TD.focus { background: #00389a; width: 150px; } +TD.projects { + vertical-align: top; + } + TD.menu { padding: 10px; background: #00389a; @@ -50,6 +83,12 @@ TD.menu { vertical-align: top; } +TD.body { + padding: 10px; + vertical-align: top; + width: 99%; + } + TH.projects { width: 20%; } diff --git a/education/project.en.xml b/education/project.en.xml index 06e6b28c6e..2d908c8581 100644 --- a/education/project.en.xml +++ b/education/project.en.xml @@ -1,7 +1,7 @@ - + Education diff --git a/fsfe-new.xsl b/fsfe-new.xsl index 6be45f6555..e908aa06b7 100644 --- a/fsfe-new.xsl +++ b/fsfe-new.xsl @@ -32,7 +32,7 @@ @@ -84,14 +84,20 @@ +
+ + +
+ + - - @@ -126,8 +132,7 @@ - - + diff --git a/gbn/project.en.xml b/gbn/project.en.xml index 1d0b963c94..1a677ac4d6 100644 --- a/gbn/project.en.xml +++ b/gbn/project.en.xml @@ -1,7 +1,7 @@ - + GNU Business Network diff --git a/index.cs.xhtml b/index.cs.xhtml index d1a38973ad..5bec8f2cbd 100644 --- a/index.cs.xhtml +++ b/index.cs.xhtml @@ -1,7 +1,4 @@ - Evropská Nadace pro svobodný software diff --git a/index.de.xhtml b/index.de.xhtml index 2b41d1ca16..231968e075 100644 --- a/index.de.xhtml +++ b/index.de.xhtml @@ -1,7 +1,4 @@ - Free Software Foundation Europe diff --git a/index.es.xhtml b/index.es.xhtml index 03b39b3022..ff68db26ab 100644 --- a/index.es.xhtml +++ b/index.es.xhtml @@ -1,7 +1,4 @@ - Free Software Foundation Europa diff --git a/index.fr.xhtml b/index.fr.xhtml index 0dbd31460d..f65206229c 100644 --- a/index.fr.xhtml +++ b/index.fr.xhtml @@ -1,7 +1,4 @@ - diff --git a/index.it.xhtml b/index.it.xhtml index e0d5cc1de9..16d8a670f0 100644 --- a/index.it.xhtml +++ b/index.it.xhtml @@ -1,7 +1,4 @@ - Free Software Foundation Europa diff --git a/index.pt.xhtml b/index.pt.xhtml index bbf5fb705f..59385d69d3 100644 --- a/index.pt.xhtml +++ b/index.pt.xhtml @@ -1,7 +1,4 @@ - Free Software Foundation Europa diff --git a/news/2001/news.en.xml b/news/2001/news.en.xml index b19b357ccb..2a88fa53c7 100644 --- a/news/2001/news.en.xml +++ b/news/2001/news.en.xml @@ -1,10 +1,62 @@ + + + FSF Europe receives charitable status in Germany + FSF Europe e.V. (the central association) receives + confirmation of its charitable status in Germany by the authorities. + + + + + Georg Greve talks about "Copyright in the internet age" + Slides (in German) available at + http://gnuhh.org/work/presentations/IFA-2001/. + + + + + Richard Stallman inaugurates Free Software Foundation-India + http://mailman.fsfeurope.org/pipermail/press-release/2001q3/000017.html + + + + FSF Europe in German magazine + The FSF Europe is mentioned in the German magazine + FOCUS issue 29/2001, page 106 in a + story about the GNU/LinuxTag. + + + + + FSF Europe at LinuxTag and Libre Software Meeting + The FSF Europe will be present at the LinuxTag and + Libre Software Meeting for the first time. Please see the + press release for additional information. + + http://mailman.fsfeurope.org/pipermail/press-release/2001q2/000013.html + + + + FSF Europe general assembly is over + The FSF Europe general assembly is over. See the press release + and photos + by Olivier Berger and photos by Peter Gerwinski. + + http://mailman.fsfeurope.org/pipermail/press-release/2001q2/000006.html + + Free Software Foundation Europe finishes founding process http://mailman.fsfeurope.org/pipermail/press-release/2001q2/000003.html + + + First general assembly of the Free Software Foundation Europe + http://mailman.fsfeurope.org/pipermail/press-release/2001q2/000002.html + + "Freedom, Quality and Fraternity" OLinux interview iwth Georg C. F. Greve "[...] Keep on spreading the word. What we do today will @@ -15,9 +67,35 @@ /news/article2001-12-17-01.html - - First general assembly of the Free Software Foundation Europe - http://mailman.fsfeurope.org/pipermail/press-release/2001q2/000002.html - + + + FSF Europe appoints new Vice President + + Jonas Oberg was appointed new Vice President of the FSF + Europe: "The future of Free Software depends a lot on + what we do today. I plan to work to preserve the ability to + use and develop Free Software in all of its forms, for + example by helping to extend the efforts already underway + against software patents and helping the media, government + and companies understand the underlying issues of Free + Software." + + http://mailman.fsfeurope.org/pipermail/announce/2001-November/000030.html + + + + We Speak about Free Software + + Launch of the "We speak about Free + Software" campaign: There are compelling reasons to + think and speak about Free Software and its philosophy. It + is rather common knowledge this applies to society as a + whole, but it has not yet been widely understood that it + benefits companies, as well. Therefore the FSF Europe launches + this campaign on behalf and with support of several Free + Software companies. + + /documents/whyfs.en.html + diff --git a/news/2002/news.en.xml b/news/2002/news.en.xml index 6a0d5411aa..c64bc30868 100644 --- a/news/2002/news.en.xml +++ b/news/2002/news.en.xml @@ -7,5 +7,112 @@ http://mailman.fsfeurope.org/pipermail/press-release/2002q4/000047.html + + + FFII Associated with FSF Europe + + The Foundation for a Free Information Infrastructure (FFII) is now an + official associate organisation of the Free Software Foundation Europe + (FSFE). The FFII is the first associate organisation of the FSF Europe + based in Germany. + + http://mailman.fsfeurope.org/pipermail/press-release/2002q2/000044.html + + + + Two Expressions of Interest (EoI) from FSF Europe + + In response to a + call from the European Commission, the FSF Europe submitted an expression + of interest for each of the instruments of the sixth framework + programme (FP6). + + /documents/fp6/ + + + + FSF Europe completes successful first year + + On May 26th 2002, the Free Software Foundation Europe (FSF +Europe) finishes its second general assembly, completing the first +year of activities. Members from Sweden, Italy, Germany and France +drew a summary of last years activities, analyzed the current +situation of Free Software and exchanged plans and visions for the +upcoming year. + + http://mailman.fsfeurope.org/pipermail/press-release/2002q2/000042.html + + + + Recommendation by the FSF Europe and supporting parties + + The FSF Europe and supporting parties has submitted a recommendation for + the 6th European Community Framework Programme: + "Free Software is a concept that has + fundamentally changed the way some parts of the IT + sector are working towards a more stable, lasting and + sustainable approach with higher dynamics and increased + efficiency. It is obvious that the first region to adopt + and support this principle on a larger scale can profit + enormously and get a head-start in the information age." + + /documents/fp6/recommendation.html + + + + Invitation to European Copyright Directive Alert miniconference + + On Monday 29 April 2002, at 6pm in London, we invite you to + join the European Copyright Directive Alert + miniconference. Organized by the Campaign for Digital Rights + it will explain the dangers of the EUCD. Unless it is stopped before + December 2002, it will become legal in each European + country. + + http://www.lonix.org.uk/tnet-cgi/Lonix?CODE=userMeetings + + + + FSF Europe present at first LiLit meeting + On Friday 26 April 2002, the Free Software Foundation + Europe will be present at the first LiLiT meeting in + Ličge, Belgium. During this evening (night ?-) session, + we will focus on the best means to explain the ethical + value of Free Software. A global view of the on going + actions will hopefully allow everyone to figure out how + to promote and defend the Free Software ideals. + + /events/events.html + + + + FSF Europe at the Free and Open Source Software Developers Meeting + + Between the 16th and 17th of February, 2002, the Free + and Open Source Software Developers Meeting will take + place in Brussels, Belgium. Among the visitors will be + Richard M. Stallman, president of the Free Software + Foundation and Georg C. F. Greve, president of the Free + Software Foundation Europe. The FSF Europe welcomes all + members of the press who wish to meet the members and + volunteers of the foundation. + + /news/article2002-01-31-01.en.html + + + + ANSOL becomes associated organization of the FSF Europe + + "This collaboration is a very important step for the Portuguese and + European free software community. Problems faced by the free software + community in Portugal are similar to those faced in other European + countries; by joining forces with FSFE we can solve this problems more + efficiently" said Jaime Villate, founding member of ANSOL. + + /news/article2002-01-18-01.en.html + + diff --git a/projects/legal.en.xhtml b/projects/legal.en.xhtml new file mode 100644 index 0000000000..9c9409ca37 --- /dev/null +++ b/projects/legal.en.xhtml @@ -0,0 +1,11 @@ + + + + + Free Software Foundation Europe + + + + + + diff --git a/projects/legal.sources b/projects/legal.sources new file mode 100644 index 0000000000..99f0bacbbe --- /dev/null +++ b/projects/legal.sources @@ -0,0 +1,8 @@ +projects/*/project:global +coposys/project:global +de/projects/*/project:de +de/buergerturm/project:de +education/project:global +gbn/project:global +law/*/project:global +swpat/project:global diff --git a/projects/legal.xsl b/projects/legal.xsl new file mode 100644 index 0000000000..c5dfddcdb6 --- /dev/null +++ b/projects/legal.xsl @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + +


+

+ + + + + + + + + + + + + + diff --git a/projects/mankind/project.en.xml b/projects/mankind/project.en.xml index 874efcade6..c7e81ffdce 100644 --- a/projects/mankind/project.en.xml +++ b/projects/mankind/project.en.xml @@ -1,7 +1,7 @@ - + Classification of Free Software as a World Cultural Heritage diff --git a/projects/other.en.xhtml b/projects/other.en.xhtml new file mode 100644 index 0000000000..9c9409ca37 --- /dev/null +++ b/projects/other.en.xhtml @@ -0,0 +1,11 @@ + + + + + Free Software Foundation Europe + + + + + + diff --git a/projects/other.sources b/projects/other.sources new file mode 100644 index 0000000000..99f0bacbbe --- /dev/null +++ b/projects/other.sources @@ -0,0 +1,8 @@ +projects/*/project:global +coposys/project:global +de/projects/*/project:de +de/buergerturm/project:de +education/project:global +gbn/project:global +law/*/project:global +swpat/project:global diff --git a/projects/other.xsl b/projects/other.xsl new file mode 100644 index 0000000000..153e4189f0 --- /dev/null +++ b/projects/other.xsl @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + +


+

+ + + + + + + + + + + + + + diff --git a/projects/projects.en.xhtml b/projects/projects.en.xhtml index 9c9409ca37..814d96b2bf 100644 --- a/projects/projects.en.xhtml +++ b/projects/projects.en.xhtml @@ -7,5 +7,9 @@ + Technical + Legal + Community + Other diff --git a/projects/projects.sources b/projects/projects.sources index 6325e245ca..99f0bacbbe 100644 --- a/projects/projects.sources +++ b/projects/projects.sources @@ -1,2 +1,8 @@ projects/*/project:global +coposys/project:global de/projects/*/project:de +de/buergerturm/project:de +education/project:global +gbn/project:global +law/*/project:global +swpat/project:global diff --git a/projects/projects.xsl b/projects/projects.xsl index 33093ed777..a152e4d660 100644 --- a/projects/projects.xsl +++ b/projects/projects.xsl @@ -19,31 +19,31 @@
- + @@ -53,7 +53,7 @@ - +
+ + @@ -111,7 +117,7 @@
- +
- - - - + + + + - - - -
TechnicalLegalSociologicalOther
+


+


- + +


+


diff --git a/projects/technical.en.xhtml b/projects/technical.en.xhtml new file mode 100644 index 0000000000..9c9409ca37 --- /dev/null +++ b/projects/technical.en.xhtml @@ -0,0 +1,11 @@ + + + + + Free Software Foundation Europe + + + + + + diff --git a/projects/technical.sources b/projects/technical.sources new file mode 100644 index 0000000000..99f0bacbbe --- /dev/null +++ b/projects/technical.sources @@ -0,0 +1,8 @@ +projects/*/project:global +coposys/project:global +de/projects/*/project:de +de/buergerturm/project:de +education/project:global +gbn/project:global +law/*/project:global +swpat/project:global diff --git a/projects/technical.xsl b/projects/technical.xsl new file mode 100644 index 0000000000..555b400721 --- /dev/null +++ b/projects/technical.xsl @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + +


+

+ + + + + + + + + + + + + + diff --git a/tools/build.pl b/tools/build.pl index 77fd26ef97..3f2de74ec5 100644 --- a/tools/build.pl +++ b/tools/build.pl @@ -221,8 +221,10 @@ while (my ($file, $langs) = each %bases) { } } - next if ( (stat("$opts{o}/$dir/$file.$lang.html"))[9] > - (stat($source))[9] && $opts{u} && ! -f "$opts{i}/$file.xsl" ); + if ( (stat("$opts{o}/$dir/$file.$lang.html"))[9] > + (stat($source))[9] && $opts{u} && ! -f "$opts{i}/$file.xsl" ) { + next; + } # # Here begins automated magic for those pages which we need to @@ -374,16 +376,16 @@ while (my ($file, $langs) = each %bases) { # so that they point to the correct language. # foreach ($results->documentElement->getElementsByTagName("a")) { - if ($_->getAttribute("href") !~ /^http/) { - my $href = $_->getAttribute("href"); + my $href = $_->getAttribute("href"); + if ($href !~ /^http/) { if ($href !~ /\.html$/) { if (-d $opts{i}."/$href") { $href =~ s/\/?$/\/index.$lang.html/; - } else { + } elsif ($href =~ /\/\w+$/) { $href .= ".$lang.html"; } } else { - $href =~ s/([^\.][a-z][a-z])\.html/$1.$lang.html/; + $href =~ s/([^\.][a-z0-9-][a-z0-9-])\.html/$1.$lang.html/; } $_->setAttribute("href", $href); } @@ -397,13 +399,29 @@ while (my ($file, $langs) = each %bases) { print STDERR "\n" unless $opts{q}; } +print STDERR "Fixing index links\n" unless $opts{q}; + +while (my ($path, undef) = each %countries) { + my @dirs = File::Find::Rule->directory() + ->in($opts{o}."/$path"); + foreach (@dirs) { + my $base = basename($_); + while (my ($lang, undef) = each %languages) { + if (-f "$_/$base.$lang.html" && + ! -f "$_/index.$lang.html") { + link("$_/$base.$lang.html", "$_/index.$lang.html"); + } + } + } +} + # # For all files that are not XHTML source files, we copy them verbatim to # the final location, for each focus. These should be links instead to # prevent us from vasting disk space. # print STDERR "Copying misc files\n" unless $opts{q}; -foreach (grep(!/\.xhtml$/, @files)) { +foreach (grep { !/\.xsl$/ } grep(!/\.xhtml$/, @files)) { while (my ($dir, undef) = each %countries) { link("$opts{i}/$_", "$opts{o}/$dir/$_") if -f "$opts{i}/$_"; } diff --git a/tools/menu-global.xml b/tools/menu-global.xml index 81c530fd3f..0cc5f6706e 100644 --- a/tools/menu-global.xml +++ b/tools/menu-global.xml @@ -6,12 +6,16 @@ /projects/technical.html /projects/other.html /projects/legal.html - /projects/awareness.html + /projects/community.html /documents/documents.html /events/events.html /help/help.html - /donate/donate.html + /help/donate.html /order/order.html /contact/contact.html + /help/thankgnus.html + /press/ + /news/news.html + /associates/associates.html diff --git a/tools/texts-en.xml b/tools/texts-en.xml index 8dfa803112..a3e396ec1f 100644 --- a/tools/texts-en.xml +++ b/tools/texts-en.xml @@ -29,7 +29,7 @@ Technical Other Legal - Awareness + Community Documents Events Help @@ -41,4 +41,6 @@ ThankGNUs News Press Information + Thank GNUs + Press Information