From 97c9d89822b9310666b6764fc32cf9844898daca Mon Sep 17 00:00:00 2001 From: villate Date: Mon, 23 Apr 2001 20:01:35 +0000 Subject: [PATCH] Update to xhtml+xslt, and some reorganization of the menus. svn path=/trunk/; revision=202 --- Makefile | 57 +++- boilerplate.de.xhtml | 45 +++ boilerplate.en.xhtml | 45 +++ boilerplate.fr.xhtml | 45 +++ fsfe.xsl | 767 +++---------------------------------------- navigation.de.xsl | 134 ++++++++ navigation.en.xsl | 134 ++++++++ navigation.fr.xsl | 135 ++++++++ 8 files changed, 623 insertions(+), 739 deletions(-) create mode 100644 boilerplate.de.xhtml create mode 100644 boilerplate.en.xhtml create mode 100644 boilerplate.fr.xhtml create mode 100644 navigation.de.xsl create mode 100644 navigation.en.xsl create mode 100644 navigation.fr.xsl diff --git a/Makefile b/Makefile index ec5f51e363..f6192cac7c 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,51 @@ -pags = index.html mailinglists.html background.html -pags.de = index.de.html -pags.fr = index.fr.html +# +# XML validator +# ------------- +# apt-get install rxp +# or +# ftp://ftp.cogsci.ed.ac.uk/pub/richard/rxp-1.2.3.tar.gz +# +# XSLT processor +# -------------- +# +# sablotron (sabcmd) +# apt-get install sablotron +# +# libxslt + libxml2 (xsltproc) +# http://www.xmlsoft.org/ +# +XSLTPROC = sabcmd -all: $(pags) $(pags.de) $(pags.fr) +FSFFRANCE = http://france.fsfeurope.org +FSFEUROPE = . # http://www.fsfeurope.org +FSF = http://www.fsf.org +GNU = http://www.gnu.org -$(pags): %.html: %.xml menu.xml fsfe.xsl - sabcmd fsfe.xsl $< > $@ +XSLTOPTS = \ + '$$fsffrance=$(FSFFRANCE)' \ + '$$fsf=$(FSF)' \ + '$$gnu=$(GNU)' -$(pags.de): %.html: %.xml menu.de.xml fsfe.de.xsl - sabcmd fsfe.de.xsl $< > $@ +all:: process -$(pags.fr): %.html: %.xml menu.fr.xml fsfe.fr.xsl - sabcmd fsfe.fr.xsl $< > $@ +# process xhtml files in all subdirectories, except fr/ +process: + @find * -path 'fr' -prune -o -name '*.xhtml' -print | while read path ; \ + do \ + base=`expr $$path : '\(.*\).xhtml'` ; \ + filebase=`basename $$base` ; \ + dir=`dirname $$path` ; \ + root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \ + $(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase | \ + perl -MFile::Copy -p -e '$$| = 1; copy("'$$dir'/$$1", \*STDOUT) if(/\#include virtual=\"(.*?)\"/); s/\$$//g if(/\$$''Date:/);' > $$base.html ; \ + done -clean: - rm $(pags) $(pags.de) $(pags.fr) +# validate xhtml files in all subdirectories, except fr/ +validate: + find . -path './fr' -prune -o -name '*.xhtml' -print | while read file ; \ + do \ + echo $$file ; \ + rxp -Vs $$file ; \ + done +.PHONY: process recurse diff --git a/boilerplate.de.xhtml b/boilerplate.de.xhtml new file mode 100644 index 0000000000..62f041f838 --- /dev/null +++ b/boilerplate.de.xhtml @@ -0,0 +1,45 @@ + + + + + FSF Europe - Boilerplate + + + +
+
+ [ + + Deutsch | + English | + Français + ] +
+ + + +

This rocks

+ + + +
+ + Last update: + + $Date: $ $Author: $ + + + + + + + + + + diff --git a/boilerplate.en.xhtml b/boilerplate.en.xhtml new file mode 100644 index 0000000000..b0bf31bbcd --- /dev/null +++ b/boilerplate.en.xhtml @@ -0,0 +1,45 @@ + + + + + FSF Europe - Boilerplate + + + +
+
+ [ + + Deutsch | + English | + Français + ] +
+ + + +

This rocks

+ + + +
+ + Last update: + + $Date$ $Author$ + + + + + + + + + + diff --git a/boilerplate.fr.xhtml b/boilerplate.fr.xhtml new file mode 100644 index 0000000000..455a6c088a --- /dev/null +++ b/boilerplate.fr.xhtml @@ -0,0 +1,45 @@ + + + + + FSF Europe - Boilerplate + + + +
+
+ [ + + Deutsch | + English | + Français + ] +
+ + + +

This rocks

+ + + +
+ + Mis à jour: + + $Date: $ $Author: $ + + + + + + + + + + diff --git a/fsfe.xsl b/fsfe.xsl index 721753d428..2ab84635e1 100644 --- a/fsfe.xsl +++ b/fsfe.xsl @@ -1,743 +1,56 @@ - - -]> + +]> + - + xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - - - - - - <xsl:text></xsl:text><xsl:value-of select="title"/> - - - - - + - - - - - - - -
- - GNU Logo - - - FSF Europe -
- Free Software - equal chances for economy and - people -
- Chapter France

- Chapter Germany
-
- - - + http://france.fsfeurope.org + http://www.fsfeurope.org + http://www.fsf.org + http://www.gnu.org + nofile.html - - - - -
-
- -
- -
- 		  - -
- - - - - - - - - -
-  webmaster@fsfeurope.org
-
-

Copyright (C) 2001 FSF Europe

-

Verbatim copying and distribution of this entire article is - permitted in any medium, provided this notice is preserved.

-
- Last update: - -$Date: 2001-04-20 17:32:38 $ $Author: villate $ - - - - - - - - -
- - - - - - -
- - - - - - - - - - - T2 - -

- - - - - - - - - - - - - -
- - - - -
-   - -
- - - - - - - -
- - - - - - - -
- - - - - - - - - T1 - - | - - - - - - - - - - - - T1 - - - - - - -
- - - - - - - - topbanner - -  ·  - - - -[ - - - - - - - - - - - - - - ] - - - -

News

-
- -
- - - - - - - -
- -
- - - -
- -
- - - - - - - - - - - - - - - - - - - - - - + + + + - - - + + + - - - + DO NOT MODIFY THIS DOCUMENT. IT WAS GENERATED BY XSLT PROCESSING + AND YOUR MODIFICATIONS WILL BE LOST. THE SOURCE OF THE DOCUMENT + IS IN THE .xhtml FILE USE make all TO REGENERATE - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - -
- - - -
- - - -
- - - - - - - -

- - - -
    - -
- - - -
    - -
- - - -
- -
- - - -
- - -


-
- - - -
- -
- - - -
- -
- - - -
  • - -
    • -     - - -
  • - -
    • -     - - - - - - -

    - -

    -     - - -"" - - - - - - - - - - - - - - - - () - - - - - - - - - - - - -

    - - - - - - - - center - - - - - - - . - - - . - - - -

    - Fig. -     -

    -     - - -: - - - - - - . - - - . - - - - - - - - - - - - - - - - # - - - - - - - - - - # - - - - - - - - - - - -

    Bibliografia

    -     -     - -     - - -
      - -
    -     - - -
    • -     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ISBN: - - - - ISNN: - - - - - - - - - -
    -     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -     diff --git a/navigation.de.xsl b/navigation.de.xsl new file mode 100644 index 0000000000..7a50e5fe02 --- /dev/null +++ b/navigation.de.xsl @@ -0,0 +1,134 @@ + +]> + + + + +
    + + + + + +
    +    + FSF Europe + + FSF +   |   + GNU +   |   + GNU Spain
    +
    + + + + +
    + + + + + + +
    +  France | + Germany +
    + + + + + + + + +
    + + GNU Logo + + + FSF Europe +
    + Free Software - equal chances for economy and people +     		+ Was ist Freie Software?
    + Was ist das GNU-Projekt?
    +
    + + + + + + + + +
    + +
    +     		  + + + + + + + + + + + + + +
    Sections

    + Home
    + Contact
    + Background
    + Press section
    + GNU Business Network
    +
    Admin

    + Project Summary
    + Mailing Lists
    + GNU Guide
    + Tasks
    +
    +
    + + + + + + + + + + + +
    + XHTML Source  | +   XSL Style + Sheet
    +     		+  webmaster@fsfeurope.org +
    + + Copyright (C) 2001 FSF Europe
    + Verbatim copying and distribution of this entire article is + permitted in any medium, provided this notice is preserved. +     +     		 
    +     + +     + diff --git a/navigation.en.xsl b/navigation.en.xsl new file mode 100644 index 0000000000..8f8b2719be --- /dev/null +++ b/navigation.en.xsl @@ -0,0 +1,134 @@ + +]> + + + + +
    + + + + + +
    +    + FSF Europe + + FSF +   |   + GNU +   |   + GNU Spain
    +
    + + + + +
    + + + + + + +
    +  France | + Germany +
    + + + + + + + + +
    + + GNU Logo + + + FSF Europe +
    + Free Software - equal chances for economy and people +     		+ What's Free Software?
    + What's the GNU Project?
    +
    + + + + + + + + +
    + +
    +     		  + + + + + + + + + + + + + +
    Sections

    + Home
    + Contact
    + Background
    + Press section
    + GNU Business Network
    +
    Admin

    + Project Summary
    + Mailing Lists
    + GNU Guide
    + Tasks
    +
    +
    + + + + + + + + + + + +
    + XHTML Source  | +   XSL Style + Sheet
    +     		+  webmaster@fsfeurope.org +
    + + Copyright (C) 2001 FSF Europe
    + Verbatim copying and distribution of this entire article is + permitted in any medium, provided this notice is preserved. +     +     		 
    +     + +     + diff --git a/navigation.fr.xsl b/navigation.fr.xsl new file mode 100644 index 0000000000..230a9214fe --- /dev/null +++ b/navigation.fr.xsl @@ -0,0 +1,135 @@ + +]> + + + + +
    + + + + + +
    +    + FSF Europe + + FSF +   |   + GNU +   |   + GNU Espagne
    +
    + + + + +
    + + + + + + +
    +  France | + Germany +
    + + + + + + + + +
    + + GNU Logo + + + FSF Europe +
    + Free Software - equal chances for economy and people +     		+ What's Free Software?
    + What's the GNU Project?
    +
    + + + + + + + + +
    + +
    +     		  + + + + + + + + + + + + + +
    Sections

    + Home
    + Contact
    + Background
    + Press section
    + GNU Business Network
    +
    Admin

    + Project Summary
    + Mailing Lists
    + GNU Guide
    + Tasks
    +
    +
    + + + + + + + + + + + +
    + XHTML Source  | +   XSL Style + Sheet
    +     		+  webmaster@fsfeurope.org +
    + + Copyright (C) 2001 FSF Europe
    + La reproduction exacte et la distribution intégrale de cet article + sont permises sur n'importe quel support d'archivage, pourvu que + cette notice soit préservée. +     +     		 
    +     + +     +