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

Fix navigation typo + change catch phrase on fr

Browse Source 
svn path=/trunk/; revision=335
This commit is contained in:
loic 2001-05-05 13:32:11 +00:00
parent 9a3223cda4
commit e54b008050
5 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -9,10 +9,16 @@
# libxslt + libxml2 (xsltproc)
# http://www.xmlsoft.org/
#
# XML validator
# -------------
# apt-get install rxp
# or
# ftp://ftp.cogsci.ed.ac.uk/pub/richard/rxp-1.2.3.tar.gz
#
XSLTPROC = sabcmd
FSFFRANCE = http://france.fsfeurope.org
FSFEUROPE = . # http://www.fsfeurope.org
FSFEUROPE = http://www.fsfeurope.org
FSF = http://www.fsf.org
GNU = http://www.gnu.org
@ -56,7 +62,7 @@ $(DEPAGES): %.html: %.xhtml fsfe.xsl navigation.de.xsl
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 > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
$(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase '$$path='$$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
rm -f $$base.html-temp
# remove html files for which an xhtml version exists (exclude fr/)

2
fr/navigation.en.xsl
View File

@ -52,7 +52,7 @@
<td class="TopBody" width="99%" height="99%">
<a class="TopTitleB">FSF France</a>
<br />
<a class="TopTitle">Free Software is the conscience of software</a>
<a class="TopTitle">Free Software - equal chances for people and economy</a>
</td>
<td align="right" valign="bottom" class="TopBody">
<a href="{$fsffrance}/index.en.html" class="T2">France</a> <br />

7
fr/navigation.fr.xsl
View File

@ -52,7 +52,7 @@
<td class="TopBody" width="99%" height="99%">
<a class="TopTitleB">FSF France</a>
<br />
<a class="TopTitle">Le Logiciel Libre est la conscience du logiciel</a>
<a class="TopTitle">Free Software - l'entreprise et l'individu sur un pied d'égalité</a>
</td>
<td align="right" valign="bottom" class="TopBody">
<a href="{$fsffrance}/index.fr.html" class="T2">France</a> <br />
@ -65,13 +65,14 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="99%" valign="top">
<div class="content">
<xsl:apply-templates select="@*|node()"/>
</div>
</td>
<!-- Menu column. On the right to be Lynx friendly. -->
<td>&nbsp;</td>
<td valign="top" class="TopBody">
<table width="120" border="0" cellspacing="0" cellpadding="4">
<table summary="" width="150" border="0" cellspacing="0" cellpadding="4">
<tr><td class="TopTitle" align="center">Projets</td></tr>
<tr>
<td class="TopBody" align="right">

5
fsfe.xsl
View File

@ -16,6 +16,7 @@
<xsl:param name="fsf">http://www.fsf.org</xsl:param>
<xsl:param name="gnu">http://www.gnu.org</xsl:param>
<xsl:param name="filebase">nofile.html</xsl:param>
<xsl:param name="path">nofile.html</xsl:param>
<xsl:template match="/">
<xsl:copy>
@ -43,9 +44,9 @@
</head>
</xsl:template>
<xsl:include href="navigation.de.xsl" />
<xsl:include href="navigation.en.xsl" />
<xsl:include href="navigation.fr.xsl" />
<xsl:include href="navigation.en.xsl" />
<xsl:include href="navigation.de.xsl" />
<xsl:template match="@*|node()" priority="-1">
<xsl:copy>

13
navigation.fr.xsl
View File

@ -10,12 +10,12 @@
<tr valign="middle">
<td class="newstext">
&nbsp;&nbsp;
<a class="topbanner" href="{$fsfeurope}/">FSF Europe</a>
<a class="topbanner" href="{$fsfeurope}/index.fr.html">FSF Europe</a>
</td>
<td class="newstext" align="right">
<a class="topbanner" href="{$fsf}/">FSF</a>
<a class="topbanner" href="{$fsf}/home.fr.html">FSF</a>
&nbsp;&nbsp;|&nbsp;&nbsp;
<a class="topbanner" href="{$gnu}/">GNU</a>
<a class="topbanner" href="{$gnu}/home.fr.html">GNU</a>
&nbsp;&nbsp;|&nbsp;&nbsp;
<a class="topbanner" href="http://es.gnu.org/">GNU Espagne</a><br/>
</td>
@ -32,7 +32,7 @@
<tr>
<td class="TopTitle">
&nbsp;<a href="{$fsffrance}/index.fr.html" class="T1">France</a> |
Germany
Allemagne
</td>
</tr>
</table>
@ -48,7 +48,7 @@
<td class="TopBody" width="99%" height="99%">
<a class="TopTitleB">FSF Europe</a>
<br/>
<a class="TopTitle">Free Software - equal chances for people and economy</a>
<a class="TopTitle">Free Software - l'entreprise et l'individu sur un pied d'égalité</a>
</td>
<td align="right" valign="top" class="TopBody">
<a href="{$fsfeurope}/documents/freesoftware.html" class="T2">What's&nbsp;Free&nbsp;Software?</a><br/>
@ -111,7 +111,8 @@
<td class="TopTitle">
<a href="{$filebase}.xhtml" class="T1">XHTML Source</a>&nbsp;&nbsp;|
&nbsp;&nbsp;<a href="{$fsfeurope}/fsfe.xsl" class="T1">XSL Style
Sheet</a><br/>
Sheet</a>&nbsp;&nbsp;|
&nbsp;&nbsp;<a href="http://savannah.gnu.org/cgi-bin/viewcvs/fsfe/{$path}?cvsroot=www.gnu.org" class="T1">Modifications</a><br/>
</td>
<td class="TopTitle" align="right">
&nbsp;<a href="mailto:webmaster@fsfeurope.org"