Commit f7be65f4 authored by Bruno Coudoin's avatar Bruno Coudoin

Updated the website (on a Aurelie Casties design)

	improved docs/gcompris2spip.pl to detect if we miss locale
	information
parent 462bd5f6
This diff is collapsed.
......@@ -2,6 +2,39 @@
use strict;
use Data::Dumper;
#
# The translation status from .po files
#
# Copyright (C) 2004-2005 Bruno Coudoin.
#
# gcompris2spip is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# version 2 published by the Free Software Foundation.
#
# Intltool is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
#
# Authors: Bruno Coudoin <bruno.coudoin@free.fr>
#
# -----------------------------------------------------------------------------------------
# USAGE:
# This tool requires no parameters. It must be run withing the gcompris/docs directory
# It will extract xml menus from gcompris/boards and create a spip XML version for them
#------------------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
# Define some constants related to spip rubrique and section organisation
# We do not detect which locale sections are. They are hardcoded here.
......@@ -18,9 +51,11 @@ my %sections = (
"en_CA", 0,
"en_GB", 0,
"es", 40,
"et", 0,
"fi", 36,
"fr", 1,
"ga", 0,
"gu", 0,
"he", 0,
"hi", 0,
"hr", 0,
......@@ -47,6 +82,7 @@ my %sections = (
"sv", 0,
"tr", 0,
"wa", 0,
"zh_CN", 0,
);
my %rubriques = (
......@@ -62,9 +98,11 @@ my %rubriques = (
"en_CA", 0,
"en_GB", 0,
"es", 47,
"et", 0,
"fi", 73,
"fr", 6,
"ga", 0,
"gu", 0,
"he", 0,
"hi", 0,
"hr", 0,
......@@ -91,6 +129,7 @@ my %rubriques = (
"sv", 0,
"tr", 0,
"wa", 0,
"zh_CN", 0,
);
......@@ -107,9 +146,11 @@ my %rubriques_all = (
"en_CA", 0,
"en_GB", 0,
"es", 71,
"et", 0,
"fi", 74,
"fr", 63,
"ga", 0,
"gu", 0,
"he", 0,
"hi", 0,
"hr", 0,
......@@ -136,6 +177,7 @@ my %rubriques_all = (
"sv", 0,
"tr", 0,
"wa", 0,
"zh_CN", 0,
);
#-------------------------------------------------------------------------------
sub spip_cleanup {
......@@ -180,6 +222,19 @@ push @ALL_LINGUAS, "en"; # Add english, it's not in the po list
# Debug
#@ALL_LINGUAS = qw/fr en/;
# Check we have all we need for each defined lang
my $error = 0;
foreach my $lang (@ALL_LINGUAS) {
if(! defined $sections{$lang} ||
! defined $rubriques{$lang} ||
! defined $rubriques_all{$lang} ) {
print "ERROR: Edit this script and add a lang definition for lang '$lang' in \%sections \%rubriques \%rubriques_all\n";
$error = 1;
}
}
exit 1 if $error;
my $tmp_file = "temp_file.spip";
my $output_file = "all_article.spip";
......
......@@ -60,7 +60,7 @@
<div class="rubriquesummary">
<div class="titrearticle">
<div class="surtitre">[(#SURTITRE)]</div>
<div class="titre"> [(#LOGO_ARTICLE|left)] [(#TITRE|supprimer_numero)]</div>
<div class="titrearticlepuce"> [(#LOGO_ARTICLE|left)] [(#TITRE|supprimer_numero)]</div>
<div class="soustitre">[(#SOUSTITRE)]</div>
<div class="chapo">[(#CHAPO)]</div>
</div>
......
<!-- Copyright du site --> Copyright 2004 <A href="mailto:bruno.coudoin@free.fr"> Bruno Coudoin </A> Licence GNU/FDL. <BR> <!-- Webmaster du site --> Vous avez constat&eacute; un probl&egrave;me technique ? Contactez le Webmaster : <A href="mailto:bruno.coudoin@free.fr"> Webmaster </A><BR> <!-- Spip, CMS sous licence GPL --> Site construit autour de l'application <A href="http://www.spip.net"> SPIP </A> Squelettes du site. Licence GPL <p> <a href="http://validator.w3.org/check?uri=referer"><img border="0" src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" height="31" width="88"></a> <a href="http://jigsaw.w3.org/css-validator/check/referer"> <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"> </a></p><p> <a href="http://www.ofset.org/"> <img style="border:0" src="NAVPICS/ofset-banner.png" alt="OFSET: Organisation for Free Software in Education and Teaching"> </a> <a href="http://nosoftwarepatents.com/"><img border="0" src="http://nosoftwarepatents.com/banners/banner_fr_1.gif" alt="No Software Patents"></a> </p>
\ No newline at end of file
<!-- Copyright du site --> Copyright 2004-2005 <A href="mailto:bruno.coudoin@free.fr"> Bruno Coudoin </A> Licence GNU/FDL. <BR> <!-- Webmaster du site --> Vous avez constat&eacute; un probl&egrave;me technique ? Contactez le Webmaster : <A href="mailto:bruno.coudoin@free.fr"> Webmaster </A><BR> <!-- Spip, CMS sous licence GPL --> Site construit autour de l'application <A href="http://www.spip.net"> SPIP </A> Squelettes du site. Licence GPL. Web site design by Aur&eacute;lie Casties. <p> <a href="http://validator.w3.org/check?uri=referer"><img border="0" src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" height="31" width="88"></a> <a href="http://jigsaw.w3.org/css-validator/check/referer"> <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"> </a></p><p> <a href="http://www.ofset.org/"> <img style="border:0" src="NAVPICS/ofset-banner.png" alt="OFSET: Organisation for Free Software in Education and Teaching"> </a> <a href="http://nosoftwarepatents.com/"><img border="0" src="http://nosoftwarepatents.com/banners/banner_fr_1.gif" alt="No Software Patents"></a> </p>
\ No newline at end of file
......
......@@ -15,12 +15,12 @@
#float: left;
}
#jaune {
#HEADERRIGHT {
position : absolute;
#width: 200px;
top : 5px;
#margin: 0;
left : 90%;
right : 5%;
}
#MENU {
......@@ -31,7 +31,7 @@
margin : 6px;
border: 0px solid #111;
background-color: #FFFFFF;
border-color : #5D61C5;
border-color : #e2a395;
padding: 15px;
display: block;
}
......@@ -62,16 +62,20 @@ margin:0em;
a:link {
text-decoration : none;
color : #000000;
color : #c73938;
}
a:visited {
text-decoration : none;
color : #000000;
color : #c73938;
}
a:hover {
text-decoration: none;
color : #000000;
color : #c73938;
}
a.highlight:hover {
background-color: #d6d8ec;
}
a:active {
}
body {
......@@ -118,15 +122,15 @@ body {
.menunav {
font-family : Georgia, "Times New Roman", Times, serif;
font-size : 14px;
color : #3543dd;
color : #767bb6;
font-weight : bold;
border-bottom: 1px solid;
background-color: #d1dafc;
background-color: #d6d8ec;
border-color : #f27979;
}
.contenu {
font-size : 14px;
border-color : #5D61C5;
border-color : #e2a395;
display: block;
padding: 5px;
}
......@@ -134,6 +138,9 @@ body {
font-family : Georgia, "Times New Roman", Times, serif;
font-size : 24px;
font-weight : bold;
display: list-item;
list-style-image: url(img_pack/pucetitre.gif);
list-style-position: inside;
}
.titre2 {
font-family : Georgia, "Times New Roman", Times, serif;
......@@ -150,15 +157,20 @@ body {
font-size : 18px;
font-weight : bold;
border-bottom:2px solid #369;
color:#1826F2;
color:#000000;
font-size:large;
background-color:transparent;
padding:0 0 0.2em 0;
}
.titrearticlepuce {
display: list-item;
list-style-image: url(img_pack/pucesoustitre.gif);
list-style-position: inside;
}
.intro {
font-family : Georgia, "Times New Roman", Times, serif;
font-size : 12px;
color : #660000;
color : #c73938;
text-align : center;
}
.locale {
......@@ -184,7 +196,7 @@ body {
margin : 6px;
border: 2px solid #d573e2;
background-color: #FFF;
border-color : #5D61C5;
border-color : #e2a395;
padding: 15px;
display: block;
}
......@@ -195,8 +207,8 @@ body {
padding : 10px;
clear : left;
border: 1px solid #111;
background-color: #FFFFC9;
border-color : #f4cd70;
background-color: #d6d8ec;
border-color : #e2a395;
}
.surtitre {
font-size : 10px;
......@@ -204,7 +216,7 @@ body {
}
.soustitre {
font-size : 14px;
color : #3a5ff4;
color : #767bb6;
}
.chapo {
font-size : 11px;
......
......@@ -3,7 +3,7 @@
<img alt="<:accueil_site:>" style="border: 0px solid;" src="NAVPICS/bandeauhaut.gif">
</a>
</div>
<div id="jaune">
<div id="HEADERRIGHT">
<a href="#URL_SITE_SPIP" title="<:accueil_site:>">
<img alt="<:accueil_site:>" style="border: 0px solid;" src="NAVPICS/hautdroit.gif">
</a>
......
<?php
//
// Ce fichier ne sera execute qu'une fois
if (defined("_INC_LAYER")) return;
define("_INC_LAYER", "1");
//
// Le contenu de cette fonction est a mettre dans inc_version
//
function test_layer(){
global $browser_name, $browser_version, $browser_description;
if (
(eregi("msie", $browser_name) AND $browser_version >= 5)
|| (eregi("mozilla", $browser_name) AND $browser_version >= 5)
|| (eregi("opera", $browser_name) AND $browser_version >= 7)
)
return true;
}
function afficher_script_layer(){
global $flag_ecrire;
if (test_layer()){
echo '<script type="text/javascript" src="'.($flag_ecrire ? "" : "ecrire/").'layer.js">';
echo "</script>\n";
}
}
function debut_block_visible($nom_block){
if (test_layer()){
global $numero_block;
global $compteur_block;
if (!$numero_block["$nom_block"] > 0){
$compteur_block++;
$numero_block["$nom_block"] = $compteur_block;
}
$retour .= "<div id='Layer".$numero_block["$nom_block"]."' style='display: block'>";
}
return $retour;
}
function debut_block_invisible($nom_block){
if (test_layer()){
global $numero_block;
global $compteur_block;
if (!$numero_block["$nom_block"] > 0){
$compteur_block++;
$numero_block["$nom_block"] = $compteur_block;
}
$retour = "\n<script type='text/javascript'><!--\n";
$retour .= "vis['".$numero_block["$nom_block"]."'] = 'hide';\n";
$retour .= "document.write('<div id=\"Layer".$numero_block["$nom_block"]."\" style=\"display: none; margin-top: 1;\">');\n";
$retour .= "//-->\n";
$retour .= "</script>\n";
$retour .= "<noscript><div id='Layer".$numero_block["$nom_block"]."' style='display: block;'></noscript>\n";
}
return $retour;
}
function fin_block() {
if (test_layer()) {
return "<div style='clear: both;'></div></div>";
}
}
function bouton_block_invisible($nom_block) {
global $numero_block;
global $compteur_block;
global $spip_lang_rtl;
$num_triangle = $compteur_block + 1;
if (test_layer()) {
$blocks = explode(",", $nom_block);
for ($index=0; $index < count($blocks); $index ++){
$nom_block = $blocks[$index];
if (!$numero_block["$nom_block"] > 0){
$compteur_block++;
$numero_block["$nom_block"] = $compteur_block;
}
$javasc .= "swap_couche(\\'".$numero_block[$nom_block]."\\', \\'$spip_lang_rtl\\');";
}
$retour = "\n<script type='text/javascript'><!--\n";
$retour .= "document.write('<a href=\"javascript:$javasc\"><img name=\"triangle".$numero_block["$nom_block"]."\" src=\"img_pack/deplierhaut$spip_lang_rtl.gif\" alt=\"\" title=\"".addslashes(_T('info_deplier'))."\" width=\"24\" height=\"22\" border=\"0\"></a> ');\n";
$retour .= "//-->\n";
$retour .= "</script>\n";
//$retour .= "<noscript><img name='triangle$num_triangle' src='img_pack/deplierbas$spip_lang_rtl.gif' alt='' width='16' height='14' border='0'></noscript>\n";
return $retour;
}
}
function bouton_block_visible($nom_block){
global $spip_lang_rtl;
if (test_layer()){
global $numero_block;
global $compteur_block;
if (!$numero_block["$nom_block"] > 0){
$compteur_block++;
$numero_block["$nom_block"] = $compteur_block;
}
return "<a href=\"javascript:swap_couche('".$numero_block["$nom_block"]."', '$spip_lang_rtl')\"><IMG name='triangle".$numero_block["$nom_block"]."' src='img_pack/deplierbas$spip_lang_rtl.gif' alt='' title='".addslashes(_T('info_deplier'))."' width='16' height='14' border='0'></a> ";
}
}
verif_butineur();
?>
<style>
.secteuroff { font-weight: normal; }
.rubriqueoff { font-weight: normal; }
a.rubriqueoff:hover {
background-color: #d6d8ec;
}
.secteuron, .rubriqueon { font-weight: bold; }
a.rubriqueon:hover {
background-color: #d6d8ec;
}
.secteur, .rubrique { font-weight: bold; }
a.rubrique:hover {
background-color: #d6d8ec;
}
</style>
<?php
if(floor(phpversion()) < 4) {
......@@ -31,7 +40,7 @@ $hierarchie = array();
// inclusion du script de gestion des layers de SPIP
$flag_ecrire = false;
include 'ecrire/inc_layer.php3';
include 'inc_layer.php3';
afficher_script_layer();
?>
<table border="0" cellpadding="2" cellspacing="0">
......
......@@ -43,7 +43,7 @@
<div class="date">
<:breves:> <br>
<BOUCLE_breves(BREVES) {id_secteur} {par date} {inverse} {0,5}>
<li class="grasbeige"> <i>[(#DATE|affdate)]</i>: <a href="#URL_BREVE">#TITRE</a>
<li class="grasbeige"> <i>[(#DATE|affdate)]</i>: <a href="#URL_BREVE" class="highlight">#TITRE</a>
</li>
</BOUCLE_breves>
</div>
......@@ -56,10 +56,10 @@
<div class="titrearticle">
<div class="date"><:par_auteur:>
<BOUCLE4(AUTEURS){id_article}>
<a href="auteur.php3?id_auteur=#ID_AUTEUR?id_rubrique=#ID_SECTEUR">#NOM</a>
<a href="auteur.php3?id_auteur=#ID_AUTEUR?id_rubrique=#ID_SECTEUR" class="highlight">#NOM</a>
</BOUCLE4>
</div>
[(#LOGO_ARTICLE|right)] <a href="#URL_ARTICLE">[(#TITRE|supprimer_numero)]</a>
<div class="titrearticlepuce">[(#LOGO_ARTICLE|right)] <a href="#URL_ARTICLE" class="highlight">[(#TITRE|supprimer_numero)]</a></div>
</div>
<div class="soustitre">
[(#SOUSTITRE)]
......@@ -67,7 +67,7 @@
<br>
<div class="contenu">#TEXTE</div>
[<div class="titre3"><br><a href="forum.php3?(#PARAMETRES_FORUM)"><:repondre_article:></a></div>]
[<div class="titre3"><br><a href="forum.php3?(#PARAMETRES_FORUM)" class="highlight"><:repondre_article:></a></div>]
<br>
</div>
......@@ -81,10 +81,10 @@
<div class="forum"> <a name="forum#ID_FORUM"></a>
<div class="forum-chapo">
<div class="titrearticle">#TITRE</div>
[(#DATE|affdate)][, par <A HREF="mailto:#EMAIL">(#NOM)</A>] </div>
[(#DATE|affdate)][, par <A HREF="mailto:#EMAIL" class="highlight">(#NOM)</A>] </div>
<div class="forum-item"> [(#TEXTE|smileys)]
[
<div>Site : <a href="#URL_SITE">(#NOM_SITE)</a></div>]
<div>Site : <a href="#URL_SITE" class="highlight">(#NOM_SITE)</a></div>]
</div>
</div>
......@@ -95,11 +95,11 @@
<div class="forum"> <a name="forum#ID_FORUM"></a>
<div class="forum-chapo">
<div class="forum-titre">#TITRE</div>
[(#DATE|affdate)][, par <A HREF="mailto:#EMAIL">(#NOM)</A>]
[(#DATE|affdate)][, par <A HREF="mailto:#EMAIL" class="highlight">(#NOM)</A>]
</div>
<div class="forum-item"> [(#TEXTE|smileys)]
[
<div>Site : <a href="#URL_SITE">(#NOM_SITE)</a></div>]
<div>Site : <a href="#URL_SITE" class="highlight">(#NOM_SITE)</a></div>]
</div>
</div>
......@@ -121,9 +121,9 @@
<BOUCLE_site(SITES){id_rubrique}>
<div class="rubriquesummary">
<span>[<a href="#URL_SITE">(#LOGO_SITE|left)</a>]</span>
<span>[<a href="#URL_SITE" class="highlight">(#LOGO_SITE|left)</a>]</span>
<span>
<div class="titre">[<a href="#URL_SITE">(#NOM_SITE)</a>]</div>
<div class="titre">[<a href="#URL_SITE" class="highlight">(#NOM_SITE)</a>]</div>
<div class="soustitre">[(#DESCRIPTIF)]</div>
</span>
</div>
......
......@@ -39,9 +39,8 @@ MM_reloadPage(true);
<div class="conteneur">
<BOUCLE_locale(RUBRIQUES){racine}>
<p class="flottante">
<a href="#URL_RUBRIQUE">[(#LOGO_RUBRIQUE)]
[(#DESCRIPTIF)]
</a>
<a href="#URL_RUBRIQUE">[(#LOGO_RUBRIQUE)]</a><br>
<a href="#URL_RUBRIQUE">[(#DESCRIPTIF)]</a>
</p>
</BOUCLE_locale>
<div class="spacer">&nbsp;</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment