From 040fe0071021ceadc0b4abe934c0e65bfd530b44 Mon Sep 17 00:00:00 2001 From: ARNO* <arno@rezo.net> Date: Wed, 26 May 2004 15:25:18 +0000 Subject: [PATCH] 1.8 alpha1: nouvelle interface --- .gitattributes | 68 +- ecrire/articles_edit.php3 | 8 +- ecrire/auteur_infos.php3 | 92 +- ecrire/auteurs_edit.php3 | 65 +- ecrire/breves.php3 | 14 +- ecrire/brouteur.php3 | 16 +- ecrire/brouteur_frame.php3 | 26 +- ecrire/calendrier.php3 | 47 +- ecrire/config-contenu.php3 | 200 ++- ecrire/configuration.php3 | 201 +-- ecrire/forum.php3 | 3 + ecrire/img_pack/admin-12.gif | Bin 143 -> 152 bytes ecrire/img_pack/administration-48.gif | Bin 1215 -> 0 bytes ecrire/img_pack/administration-48.png | Bin 0 -> 2829 bytes ecrire/img_pack/aide-48.gif | Bin 613 -> 0 bytes ecrire/img_pack/aide-48.png | Bin 0 -> 1725 bytes ecrire/img_pack/aide-48_rtl.gif | Bin 620 -> 0 bytes ecrire/img_pack/aide-48_rtl.png | Bin 0 -> 1752 bytes ecrire/img_pack/annonce.gif | Bin 0 -> 341 bytes ecrire/img_pack/article-24.gif | Bin 377 -> 211 bytes ecrire/img_pack/asuivre-48.gif | Bin 1204 -> 0 bytes ecrire/img_pack/asuivre-48.png | Bin 0 -> 1879 bytes ecrire/img_pack/barre-couleurs.gif | Bin 399 -> 194 bytes ecrire/img_pack/base-24.gif | Bin 379 -> 224 bytes ecrire/img_pack/breve-24.gif | Bin 298 -> 229 bytes ecrire/img_pack/cadre-b.gif | Bin 51 -> 0 bytes ecrire/img_pack/cadre-bd.gif | Bin 73 -> 0 bytes ecrire/img_pack/cadre-bg.gif | Bin 73 -> 0 bytes ecrire/img_pack/cadre-d.gif | Bin 56 -> 0 bytes ecrire/img_pack/cadre-g.gif | Bin 67 -> 0 bytes ecrire/img_pack/cadre-h.gif | Bin 70 -> 0 bytes ecrire/img_pack/cadre-hd.gif | Bin 89 -> 0 bytes ecrire/img_pack/cadre-hg.gif | Bin 86 -> 0 bytes ecrire/img_pack/cal-messagerie.gif | Bin 0 -> 231 bytes ecrire/img_pack/cal-suivi.gif | Bin 0 -> 264 bytes ecrire/img_pack/choix-layout.gif | Bin 446 -> 0 bytes ecrire/img_pack/choix-layout.png | Bin 0 -> 1346 bytes ecrire/img_pack/choix-layout_rtl.gif | Bin 541 -> 0 bytes ecrire/img_pack/choix-layout_rtl.png | Bin 0 -> 1206 bytes ecrire/img_pack/choix-layout_rtl_he.gif | Bin 527 -> 0 bytes ecrire/img_pack/choix-layout_rtl_he.png | Bin 0 -> 1201 bytes ecrire/img_pack/deconnecter-24.gif | Bin 391 -> 289 bytes ecrire/img_pack/deconnecter-24_rtl.gif | Bin 392 -> 208 bytes ecrire/img_pack/documents-48.gif | Bin 1342 -> 0 bytes ecrire/img_pack/documents-48.png | Bin 0 -> 1732 bytes ecrire/img_pack/documents-48_rtl.gif | Bin 1348 -> 0 bytes ecrire/img_pack/documents-48_rtl.png | Bin 0 -> 1735 bytes ecrire/img_pack/fiche-perso-24.gif | Bin 213 -> 173 bytes ecrire/img_pack/fiche-perso-48.gif | Bin 683 -> 0 bytes ecrire/img_pack/fiche-perso.gif | Bin 0 -> 248 bytes ecrire/img_pack/fond-agenda.gif | Bin 0 -> 51 bytes ecrire/img_pack/fond-gris-anim.gif | Bin 0 -> 347 bytes ecrire/img_pack/interface-display.gif | Bin 0 -> 219 bytes ecrire/img_pack/loupe.gif | Bin 0 -> 204 bytes ecrire/img_pack/message.gif | Bin 0 -> 318 bytes ecrire/img_pack/messagerie-48.gif | Bin 1027 -> 0 bytes ecrire/img_pack/messagerie-48.png | Bin 0 -> 1557 bytes ecrire/img_pack/mot-cle-24.gif | Bin 460 -> 175 bytes ecrire/img_pack/naviguer-site.gif | Bin 220 -> 220 bytes ecrire/img_pack/pave-blanc-16.png | Bin 336 -> 0 bytes ecrire/img_pack/pave-blanc-24.png | Bin 365 -> 0 bytes ecrire/img_pack/pave-blanc-36.png | Bin 400 -> 0 bytes ecrire/img_pack/pave-blanc-48.png | Bin 491 -> 0 bytes ecrire/img_pack/pave-gris-16.png | Bin 353 -> 0 bytes ecrire/img_pack/pave-gris-24.png | Bin 376 -> 0 bytes ecrire/img_pack/pave-gris-36.png | Bin 411 -> 0 bytes ecrire/img_pack/pave-gris-48.png | Bin 509 -> 0 bytes ecrire/img_pack/pave-rouge-24.png | Bin 366 -> 0 bytes ecrire/img_pack/pave-rouge-36.png | Bin 418 -> 0 bytes ecrire/img_pack/pense-bete.gif | Bin 0 -> 307 bytes ecrire/img_pack/puce-blanche-breve.gif | Bin 132 -> 53 bytes ecrire/img_pack/puce-blanche.gif | Bin 185 -> 56 bytes ecrire/img_pack/puce-orange-breve.gif | Bin 131 -> 53 bytes ecrire/img_pack/puce-orange.gif | Bin 177 -> 55 bytes ecrire/img_pack/puce-poubelle-breve.gif | Bin 133 -> 59 bytes ecrire/img_pack/puce-poubelle.gif | Bin 185 -> 64 bytes ecrire/img_pack/puce-rouge-breve.gif | Bin 135 -> 61 bytes ecrire/img_pack/puce-rouge.gif | Bin 175 -> 66 bytes ecrire/img_pack/puce-verte-breve.gif | Bin 133 -> 47 bytes ecrire/img_pack/puce-verte.gif | Bin 173 -> 49 bytes ecrire/img_pack/racine-site-24.gif | Bin 477 -> 341 bytes ecrire/img_pack/rayures-danger.gif | Bin 0 -> 73 bytes ecrire/img_pack/rayures-danger.png | Bin 0 -> 340 bytes ecrire/img_pack/rayures-gris.gif | Bin 0 -> 207 bytes ecrire/img_pack/redac-12.gif | Bin 143 -> 165 bytes ecrire/img_pack/redacteurs-24.gif | Bin 220 -> 281 bytes ecrire/img_pack/redacteurs-48.gif | Bin 783 -> 0 bytes ecrire/img_pack/redacteurs-48.png | Bin 0 -> 2230 bytes ecrire/img_pack/rubrique-12.gif | Bin 224 -> 158 bytes ecrire/img_pack/rubrique-24.gif | Bin 378 -> 244 bytes ecrire/img_pack/rv-12.gif | Bin 0 -> 154 bytes ecrire/img_pack/rv.gif | Bin 0 -> 191 bytes ecrire/img_pack/secteur-12.gif | Bin 0 -> 159 bytes ecrire/img_pack/secteur-24.gif | Bin 477 -> 281 bytes ecrire/img_pack/set-ecran-etroit.gif | Bin 0 -> 264 bytes ecrire/img_pack/set-ecran.gif | Bin 216 -> 241 bytes ecrire/img_pack/site-24.gif | Bin 454 -> 287 bytes ecrire/img_pack/statistiques-48.gif | Bin 1453 -> 0 bytes ecrire/img_pack/statistiques-48.png | Bin 0 -> 2795 bytes ecrire/img_pack/suivi-48.gif | Bin 1521 -> 0 bytes ecrire/img_pack/tout-site.gif | Bin 0 -> 306 bytes ecrire/img_pack/triangle-droite.gif | Bin 0 -> 81 bytes ecrire/img_pack/triangle-droite_rtl.gif | Bin 0 -> 80 bytes ecrire/img_pack/visit-12.gif | Bin 142 -> 155 bytes ecrire/img_pack/visiter-48.gif | Bin 966 -> 0 bytes ecrire/img_pack/visiter-48.png | Bin 0 -> 2188 bytes ecrire/img_pack/visiter-48_rtl.gif | Bin 984 -> 0 bytes ecrire/img_pack/visiter-48_rtl.png | Bin 0 -> 2158 bytes ecrire/inc.php3 | 110 +- ecrire/inc_agenda.php3 | 103 +- ecrire/inc_barre.php3 | 17 +- ecrire/inc_config.php3 | 13 +- ecrire/inc_presentation.php3 | 1608 ++++++++++++++++------- ecrire/inc_sites.php3 | 76 +- ecrire/inc_version.php3 | 2 +- ecrire/index.php3 | 97 +- ecrire/lang/spip_fr.php3 | 5 +- ecrire/message.php3 | 50 +- ecrire/message_edit.php3 | 115 +- ecrire/messagerie.php3 | 143 +- ecrire/mots_edit.php3 | 2 +- ecrire/mots_tous.php3 | 71 +- ecrire/naviguer.php3 | 111 +- ecrire/puce.gif | Bin 145 -> 83 bytes ecrire/puce_rtl.gif | Bin 143 -> 84 bytes ecrire/recherche.php3 | 178 +-- ecrire/spip_style.php3 | 549 ++++++-- ecrire/spip_style_invisible.css | 9 + ecrire/spip_style_visible.css | 9 + ecrire/statistiques.php3 | 14 +- ecrire/statistiques_lang.php3 | 10 +- ecrire/statistiques_referers.php3 | 4 +- ecrire/statistiques_visites.php3 | 2 +- ecrire/synchro.php3 | 75 +- ecrire/win_png.htc | 47 + ecrire/win_width.htc | 17 + 136 files changed, 2620 insertions(+), 1557 deletions(-) delete mode 100644 ecrire/img_pack/administration-48.gif create mode 100644 ecrire/img_pack/administration-48.png delete mode 100644 ecrire/img_pack/aide-48.gif create mode 100644 ecrire/img_pack/aide-48.png delete mode 100644 ecrire/img_pack/aide-48_rtl.gif create mode 100644 ecrire/img_pack/aide-48_rtl.png create mode 100644 ecrire/img_pack/annonce.gif delete mode 100644 ecrire/img_pack/asuivre-48.gif create mode 100644 ecrire/img_pack/asuivre-48.png delete mode 100644 ecrire/img_pack/cadre-b.gif delete mode 100644 ecrire/img_pack/cadre-bd.gif delete mode 100644 ecrire/img_pack/cadre-bg.gif delete mode 100644 ecrire/img_pack/cadre-d.gif delete mode 100644 ecrire/img_pack/cadre-g.gif delete mode 100644 ecrire/img_pack/cadre-h.gif delete mode 100644 ecrire/img_pack/cadre-hd.gif delete mode 100644 ecrire/img_pack/cadre-hg.gif create mode 100644 ecrire/img_pack/cal-messagerie.gif create mode 100644 ecrire/img_pack/cal-suivi.gif delete mode 100644 ecrire/img_pack/choix-layout.gif create mode 100644 ecrire/img_pack/choix-layout.png delete mode 100644 ecrire/img_pack/choix-layout_rtl.gif create mode 100644 ecrire/img_pack/choix-layout_rtl.png delete mode 100644 ecrire/img_pack/choix-layout_rtl_he.gif create mode 100644 ecrire/img_pack/choix-layout_rtl_he.png delete mode 100644 ecrire/img_pack/documents-48.gif create mode 100644 ecrire/img_pack/documents-48.png delete mode 100644 ecrire/img_pack/documents-48_rtl.gif create mode 100644 ecrire/img_pack/documents-48_rtl.png delete mode 100644 ecrire/img_pack/fiche-perso-48.gif create mode 100644 ecrire/img_pack/fiche-perso.gif create mode 100644 ecrire/img_pack/fond-agenda.gif create mode 100644 ecrire/img_pack/fond-gris-anim.gif create mode 100644 ecrire/img_pack/interface-display.gif create mode 100644 ecrire/img_pack/loupe.gif create mode 100644 ecrire/img_pack/message.gif delete mode 100644 ecrire/img_pack/messagerie-48.gif create mode 100644 ecrire/img_pack/messagerie-48.png delete mode 100644 ecrire/img_pack/pave-blanc-16.png delete mode 100644 ecrire/img_pack/pave-blanc-24.png delete mode 100644 ecrire/img_pack/pave-blanc-36.png delete mode 100644 ecrire/img_pack/pave-blanc-48.png delete mode 100644 ecrire/img_pack/pave-gris-16.png delete mode 100644 ecrire/img_pack/pave-gris-24.png delete mode 100644 ecrire/img_pack/pave-gris-36.png delete mode 100644 ecrire/img_pack/pave-gris-48.png delete mode 100644 ecrire/img_pack/pave-rouge-24.png delete mode 100644 ecrire/img_pack/pave-rouge-36.png create mode 100644 ecrire/img_pack/pense-bete.gif create mode 100644 ecrire/img_pack/rayures-danger.gif create mode 100644 ecrire/img_pack/rayures-danger.png create mode 100644 ecrire/img_pack/rayures-gris.gif delete mode 100644 ecrire/img_pack/redacteurs-48.gif create mode 100644 ecrire/img_pack/redacteurs-48.png create mode 100644 ecrire/img_pack/rv-12.gif create mode 100644 ecrire/img_pack/rv.gif create mode 100644 ecrire/img_pack/secteur-12.gif create mode 100644 ecrire/img_pack/set-ecran-etroit.gif delete mode 100755 ecrire/img_pack/statistiques-48.gif create mode 100644 ecrire/img_pack/statistiques-48.png delete mode 100644 ecrire/img_pack/suivi-48.gif create mode 100644 ecrire/img_pack/tout-site.gif create mode 100644 ecrire/img_pack/triangle-droite.gif create mode 100644 ecrire/img_pack/triangle-droite_rtl.gif delete mode 100644 ecrire/img_pack/visiter-48.gif create mode 100644 ecrire/img_pack/visiter-48.png delete mode 100644 ecrire/img_pack/visiter-48_rtl.gif create mode 100644 ecrire/img_pack/visiter-48_rtl.png create mode 100644 ecrire/spip_style_invisible.css create mode 100644 ecrire/spip_style_visible.css create mode 100644 ecrire/win_png.htc create mode 100644 ecrire/win_width.htc diff --git a/.gitattributes b/.gitattributes index b3272cdf1f..9dd507e903 100644 --- a/.gitattributes +++ b/.gitattributes @@ -72,15 +72,16 @@ NAVPICS/point.gif -text NAVPICS/rien.gif -text ecrire/img_pack/admin-12.gif -text ecrire/img_pack/administration-24.gif -text -ecrire/img_pack/administration-48.gif -text +ecrire/img_pack/administration-48.png -text ecrire/img_pack/agenda-24.gif -text -ecrire/img_pack/aide-48.gif -text -ecrire/img_pack/aide-48_rtl.gif -text +ecrire/img_pack/aide-48.png -text +ecrire/img_pack/aide-48_rtl.png -text ecrire/img_pack/aide.gif -text ecrire/img_pack/aide_rtl.gif -text +ecrire/img_pack/annonce.gif -text ecrire/img_pack/article-24.gif -text ecrire/img_pack/asuivre-24.gif -text -ecrire/img_pack/asuivre-48.gif -text +ecrire/img_pack/asuivre-48.png -text ecrire/img_pack/barre-blanc.gif -text ecrire/img_pack/barre-couleurs.gif -text ecrire/img_pack/barre-d.gif -text @@ -90,21 +91,15 @@ ecrire/img_pack/base-24.gif -text ecrire/img_pack/breve-24.gif -text ecrire/img_pack/cache-24.gif -text ecrire/img_pack/cadenas-24.gif -text -ecrire/img_pack/cadre-b.gif -text -ecrire/img_pack/cadre-bd.gif -text -ecrire/img_pack/cadre-bg.gif -text -ecrire/img_pack/cadre-d.gif -text -ecrire/img_pack/cadre-g.gif -text -ecrire/img_pack/cadre-h.gif -text -ecrire/img_pack/cadre-hd.gif -text -ecrire/img_pack/cadre-hg.gif -text ecrire/img_pack/cal-jour.gif -text +ecrire/img_pack/cal-messagerie.gif -text ecrire/img_pack/cal-mois.gif -text ecrire/img_pack/cal-semaine.gif -text +ecrire/img_pack/cal-suivi.gif -text ecrire/img_pack/calendrier-24.gif -text -ecrire/img_pack/choix-layout.gif -text -ecrire/img_pack/choix-layout_rtl.gif -text -ecrire/img_pack/choix-layout_rtl_he.gif -text +ecrire/img_pack/choix-layout.png -text +ecrire/img_pack/choix-layout_rtl.png -text +ecrire/img_pack/choix-layout_rtl_he.png -text ecrire/img_pack/cookie-24.gif -text ecrire/img_pack/creer.gif -text ecrire/img_pack/croix-rouge.gif -text @@ -116,15 +111,17 @@ ecrire/img_pack/deplierbas_rtl.gif -text ecrire/img_pack/deplierhaut.gif -text ecrire/img_pack/deplierhaut_rtl.gif -text ecrire/img_pack/doc-24.gif -text -ecrire/img_pack/documents-48.gif -text -ecrire/img_pack/documents-48_rtl.gif -text +ecrire/img_pack/documents-48.png -text +ecrire/img_pack/documents-48_rtl.png -text ecrire/img_pack/edit.gif -text ecrire/img_pack/effacer-cache-24.gif -text ecrire/img_pack/fiche-perso-24.gif -text -ecrire/img_pack/fiche-perso-48.gif -text +ecrire/img_pack/fiche-perso.gif -text ecrire/img_pack/fleche-left.png -text ecrire/img_pack/fleche-right.png -text +ecrire/img_pack/fond-agenda.gif -text ecrire/img_pack/fond-calendrier.gif -text +ecrire/img_pack/fond-gris-anim.gif -text ecrire/img_pack/fond-stats.gif -text ecrire/img_pack/forum-admin-24.gif -text ecrire/img_pack/forum-droite.gif -text @@ -133,6 +130,7 @@ ecrire/img_pack/forum-interne-24.gif -text ecrire/img_pack/forum-vert.gif -text ecrire/img_pack/groupe-mot-24.gif -text ecrire/img_pack/image-24.gif -text +ecrire/img_pack/interface-display.gif -text ecrire/img_pack/jauge-fond.gif -text ecrire/img_pack/jauge-rouge.gif -text ecrire/img_pack/jauge-vert.gif -text @@ -141,26 +139,19 @@ ecrire/img_pack/langues-24.gif -text ecrire/img_pack/langues-modif-12.gif -text ecrire/img_pack/langues-off-12.gif -text ecrire/img_pack/logo-spip.gif -text +ecrire/img_pack/loupe.gif -text ecrire/img_pack/m_envoi.gif -text ecrire/img_pack/m_envoi_bleu.gif -text ecrire/img_pack/m_envoi_bleu_rtl.gif -text ecrire/img_pack/m_envoi_jaune.gif -text ecrire/img_pack/m_envoi_jaune_rtl.gif -text ecrire/img_pack/m_envoi_rtl.gif -text +ecrire/img_pack/message.gif -text ecrire/img_pack/messagerie-24.gif -text -ecrire/img_pack/messagerie-48.gif -text +ecrire/img_pack/messagerie-48.png -text ecrire/img_pack/mot-cle-24.gif -text ecrire/img_pack/naviguer-site.gif -text -ecrire/img_pack/pave-blanc-16.png -text -ecrire/img_pack/pave-blanc-24.png -text -ecrire/img_pack/pave-blanc-36.png -text -ecrire/img_pack/pave-blanc-48.png -text -ecrire/img_pack/pave-gris-16.png -text -ecrire/img_pack/pave-gris-24.png -text -ecrire/img_pack/pave-gris-36.png -text -ecrire/img_pack/pave-gris-48.png -text -ecrire/img_pack/pave-rouge-24.png -text -ecrire/img_pack/pave-rouge-36.png -text +ecrire/img_pack/pense-bete.gif -text ecrire/img_pack/petite-cle.gif -text ecrire/img_pack/petition-24.gif -text ecrire/img_pack/poubelle.gif -text @@ -181,12 +172,15 @@ ecrire/img_pack/puce-verte-breve.gif -text ecrire/img_pack/puce-verte.gif -text ecrire/img_pack/racine-24.gif -text ecrire/img_pack/racine-site-24.gif -text +ecrire/img_pack/rayures-danger.gif -text +ecrire/img_pack/rayures-danger.png -text ecrire/img_pack/rayures-fines.gif -text +ecrire/img_pack/rayures-gris.gif -text ecrire/img_pack/rayures-sup.gif -text ecrire/img_pack/rayures.gif -text ecrire/img_pack/redac-12.gif -text ecrire/img_pack/redacteurs-24.gif -text -ecrire/img_pack/redacteurs-48.gif -text +ecrire/img_pack/redacteurs-48.png -text ecrire/img_pack/redacteurs-admin-24.gif -text ecrire/img_pack/redacteurs-poubelle-24.gif -text ecrire/img_pack/referers-24.gif -text @@ -201,26 +195,32 @@ ecrire/img_pack/rond-hd-24.gif -text ecrire/img_pack/rond-hg-24.gif -text ecrire/img_pack/rubrique-12.gif -text ecrire/img_pack/rubrique-24.gif -text +ecrire/img_pack/rv-12.gif -text +ecrire/img_pack/rv.gif -text +ecrire/img_pack/secteur-12.gif -text ecrire/img_pack/secteur-24.gif -text +ecrire/img_pack/set-ecran-etroit.gif -text ecrire/img_pack/set-ecran.gif -text ecrire/img_pack/site-24.gif -text ecrire/img_pack/statistiques-24.gif -text -ecrire/img_pack/statistiques-48.gif -text -ecrire/img_pack/suivi-48.gif -text +ecrire/img_pack/statistiques-48.png -text ecrire/img_pack/suivi-forum-24.gif -text ecrire/img_pack/supprimer.gif -text ecrire/img_pack/synchro-24.gif -text ecrire/img_pack/tirets-separation.gif -text ecrire/img_pack/tout-site-24.gif -text +ecrire/img_pack/tout-site.gif -text ecrire/img_pack/traductions-24.gif -text ecrire/img_pack/triangle-bas.gif -text ecrire/img_pack/triangle-bleu-bas.gif -text ecrire/img_pack/triangle-bleu.gif -text +ecrire/img_pack/triangle-droite.gif -text +ecrire/img_pack/triangle-droite_rtl.gif -text ecrire/img_pack/triangle.gif -text ecrire/img_pack/triangle_rtl.gif -text ecrire/img_pack/visit-12.gif -text -ecrire/img_pack/visiter-48.gif -text -ecrire/img_pack/visiter-48_rtl.gif -text +ecrire/img_pack/visiter-48.png -text +ecrire/img_pack/visiter-48_rtl.png -text ecrire/img_pack/warning-24.gif -text ecrire/img_pack/warning.gif -text ecrire/img_pack/xml.gif -text diff --git a/ecrire/articles_edit.php3 b/ecrire/articles_edit.php3 index 564617b471..c16e8d5624 100644 --- a/ecrire/articles_edit.php3 +++ b/ecrire/articles_edit.php3 @@ -181,7 +181,7 @@ function coupe_trop_long($texte){ // utile pour les textes > 32ko } -debut_page(_T('titre_page_articles_edit', array('titre' => $titre)), "documents", "articles"); +debut_page(_T('titre_page_articles_edit', array('titre' => $titre)), "documents", "articles", "hauteurTextarea();"); debut_grand_cadre(); @@ -379,7 +379,7 @@ echo "<P><HR><P>"; echo _T('texte_titre_obligatoire'); echo aide ("arttitre"); - echo "<BR><INPUT TYPE='text' NAME='titre' style='font-weight: bold;' CLASS='formo' VALUE=\"$titre\" SIZE='40' $onfocus><P>"; + echo "<BR><INPUT TYPE='text' NAME='titre' style='font-weight: bold; font-size: 13px;' CLASS='formo' VALUE=\"$titre\" SIZE='40' $onfocus><P>"; if (($articles_soustitre != "non") OR $soustitre) { echo "<B>"._T('texte_sous_titre')."</B>"; @@ -505,9 +505,9 @@ echo "<P><HR><P>"; echo $textes_supplement; - echo "<BR>"; + //echo "<BR>"; echo afficher_barre('formulaire', 'texte'); - echo "<TEXTAREA NAME='texte' ".afficher_claret()." CLASS='formo' ROWS='$rows' COLS='40' wrap=soft>"; + echo "<TEXTAREA id='text_area' NAME='texte' ".afficher_claret()." CLASS='formo' ROWS='$rows' COLS='40' wrap=soft>"; echo $texte; echo "</TEXTAREA>\n"; diff --git a/ecrire/auteur_infos.php3 b/ecrire/auteur_infos.php3 index b9bf9dbc95..529707d4ca 100644 --- a/ecrire/auteur_infos.php3 +++ b/ecrire/auteur_infos.php3 @@ -139,6 +139,16 @@ if ($statut) { // si on poste un nom, c'est qu'on modifie une fiche auteur $auteur['email'] = $email; } + if ($connect_id_auteur == $id_auteur) { + if ($perso_activer_imessage) { + $query = "UPDATE spip_auteurs SET imessage='$perso_activer_imessage' WHERE id_auteur=$id_auteur"; + $result = spip_query($query); + $auteur['imessage'] = $perso_activer_imessage; + } + } + + + // variables sans probleme $auteur['bio'] = corriger_caracteres($bio); $auteur['pgp'] = corriger_caracteres($pgp); @@ -199,13 +209,21 @@ if ($statut) { // si on poste un nom, c'est qu'on modifie une fiche auteur } // Redirection -if (($redirect_ok == 'oui') AND ($redirect)) { - @Header("Location: ".rawurldecode($redirect)); - exit; +if (!$echec AND $redirect_ok == "oui") { + if ($redirect) { + @Header("Location: ".rawurldecode($redirect)); + exit; + } + else { + @Header("Location:auteurs_edit.php3?id_auteur=$id_auteur"); + exit; + } } + + // // Affichage // @@ -216,12 +234,6 @@ else debut_page($auteur['nom'],"documents","redacteurs"); echo "<br><br><br>"; -gros_titre($auteur['nom']); - -if (($connect_statut == "0minirezo") OR $connect_id_auteur == $id_auteur) { - $statut_auteur=$auteur['statut']; - barre_onglets("auteur", "infos"); -} debut_gauche(); @@ -261,7 +273,7 @@ echo "<INPUT TYPE='Hidden' NAME='id_auteur' VALUE=\"$id_auteur\">"; echo "<div class='serif'>"; -debut_cadre_relief("fiche-perso-24.gif"); +debut_cadre_relief("fiche-perso-24.gif", false, "", _T("icone_informations_personnelles")); echo _T('titre_cadre_signature_obligatoire'); echo "("._T('entree_nom_pseudo').")<BR>"; @@ -283,37 +295,38 @@ echo "<TEXTAREA NAME='bio' CLASS='forml' ROWS='4' COLS='40' wrap=soft>"; echo entites_html($auteur['bio']); echo "</TEXTAREA>\n"; - if ($champs_extra) { - include_ecrire("inc_extra.php3"); - extra_saisie($auteur['extra'], 'auteurs', $auteur['statut']); - } +debut_cadre_enfonce("site-24.gif", false, "", _T('info_site_web')); +echo "<B>"._T('entree_nom_site')."</B><BR>"; +echo "<INPUT TYPE='text' NAME='nom_site_auteur' CLASS='forml' VALUE=\"".entites_html($auteur['nom_site'])."\" SIZE='40'><P>\n"; -fin_cadre_relief(); -echo "<p>"; +echo "<B>"._T('entree_url')."</B><BR>"; +echo "<INPUT TYPE='text' NAME='url_site' CLASS='forml' VALUE=\"".entites_html($auteur['url_site'])."\" SIZE='40'>\n"; +fin_cadre_enfonce(); + echo "<p>"; if ($options == "avancees") { - debut_cadre_relief("cadenas-24.gif"); - echo "<B>"._T('entree_cle_pgp')."</B><BR>"; + debut_cadre_enfonce("cadenas-24.gif", false, "", _T('entree_cle_pgp')); echo "<TEXTAREA NAME='pgp' CLASS='forml' ROWS='4' COLS='40' wrap=soft>"; echo entites_html($auteur['pgp']); echo "</TEXTAREA>\n"; - fin_cadre_relief(); + fin_cadre_enfonce(); echo "<p>"; } else { echo "<input type='hidden' name='pgp' value=\"".entites_html($auteur['pgp'])."\">"; } -debut_cadre_relief("site-24.gif"); -echo "<B>"._T('entree_nom_site')."</B><BR>"; -echo "<INPUT TYPE='text' NAME='nom_site_auteur' CLASS='forml' VALUE=\"".entites_html($auteur['nom_site'])."\" SIZE='40'><P>\n"; +echo "<p>"; + if ($champs_extra) { + include_ecrire("inc_extra.php3"); + extra_saisie($auteur['extra'], 'auteurs', $auteur['statut']); + } -echo "<B>"._T('entree_url')."</B><BR>"; -echo "<INPUT TYPE='text' NAME='url_site' CLASS='forml' VALUE=\"".entites_html($auteur['url_site'])."\" SIZE='40'>\n"; fin_cadre_relief(); echo "<p>"; + // // Login et mot de passe : // accessibles seulement aux admins non restreints et l'auteur lui-meme @@ -370,6 +383,37 @@ fin_cadre_relief(); echo "<p>"; +// +// Apparaitre dans la liste des redacteurs connectes +// + +if ($connect_id_auteur == $id_auteur) { + + debut_cadre_relief("messagerie-24.gif", false, "", _T('info_liste_redacteurs_connectes')); + + echo "<div>"._T('texte_auteur_messagerie')."</div>"; + + if ($auteur['imessage']=="non"){ + echo "<INPUT TYPE='radio' NAME='perso_activer_imessage' VALUE='oui' id='perso_activer_imessage_on'>"; + echo " <label for='perso_activer_imessage_on'>"._T('bouton_radio_apparaitre_liste_redacteurs_connectes')."</label> "; + echo "<BR><INPUT TYPE='radio' NAME='perso_activer_imessage' VALUE='non' CHECKED id='perso_activer_imessage_off'>"; + echo " <B><label for='perso_activer_imessage_off'>"._T('bouton_radio_non_apparaitre_liste_redacteurs_connectes')."</label></B> "; + } else { + echo "<INPUT TYPE='radio' NAME='perso_activer_imessage' VALUE='oui' id='perso_activer_imessage_on' CHECKED>"; + echo " <B><label for='perso_activer_imessage_on'>"._T('bouton_radio_apparaitre_liste_redacteurs_connectes')."</label></B> "; + + echo "<BR><INPUT TYPE='radio' NAME='perso_activer_imessage' VALUE='non' id='perso_activer_imessage_off'>"; + echo " <label for='perso_activer_imessage_off'>"._T('bouton_radio_non_apparaitre_liste_redacteurs_connectes')."</label> "; + } + + fin_cadre_relief(); + echo "<p />"; + + +} + + + // // Seuls les admins voient le menu 'statut', mais les admins restreints ne // pourront l'utiliser que pour mettre un auteur a la poubelle diff --git a/ecrire/auteurs_edit.php3 b/ecrire/auteurs_edit.php3 index e9776bf91c..8a30ba376a 100644 --- a/ecrire/auteurs_edit.php3 +++ b/ecrire/auteurs_edit.php3 @@ -66,13 +66,6 @@ else debut_page($nom,"documents","redacteurs"); echo "<br><br><br>"; -gros_titre($nom); - -if (($connect_statut == "0minirezo") OR $connect_id_auteur == $id_auteur) { - $statut_auteur=$statut; - barre_onglets("auteur", "auteur"); -} - debut_gauche(); @@ -101,12 +94,6 @@ $artoff = "autoff$id_auteur"; if ($id_auteur>0 AND (($connect_statut == '0minirezo') OR ($connect_id_auteur == $id_auteur))) afficher_boite_logo($arton, $artoff, _T('logo_auteur').aide ("logoart"), _T('logo_survol')); -// raccourcis -if ($connect_id_auteur == $id_auteur) { - debut_raccourcis(); - icone_horizontale(_T('icone_tous_auteur'), "auteurs.php3", "redacteurs-24.gif","rien.gif"); - fin_raccourcis(); -} debut_droite(); @@ -118,26 +105,43 @@ function mySel($varaut,$variable) { return $retour; } -if ($statut == "0minirezo") $logo = "redacteurs-admin-24.gif"; -else if ($statut == "5poubelle") $logo = "redacteurs-poubelle-24.gif"; -else $logo = "redacteurs-24.gif"; + debut_cadre_relief("redacteurs-24.gif"); + + + echo "<table width='100%' cellpadding='0' border='0' cellspacing='0'>"; + + echo "<tr>"; + + echo "<td valign='top' width='100%'>"; + + + gros_titre($nom); + + echo "<div> </div>"; + if (strlen($email) > 2) echo "<div>"._T('email_2')." <B><A HREF='mailto:$email'>$email</A></B></div>"; + if (strlen($nom_site_auteur) > 2) echo "<div>"._T('info_site_2')." <B><A HREF='$url_site'>$nom_site_auteur</A></B></div>"; -if (strlen($email) > 2 OR strlen($bio) > 0 OR strlen($nom_site_auteur) > 0 OR ($champs_extra AND $extra)) { - debut_cadre_relief("$logo"); - echo "<FONT FACE='Verdana,Arial,Sans,sans-serif'>"; - if (strlen($email) > 2) echo _T('email_2')." <B><A HREF='mailto:$email'>$email</A></B><BR> "; - if (strlen($nom_site_auteur) > 2) echo _T('info_site_2')." <B><A HREF='$url_site'>$nom_site_auteur</A></B>"; - echo "<P>".propre($bio)."</P>"; + + echo "</td>"; + + echo "<td>"; + + if (($connect_statut == "0minirezo") OR $connect_id_auteur == $id_auteur) { + icone (_T("admin_modifier_auteur"), "auteurs_infos.php3?id_auteur=$id_auteur", "redacteurs-24.gif", "edit.gif"); + } + echo "</td></tr></table>"; + + if (strlen($bio) > 0) { echo "<div>".propre("<quote>".$bio."</quote>")."</div>"; } + if (strlen($pgp) > 0) { echo "<div>".propre("PGP:<cadre>".$pgp."</cadre>")."</div>"; } if ($champs_extra AND $extra) { include_ecrire("inc_extra.php3"); extra_affichage($extra, "auteurs"); } - echo "</FONT>"; + fin_cadre_relief(); -} echo "<P>"; @@ -148,10 +152,21 @@ else $aff_art = "'prop','publie'"; afficher_articles(_T('info_articles_auteur'), ", spip_auteurs_articles AS lien WHERE lien.id_auteur='$id_auteur' ". "AND lien.id_article=articles.id_article AND articles.statut IN ($aff_art) ". - "ORDER BY articles.date DESC"); + "ORDER BY articles.date DESC", true); } + +$query_message = "SELECT * FROM spip_messages AS messages, spip_auteurs_messages AS lien, spip_auteurs_messages AS lien2 ". + "WHERE lien.id_auteur=$connect_id_auteur AND lien2.id_auteur = $id_auteur AND statut='publie' AND type='normal' AND rv!='oui' AND lien.id_message=messages.id_message AND lien2.id_message=messages.id_message"; +afficher_messages(_T('info_discussion_cours'), $query_message, false, false); + +$query_message = "SELECT * FROM spip_messages AS messages, spip_auteurs_messages AS lien, spip_auteurs_messages AS lien2 ". + "WHERE lien.id_auteur=$connect_id_auteur AND lien2.id_auteur = $id_auteur AND statut='publie' AND type='normal' AND rv='oui' AND lien.id_message=messages.id_message AND lien2.id_message=messages.id_message AND messages.date_heure > DATE_SUB(NOW(), INTERVAL 1 DAY)"; +afficher_messages(_T('info_vos_rendez_vous'), $query_message, false, false); + + + fin_page(); ?> diff --git a/ecrire/breves.php3 b/ecrire/breves.php3 index 76dfa1cbe1..7ea992fd2f 100644 --- a/ecrire/breves.php3 +++ b/ecrire/breves.php3 @@ -30,19 +30,7 @@ function enfant($leparent){ $descriptif=$row['descriptif']; $texte=$row['texte']; - debut_cadre_enfonce(); - - echo "<a href='naviguer.php3?coll=$id_rubrique'>"; - echo "<IMG SRC='img_pack/secteur-24.gif' WIDTH=24 HEIGHT=24 BORDER=0 align='middle'>"; - echo "</a>"; - if (acces_restreint_rubrique($id_rubrique)) - echo " <img src='img_pack/admin-12.gif' alt='' width='12' height='12' title='"._T('info_administrer_rubriques')."' border='0' align='middle'>"; - - echo " <FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3>"; - echo "<B>$titre</B></FONT>\n"; - echo aide ("breves"); - - echo "<p>"; + debut_cadre_enfonce("secteur-24.gif", false, '', $titre.aide ("breves")); if ($GLOBALS['connect_statut'] == "0minirezo") $statuts = "'prop', 'refuse', 'publie'"; else $statuts = "'prop', 'publie'"; diff --git a/ecrire/brouteur.php3 b/ecrire/brouteur.php3 index 1a77a800cc..cce3103558 100644 --- a/ecrire/brouteur.php3 +++ b/ecrire/brouteur.php3 @@ -2,10 +2,6 @@ include ("inc.php3"); -debut_page(_T('titre_page_articles_tous'), "asuivre", "tout-site"); - -echo "<div> </div>"; - if ($spip_ecran == "large") { $largeur_table = 974; $hauteur_table = 400; @@ -17,7 +13,10 @@ echo "<div> </div>"; } $largeur_col = round($largeur_table/$nb_col); - + +debut_page(_T('titre_page_articles_tous'), "asuivre", "tout-site", " hauteurFrame($nb_col);"); + +echo "<div> </div>"; echo "<table border='0' cellpadding='0' cellspacing='2' width='$largeur_table'>"; @@ -50,6 +49,9 @@ echo "<div> </div>"; if ($dest[0] > 0 AND $parent = $dest[$nb_col-2]) { // Afficher la hierarchie pour "remonter" echo "<tr><td colspan='$nb_col' style='text-align: $spip_lang_left;'>"; + + echo "<div id='brouteur_hierarchie'>"; // pour calculer hauteur de iframe + $la_rubrique = $dest[0]; $query = "SELECT * FROM spip_rubriques WHERE id_rubrique = $la_rubrique"; @@ -76,6 +78,8 @@ echo "<div> </div>"; $icone = "racine-site-24.gif"; $ret = "<div style='padding-top: 5px; padding-bottom: 5px; padding-$spip_lang_left: 28px; background: url(img_pack/$icone) $spip_lang_left no-repeat;'><a href='brouteur.php3?id_rubrique=$lien'>"._T('info_racine_site')."</a></div><div style='margin-$spip_lang_left: 28px;'>$ret</div>"; echo $ret; + + echo "</div>"; echo "</td></tr>"; } @@ -92,7 +96,7 @@ echo "<div> </div>"; for ($i=0; $i < $nb_col; $i++) { echo "<td valign='top' width='$largeur_col'>"; - echo "<iframe width='100%' id='iframe$i' name='iframe$i' src='brouteur_frame.php3?id_rubrique=".$dest[$i]."&frame=$i' height='$hauteur_table' style='background-color: #eeeeee; border-right: 1px solid white; border-bottom: 1px solid white; border-left: 1px solid #cccccc; border-top: 1px solid #cccccc;'></iframe>"; + echo "<iframe width='100%' id='iframe$i' name='iframe$i' src='brouteur_frame.php3?id_rubrique=".$dest[$i]."&frame=$i' class='iframe-bouteur' height='$hauteur_table'></iframe>"; echo "</td>"; diff --git a/ecrire/brouteur_frame.php3 b/ecrire/brouteur_frame.php3 index c7bfbd447d..7440b073a3 100644 --- a/ecrire/brouteur_frame.php3 +++ b/ecrire/brouteur_frame.php3 @@ -53,13 +53,15 @@ debut_html(); $result=spip_query($query); if (spip_num_rows($result)>0) { echo "<div style='padding-top: 6px;'><b class='verdana2'>"._T("info_breves_valider")."</b></div>"; + echo "<div class='plan-articles'>"; while($row=spip_fetch_array($result)){ $id_breve=$row['id_breve']; $titre = typo($row['titre']); $statut = $row['statut']; $puce = "puce-orange-breve.gif"; - echo "<div style='margin:3px; padding-top: 3px; padding-bottom= 3px; padding-$spip_lang_left: 12px; background: url(img_pack/$puce) $spip_lang_left center no-repeat;'><a href='javascript:window.parent.location=\"breves_voir.php3?id_breve=$id_breve\"' class='arial1'>$titre</a></div>"; + echo "<a class='$statut' href='javascript:window.parent.location=\"breves_voir.php3?id_breve=$id_breve\"'>$titre</a>"; } + echo "</div>"; } } @@ -74,11 +76,11 @@ debut_html(); if ($id_parent == 0) $icone = "secteur-24.gif"; else $icone = "rubrique-24.gif"; - echo "<div style='background-color: #cccccc; margin-bottom: 3px;'>"; + echo "<div style='background-color: #cccccc; border: 1px solid #444444;'>"; icone_horizontale("$titre", "javascript:window.parent.location=\"naviguer.php3?coll=$id_rubrique\"", "$icone",""); echo "</div>"; } else if ($frame == 0) { - echo "<div style='background-color: #cccccc; margin-bottom: 3px;'>"; + echo "<div style='background-color: #cccccc; border: 1px solid #444444;'>"; icone_horizontale(_T('info_racine_site'), "javascript:window.parent.location=\"naviguer.php3\"", "racine-site-24.gif",""); echo "</div>"; } @@ -93,13 +95,15 @@ debut_html(); $titre = typo($row['titre']); $id_parent=$row['id_parent']; + echo "<div class='brouteur_rubrique' onMouseOver=\"changeclass(this, 'brouteur_rubrique_on');\" onMouseOut=\"changeclass(this, 'brouteur_rubrique');\">"; if ($id_parent == '0') { - echo "<div style='margin:3px; padding-top: 5px; padding-bottom: 5px; padding-$spip_lang_left: 28px; background: url(img_pack/secteur-24.gif) $spip_lang_left center no-repeat;'><b class='verdana2'><a href='brouteur_frame.php3?id_rubrique=$ze_rubrique&frame=".($frame+1)."&effacer_suivant=oui' target='iframe".($frame+1)."'>$titre</a></b></div>"; + echo "<div style='background-image: url(img_pack/secteur-24.gif);'><a href='brouteur_frame.php3?id_rubrique=$ze_rubrique&frame=".($frame+1)."&effacer_suivant=oui' target='iframe".($frame+1)."'>$titre</a></div>"; } else { - if ($frame+1 < $nb_col) echo "<div style='margin:3px; padding-top: 5px; padding-bottom: 5px; padding-$spip_lang_left: 28px; background: url(img_pack/rubrique-24.gif) $spip_lang_left center no-repeat;'><b><a href='brouteur_frame.php3?id_rubrique=$ze_rubrique&frame=".($frame+1)."&effacer_suivant=oui' target='iframe".($frame+1)."'>$titre</a></b></div>"; - else echo "<div style='margin:3px; padding-top: 5px; padding-bottom: 5px; padding-$spip_lang_left: 28px; background: url(img_pack/rubrique-24.gif) $spip_lang_left center no-repeat;'><b><a href='javascript:window.parent.location=\"brouteur.php3?id_rubrique=$ze_rubrique\"'>$titre</a></b></div>"; + if ($frame+1 < $nb_col) echo "<div style='background-image: url(img_pack/rubrique-24.gif);'><a href='brouteur_frame.php3?id_rubrique=$ze_rubrique&frame=".($frame+1)."&effacer_suivant=oui' target='iframe".($frame+1)."'>$titre</a></div>"; + else echo "<div style='background-image: url(img_pack/rubrique-24.gif);'><a href='javascript:window.parent.location=\"brouteur.php3?id_rubrique=$ze_rubrique\"'>$titre</a></div>"; } + echo "</div>\n"; } @@ -123,6 +127,7 @@ debut_html(); $result=spip_query($query); if (spip_num_rows($result)>0) { echo "<div style='padding-top: 6px;'><b class='verdana2'>"._T('info_breves_02')."</b></div>"; + echo "<div class='plan-articles'>"; while($row=spip_fetch_array($result)){ $id_breve=$row['id_breve']; $titre = typo($row['titre']); @@ -145,9 +150,15 @@ debut_html(); break; } $puce = "puce-$puce-breve.gif"; - echo "<div style='margin:3px; padding-top: 3px; padding-bottom= 3px; padding-$spip_lang_left: 12px; background: url(img_pack/$puce) $spip_lang_left center no-repeat;'><a href='javascript:window.parent.location=\"breves_voir.php3?id_breve=$id_breve\"' class='arial1'>$titre</a></div>"; + echo "<a class='$statut' href='javascript:window.parent.location=\"breves_voir.php3?id_breve=$id_breve\"'>$titre</a>"; } + echo "</div>"; + + } + + + $query = "SELECT * FROM spip_syndic WHERE id_rubrique='$id_rubrique' AND statut!='refuse' ORDER BY nom_site"; $result=spip_query($query); @@ -181,7 +192,6 @@ debut_html(); if ($frame == 0 AND $id_rubrique==0) { - echo "<hr style='border: 0px; color: #999999; background-color: #999999; height: 2px;'>"; $query = "SELECT articles.id_article, articles.titre, articles.statut FROM spip_articles AS articles, spip_auteurs_articles AS lien WHERE articles.statut = 'prepa' AND articles.id_article = lien.id_article AND lien.id_auteur = $connect_id_auteur GROUP BY id_article ORDER BY articles.date DESC"; $result=spip_query($query); diff --git a/ecrire/calendrier.php3 b/ecrire/calendrier.php3 index f375d2227b..1a156f8781 100644 --- a/ecrire/calendrier.php3 +++ b/ecrire/calendrier.php3 @@ -113,13 +113,13 @@ function afficher_mois($jour_today,$mois_today,$annee_today,$nom_mois){ // rendez-vous personnels - $result_messages=spip_query("SELECT messages.* FROM spip_messages AS messages, spip_auteurs_messages AS lien WHERE ((lien.id_auteur='$connect_id_auteur' AND lien.id_message=messages.id_message) OR messages.type='affich') AND messages.rv='oui' AND messages.date_heure >='$annee_today-$mois_today-1' AND messages.date_heure <= DATE_ADD('$annee_today-$mois_today-1', INTERVAL 1 MONTH) AND messages.statut='publie' GROUP BY messages.id_message ORDER BY messages.date_heure"); + $result_messages=spip_query("SELECT messages.* FROM spip_messages AS messages, spip_auteurs_messages AS lien WHERE ((lien.id_auteur='$connect_id_auteur' AND lien.id_message=messages.id_message) OR messages.type='affich') AND messages.rv='oui' AND messages.date_fin >='$annee_today-$mois_today-1' AND messages.date_heure <= DATE_ADD('$annee_today-$mois_today-1', INTERVAL 1 MONTH) AND messages.statut='publie' GROUP BY messages.id_message ORDER BY messages.date_heure"); while($row=spip_fetch_array($result_messages)){ $id_message=$row['id_message']; $date_heure=$row["date_heure"]; + $date_fin = $row["date_fin"]; $titre=typo($row["titre"]); $type=$row["type"]; - $lejour=journum($row['date_heure']); if ($type=="normal") { $la_couleur = "#02531B"; @@ -137,7 +137,48 @@ function afficher_mois($jour_today,$mois_today,$annee_today,$nom_mois){ $la_couleur="black"; $couleur_fond="#aaaaaa"; } - $les_rv["$lejour"][]="<div style='padding: 2px; margin-top: 2px; background-color: $couleur_fond; border: 1px solid $la_couleur; -moz-border-radius: 3px;' class='arial0'><font color='$la_couleur'><b>".heures($date_heure).":".minutes($date_heure)."</b></font> <a href='message.php3?id_message=$id_message' style='color: black;'>$titre</a></div>"; + + $heure_debut = heures($date_heure); + $minutes_debut = minutes($date_heure); + $jour_debut = journum($date_heure); + $mois_debut = mois($date_heure); + $annee_debut = annee($date_heure); + + // Verifier si debut est mois precedent + $unix_debut = date("U", mktime($heures_debut,$minutes_debut,0,$mois_debut, $jour_debut, $annee_debut)); + $unix_debut_today = date("U", mktime(0,0,0,$mois_today, 1, $annee_today)); + + if ($unix_debut <= $unix_debut_today) { + $jour_debut = 1; + } + + // Verifier si fin est mois suivant + $heure_fin = heures($date_fin); + $minutes_fin = minutes($date_fin); + $jour_fin = journum($date_fin); + $mois_fin = mois($date_fin); + $annee_fin = annee($date_fin); + + if ($heure_fin == 0 AND $minutes_fin == 0) { + $heure_fin = 23; + $minutes_fin = 59; + $jour_fin = $jour_fin-1; + } + + + $unix_fin = date("U", mktime($heures_fin,$minutes_fin,0,$mois_fin, $jour_fin, $annee_fin)); + $unix_fin_today = date("U", mktime(0,0,0,$mois_today+1, 1, $annee_today)); + + if ($unix_fin > $unix_fin_today) { + $jour_fin = 31; + } + + + for ($i = $jour_debut; $i <= $jour_fin; $i++) { + if ($i == $jour_debut) $les_rv["$i"][]="<div style='padding: 2px; margin-top: 2px; background-color: $couleur_fond; border: 1px solid $la_couleur; -moz-border-radius: 3px;' class='arial0'><font color='$la_couleur'><b>".heures($date_heure).":".minutes($date_heure)."</b></font> <a href='message.php3?id_message=$id_message' style='color: black;'>$titre</a></div>"; + else $les_rv["$i"][]="<div style='padding: 2px; margin-top: 2px; background-color: $couleur_fond; border: 1px solid $la_couleur; -moz-border-radius: 3px;' class='arial0'><img src='puce$spip_lang_rtl.gif' border='0'><a href='message.php3?id_message=$id_message' style='color: black;'>$titre</a></div>"; + } + } $activer_messagerie = lire_meta("activer_messagerie"); diff --git a/ecrire/config-contenu.php3 b/ecrire/config-contenu.php3 index a7dfd7f8d3..9f4b3ab41c 100644 --- a/ecrire/config-contenu.php3 +++ b/ecrire/config-contenu.php3 @@ -48,24 +48,19 @@ echo "<input type='hidden' name='changer_config' value='oui'>"; // // Mode de fonctionnement des forums publics // -debut_cadre_relief("forum-interne-24.gif"); +debut_cadre_trait_couleur("forum-interne-24.gif", false, "", _T('info_mode_fonctionnement_defaut_forum_public').aide ("confforums")); $forums_publics=lire_meta("forums_publics"); echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; -echo "<TR><TD BGCOLOR='$couleur_foncee' BACKGROUND='img_pack/rien.gif'><B><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3 COLOR='#FFFFFF'>"._T('info_mode_fonctionnement_defaut_forum_public')."</FONT></B> ".aide ("confforums")."</TD></TR>"; - echo "<TR><TD BACKGROUND='img_pack/rien.gif' ALIGN='$spip_lang_left' class='verdana2'>"; -if ($forums_publics=="non") { - $checked = ' CHECKED'; - $gras = '<b>'; $fingras = '</b>'; -} else { - $checked = ''; - $gras = ''; $fingras = ''; -} -echo "<INPUT$checked TYPE='radio' NAME='forums_publics' VALUE='non' id='forums_non'>"; -echo $gras."<label for='forums_non'>"._T('info_desactiver_forum_public')." - </label>.".$fingras; + + + if ($forums_publics == "non") $block = "'none', 'block'"; + else $block= "'block', 'none'"; + echo bouton_radio("forums_publics", "non", _T('info_desactiver_forum_public'), $forums_publics == "non", "changeVisible(this.checked, 'config-options', $block);"); + + echo "</TD></TR>"; echo "<TR><TD BACKGROUND='img_pack/rien.gif' class='verdana2'>"; @@ -74,52 +69,32 @@ echo "</TD></TR>"; echo "<TR><TD BACKGROUND='img_pack/rien.gif' ALIGN='$spip_lang_left' class='verdana2'>"; -if ($forums_publics=="posteriori") { - $checked = ' CHECKED'; - $gras = '<b>'; $fingras = '</b>'; -} else { - $checked = ''; - $gras = ''; $fingras = ''; -} -echo "<INPUT TYPE='radio'$checked NAME='forums_publics' VALUE='posteriori' id='forums_posteriori'>"; -echo " $gras<label for='forums_posteriori'>"._T('bouton_radio_publication_immediate')."</label>$fingras\n<br>"; - -if ($forums_publics=="priori") { - $checked = ' CHECKED'; - $gras = '<b>'; $fingras = '</b>'; -} else { - $checked = ''; - $gras = ''; $fingras = ''; -} -echo "<INPUT TYPE='radio'$checked NAME='forums_publics' VALUE='priori' -id='forums_priori'>"; -echo " $gras<label for='forums_priori'>"._T('bouton_radio_moderation_priori')."</label>$fingras "; - -if (tester_mail()){ - echo "\n<BR>"; - if ($forums_publics=="abo") { - $checked = ' CHECKED'; - $gras = '<b>'; $fingras = '</b>'; - } else { - $checked = ''; - $gras = ''; $fingras = ''; + + if ($forums_publics == "posteriori") $block = "'none', 'block'"; + else $block= "'block', 'none'"; + echo bouton_radio("forums_publics", "posteriori", _T('bouton_radio_publication_immediate'), $forums_publics == "posteriori", "changeVisible(this.checked, 'config-options', $block);"); + echo "<br />"; + if ($forums_publics == "priori") $block = "'none', 'block'"; + else $block= "'block', 'none'"; + echo bouton_radio("forums_publics", "priori", _T('bouton_radio_moderation_priori'), $forums_publics == "priori", "changeVisible(this.checked, 'config-options', $block);"); + + if (tester_mail()) { + echo "<br />"; + if ($forums_publics == "abo") $block = "'none', 'block'"; + else $block= "'block', 'none'"; + echo bouton_radio("forums_publics", "abo", _T('bouton_radio_enregistrement_obligatoire'), $forums_publics == "abo", "changeVisible(this.checked, 'config-options', $block);"); } - echo "<INPUT TYPE='radio'$checked NAME='forums_publics' VALUE='abo' id='forums_abonnement'>"; - echo " $gras<label for='forums_abonnement'>"._T('bouton_radio_enregistrement_obligatoire')."</label>$fingras "; -} echo "</TD></TR>\n"; echo "<TR><TD BACKGROUND='img_pack/rien.gif' ALIGN='$spip_lang_left' class='verdana2'>"; if ($options == 'avancees') { - echo "<ul><table width='100%' cellpadding='2' border='0' class='hauteur'>\n"; - echo "<tr><td width='100%' bgcolor='#FFCC66'>\n"; - echo "<font face='Verdana,Arial,Sans,sans-serif' size='2' color='#333333'><b>\n"; - echo bouton_block_invisible('forum'); - echo _T('info_options_avancees'); - echo "</b></font></td></tr></table>"; - echo debut_block_invisible('forum'); + echo "<div id='config-options' class='display_au_chargement'>"; + echo "<ul>"; + + debut_cadre_relief("", false, "", _T('info_options_avancees')); + echo "<table width='100%' cellpadding='2' border='0' class='hauteur'>\n"; echo "<tr><td class='verdana2'>"; echo _T('info_appliquer_choix_moderation')."<br>"; @@ -130,9 +105,11 @@ if ($options == 'avancees') { echo " <label for='forums_appliquer_saufnon'>"._T('bouton_radio_articles_tous_sauf_forum_desactive')."</label><br>"; echo "<INPUT TYPE='radio' NAME='forums_publics_appliquer' VALUE='tous' id='forums_appliquer_tous'>"; echo " <label for='forums_appliquer_tous'>"._T('bouton_radio_articles_tous')."</label><br>"; - echo "</TD></TR></table>\n"; - echo fin_block(); - echo "</ul>"; + echo "</TD></TR></table>"; + fin_cadre_relief(); + echo "</ul>\n"; + + echo "</div>"; } else { echo "<input type='hidden' name='forums_publics_appliquer' value='tous'>"; @@ -144,7 +121,7 @@ echo "<INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS echo "</TD></TR>"; echo "</TABLE>\n"; -fin_cadre_relief(); +fin_cadre_trait_couleur(); echo "<p>"; @@ -154,7 +131,7 @@ echo "<p>"; // if ($options == "avancees") { - debut_cadre_relief("messagerie-24.gif"); + debut_cadre_trait_couleur("messagerie-24.gif"); $activer_messagerie = lire_meta("activer_messagerie"); $activer_imessage = lire_meta("activer_imessage"); @@ -188,7 +165,7 @@ if ($options == "avancees") { echo "</TD></TR>"; echo "</TABLE>\n"; - fin_cadre_relief(); + fin_cadre_trait_couleur(); echo "<p>"; } @@ -198,14 +175,11 @@ if ($options == "avancees") { // if ($options == "avancees") { - debut_cadre_relief("redacteurs-24.gif"); + debut_cadre_trait_couleur("redacteurs-24.gif", false, "", _T('info_inscription_automatique')); $accepter_inscriptions=lire_meta("accepter_inscriptions"); echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; - echo "<TR><TD BGCOLOR='$couleur_foncee' BACKGROUND='img_pack/rien.gif'><B><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3 COLOR='#FFFFFF'>"; - echo _T('info_inscription_automatique')."</FONT></B> </TD></TR>"; - echo "<TR><TD BACKGROUND='img_pack/rien.gif' class='verdana2'>"; echo _T('info_question_inscription_nouveaux_redacteurs')."</i></blockquote>"; echo "</TD></TR>"; @@ -222,7 +196,7 @@ if ($options == "avancees") { echo "</TD></TR>"; echo "</TABLE>\n"; - fin_cadre_relief(); + fin_cadre_trait_couleur(); echo "<p>"; } @@ -231,22 +205,18 @@ if ($options == "avancees") { // Activer/desactiver mails automatiques // if (tester_mail()) { - debut_cadre_relief(); + debut_cadre_trait_couleur("", false, "", _T('info_envoi_email_automatique').aide ("confmails")); $prevenir_auteurs=lire_meta("prevenir_auteurs"); echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; - echo "<TR><TD BGCOLOR='$couleur_foncee' BACKGROUND='img_pack/rien.gif'><B><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3 COLOR='#FFFFFF'>"._T('info_envoi_email_automatique')."</FONT></B> ".aide ("confmails")."</TD></TR>"; echo "<TR><TD BACKGROUND='img_pack/rien.gif' class='verdana2'>"; echo "<blockquote><i>"._T('info_hebergeur_desactiver_envoi_email')."</i></blockquote>"; - echo "</TD></TR>"; - - echo "<TR><TD> </TD></TR>"; - - echo "<TR><TD BGCOLOR='#EEEECC' BACKGROUND='img_pack/rien.gif'><B><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3>"; - echo _T('info_envoi_forum')."</FONT></B></TD></TR>"; + echo "</TD></TR></table>"; + debut_cadre_relief("", false, "", _T('info_envoi_forum')); + echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; echo "<TR><TD BACKGROUND='img_pack/rien.gif' class='verdana2'>"; echo _T('info_option_email'); echo "</TD></TR>"; @@ -255,7 +225,8 @@ if (tester_mail()) { afficher_choix('prevenir_auteurs', $prevenir_auteurs, array('oui' => _T('info_option_faire_suivre'), 'non' => _T('info_option_ne_pas_faire_suivre'))); - echo "</TD></TR>\n"; + echo "</TD></TR></table>\n"; + fin_cadre_relief(); // // Suivi editorial (articles proposes & publies) @@ -265,36 +236,37 @@ if (tester_mail()) { $adresse_suivi=lire_meta("adresse_suivi"); $adresse_suivi_inscription=lire_meta("adresse_suivi_inscription"); - echo "<TR><TD> </TD></TR>"; - echo "<TR><TD BGCOLOR='#EEEECC' BACKGROUND='img_pack/rien.gif'><B><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3>"; - echo _T('info_suivi_activite')."</FONT></B></TD></TR>"; + echo "<p />"; + debut_cadre_relief("", false, "", _T('info_suivi_activite')); + echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; echo "<TR><TD BACKGROUND='img_pack/rien.gif' class='verdana2'>"; echo _T('info_facilite_suivi_activite')."</FONT>"; - echo "</TD></TR>"; + echo "</TD></TR></table>"; + echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; echo "<TR><TD BACKGROUND='img_pack/rien.gif' ALIGN='$spip_lang_left' class='verdana2'>"; - if ($suivi_edito!="oui"){ - echo "<INPUT TYPE='radio' NAME='suivi_edito' VALUE='oui' id='suivi_edito_on'>"; - echo " <label for='suivi_edito_on'>"._T('bouton_radio_envoi_annonces')."</label> "; - echo "<BR><INPUT TYPE='radio' NAME='suivi_edito' VALUE='non' CHECKED id='suivi_edito_off'>"; - echo " <B><label for='suivi_edito_off'>"._T('bouton_radio_non_envoi_annonces')."</label></B>"; - }else{ - echo "<INPUT TYPE='radio' NAME='suivi_edito' VALUE='oui' id='suivi_edito_on' CHECKED>"; - echo " <B><label for='suivi_edito_on'>"._T('bouton_radio_envoi_annonces_adresse')."</label></B> "; - echo "<input type='text' name='adresse_suivi' value='$adresse_suivi' size='30' CLASS='fondl'>"; + echo bouton_radio("suivi_edito", "oui", _T('bouton_radio_envoi_annonces_adresse'), $suivi_edito == "oui", "changeVisible(this.checked, 'config-edito', 'block', 'none');"); + + + if ($suivi_edito == "oui") $style = "display: block;"; + else $style = "display: none;"; + echo "<div id='config-edito' style='$style'>"; + echo "<div style='text-align: center;'><input type='text' name='adresse_suivi' value='$adresse_suivi' size='30' CLASS='fondl'></div>"; echo "<blockquote class='spip'>"; if (!$adresse_suivi) $adresse_suivi = "mailing@monsite.net"; echo _T('info_config_suivi', array('adresse_suivi' => $adresse_suivi)); echo "<br><input type='text' name='adresse_suivi_inscription' value='$adresse_suivi_inscription' size='50' CLASS='fondl'>"; echo "</blockquote>"; + echo "</div>"; - echo "<BR><INPUT TYPE='radio' NAME='suivi_edito' VALUE='non' id='suivi_edito_off'>"; - echo " <label for='suivi_edito_off'>"._T('bouton_radio_non_envoi_annonces_editoriales')."</label> "; - } - echo "</TD></TR>\n"; + echo "<br />"; + echo bouton_radio("suivi_edito", "non", _T('bouton_radio_non_envoi_annonces_editoriales'), $suivi_edito == "non", "changeVisible(this.checked, 'config-edito', 'none', 'block');"); + + echo "</TD></TR></table>\n"; + fin_cadre_relief(); // // Annonce des nouveautes @@ -308,54 +280,60 @@ if (tester_mail()) { ecrire_metas(); } - echo "<TR><TD> </TD></TR>"; - echo "<TR><TD BGCOLOR='#EEEECC' BACKGROUND='img_pack/rien.gif'><B><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3>"; - echo _T('info_annonce_nouveautes')."</FONT></B></TD></TR>"; + echo "<p />"; + debut_cadre_relief("", false, "", _T('info_annonce_nouveautes')); + echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; echo "<TR><TD BACKGROUND='img_pack/rien.gif' class='verdana2'>"; echo _T('info_non_envoi_annonce_dernieres_nouveautes'); echo "</TD></TR>"; echo "<TR><TD BACKGROUND='img_pack/rien.gif' ALIGN='$spip_lang_left' class='verdana2'>"; - if ($quoi_de_neuf != "oui") { - echo "<INPUT TYPE='radio' NAME='quoi_de_neuf' VALUE='oui' id='quoi_de_neuf_on'>"; - echo " <label for='quoi_de_neuf_on'>"._T('bouton_radio_envoi_liste_nouveautes')."</label> "; - echo "<BR><INPUT TYPE='radio' NAME='quoi_de_neuf' VALUE='non' CHECKED id='quoi_de_neuf_off'>"; - echo " <B><label for='quoi_de_neuf_off'>"._T('bouton_radio_non_envoi_liste_nouveautes')."</label></B> "; - } - else { - echo "<INPUT TYPE='radio' NAME='quoi_de_neuf' VALUE='oui' id='quoi_de_neuf_on' CHECKED>"; - echo " <B><label for='quoi_de_neuf_on'>"._T('bouton_radio_envoi_liste_nouveautes')."</label></B> "; + echo bouton_radio("quoi_de_neuf", "oui", _T('bouton_radio_envoi_liste_nouveautes'), $quoi_de_neuf == "oui", "changeVisible(this.checked, 'config-neuf', 'block', 'none');"); + // echo "<INPUT TYPE='radio' NAME='quoi_de_neuf' VALUE='oui' id='quoi_de_neuf_on' CHECKED>"; + // echo " <B><label for='quoi_de_neuf_on'>"._T('bouton_radio_envoi_liste_nouveautes')."</label></B> "; + + if ($quoi_de_neuf == "oui") $style = "display: block;"; + else $style = "display: none;"; + echo "<div id='config-neuf' style='$style'>"; echo "<UL>"; echo "<LI>"._T('info_adresse')." <input type='text' name='adresse_neuf' value='$adresse_neuf' size='30' CLASS='fondl'>"; echo "<LI>"._T('info_tous_les')." <input type='text' name='jours_neuf' value='$jours_neuf' size='4' CLASS='fondl'> "._T('info_jours'); echo " <INPUT TYPE='submit' NAME='envoi_now' VALUE='"._T('info_envoyer_maintenant')."' CLASS='fondl'>"; echo "</UL>"; - echo "<BR><INPUT TYPE='radio' NAME='quoi_de_neuf' VALUE='non' id='quoi_de_neuf_off'>"; - echo " <label for='quoi_de_neuf_off'>"._T('info_non_envoi_liste_nouveautes')."</label> "; - } - echo "</TD></TR>\n"; + echo "</div>"; + + echo "<br />"; + echo bouton_radio("quoi_de_neuf", "non", _T('info_non_envoi_liste_nouveautes'), $quoi_de_neuf == "non", "changeVisible(this.checked, 'config-neuf', 'none', 'block');"); + //echo "<BR><INPUT TYPE='radio' NAME='quoi_de_neuf' VALUE='non' id='quoi_de_neuf_off'>"; + //echo " <label for='quoi_de_neuf_off'>"._T('info_non_envoi_liste_nouveautes')."</label> "; + + + + echo "</TD></TR></table>\n"; + fin_cadre_relief(); if($options == "avancees") { $email_envoi = entites_html(lire_meta("email_envoi")); - echo "<TR><TD> </TD></TR>"; - echo "<TR><TD BGCOLOR='#EEEECC' BACKGROUND='img_pack/rien.gif'><B><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3 COLOR='#000000'>"; - echo _T('info_email_envoi')."</FONT></B></TD></TR>"; - + echo "<p />"; + debut_cadre_relief("", false, "", _T('info_email_envoi')); + echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; echo "<TR><TD BACKGROUND='img_pack/rien.gif' class='verdana2'>"; echo _T('info_email_envoi_txt'); echo " <input type='text' name='email_envoi' value=\"$email_envoi\" size='20' CLASS='fondl'>"; echo "</TD></TR>"; - echo "<TR><TD> </TD></TR>"; + echo "<TR><TD> </TD></TR></table>"; + fin_cadre_relief(); } + echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; echo "<TR><td style='text-align:$spip_lang_right;'>"; echo "<INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS='fondo'>"; echo "</TD></TR>"; echo "</TABLE>\n"; - fin_cadre_relief(); + fin_cadre_trait_couleur(); } diff --git a/ecrire/configuration.php3 b/ecrire/configuration.php3 index ba8455769c..ea2bb1a5af 100644 --- a/ecrire/configuration.php3 +++ b/ecrire/configuration.php3 @@ -59,7 +59,7 @@ avertissement_config(); echo "<form action='configuration.php3' method='post'>"; echo "<input type='hidden' name='changer_config' value='oui'>"; -debut_cadre_relief("racine-24.gif"); +debut_cadre_trait_couleur("racine-site-24.gif"); $nom_site = entites_html(lire_meta("nom_site")); $adresse_site = entites_html(lire_meta("adresse_site")); @@ -94,7 +94,7 @@ debut_cadre_relief("racine-24.gif"); echo "</TD></TR>"; echo "</TABLE>"; -fin_cadre_relief(); +fin_cadre_trait_couleur(); echo "<p> <p>"; @@ -104,17 +104,14 @@ echo "<p> <p>"; // if ($options == 'avancees') { - debut_cadre_enfonce("article-24.gif"); + debut_cadre_trait_couleur("article-24.gif", false, "", _T('titre_les_articles')); - echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; - echo "<TR><TD BGCOLOR='$couleur_foncee' BACKGROUND='img_pack/rien.gif' COLSPAN=2><B><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3 COLOR='#FFFFFF'>"._T('titre_les_articles')."</FONT></B></TD></TR>"; - echo "</table>"; // // Champs optionnels des articles // - debut_cadre_relief(); + debut_cadre_relief("", false, "", _T('info_contenu_articles').aide ("confart")); $articles_surtitre = lire_meta("articles_surtitre"); $articles_soustitre = lire_meta("articles_soustitre"); @@ -125,7 +122,6 @@ if ($options == 'avancees') { $articles_urlref = lire_meta("articles_urlref"); echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; - echo "<TR><TD BGCOLOR='#EEEECC' BACKGROUND='img_pack/rien.gif' COLSPAN=2><B><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3 COLOR='black'>"._T('info_contenu_articles')."</FONT></B>".aide ("confart")."</TD></TR>"; echo "<TR><TD BACKGROUND='img_pack/rien.gif' COLSPAN='2' class='verdana2'>"; echo _T('texte_contenu_articles'); @@ -205,13 +201,11 @@ if ($options == 'avancees') { // Articles post-dates // - debut_cadre_relief(); + debut_cadre_relief("", false, "", _T('titre_publication_articles_post_dates').aide ("confdates")); $post_dates = lire_meta("post_dates"); echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; - echo "<TR><TD BGCOLOR='#EEEECC' BACKGROUND='img_pack/rien.gif'><B><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3 COLOR='black'>"._T('titre_publication_articles_post_dates')."</FONT></B> ".aide ("confdates")."</TD></TR>"; - echo "<TR><TD class='verdana2'>"; echo _T('texte_publication_articles_post_dates'); echo "</TD></TR>"; @@ -228,10 +222,11 @@ if ($options == 'avancees') { echo "</TABLE>\n"; fin_cadre_relief(); + + fin_cadre_trait_couleur(); } -if ($options == "avancees") fin_cadre_enfonce(); echo "<p>"; @@ -240,14 +235,11 @@ echo "<p>"; // Actives/desactiver les breves // -debut_cadre_relief("breve-24.gif"); +debut_cadre_trait_couleur("breve-24.gif", false, "", _T('titre_breves').aide ("confbreves")); $activer_breves = lire_meta("activer_breves"); echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; -echo "<TR><TD BGCOLOR='$couleur_foncee' BACKGROUND='img_pack/rien.gif'><B><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3 COLOR='#FFFFFF'>"; -echo _T('titre_breves')."</FONT></B> ".aide ("confbreves")."</TD></TR>"; - echo "<TR><TD class='verdana2'>"; echo _T('texte_breves')."<p>"; echo _T('info_breves'); @@ -265,7 +257,7 @@ echo "<INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS echo "</TD></TR>"; echo "</TABLE>\n"; -fin_cadre_relief(); +fin_cadre_trait_couleur(); echo "<p>"; @@ -276,7 +268,7 @@ echo "<p>"; if ($options == "avancees") { - debut_cadre_relief("mot-cle-24.gif"); + debut_cadre_trait_couleur("mot-cle-24.gif", false, "", _T('info_mots_cles')); $articles_mots = lire_meta("articles_mots"); $config_precise_groupes = lire_meta("config_precise_groupes"); @@ -284,8 +276,6 @@ if ($options == "avancees") { $forums_publics = lire_meta("forums_publics"); echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; - echo "<TR><TD BGCOLOR='$couleur_foncee' BACKGROUND='img_pack/rien.gif'><B><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3 COLOR='#FFFFFF'>"._T('info_mots_cles')."</FONT></B> </TD></TR>"; - echo "<TR><TD class='verdana2'>"; echo _T('texte_mots_cles')."<p>"; echo _T('info_question_mots_cles'); @@ -293,17 +283,27 @@ if ($options == "avancees") { echo "<TR>"; echo "<TD align='center' class='verdana2'>"; - afficher_choix('articles_mots', $articles_mots, - array('oui' => _T('item_utiliser_mots_cles'), - 'non' => _T('item_non_utiliser_mots_cles')), " "); - echo "</FONT>"; - echo "</TD></TR>"; - if ($articles_mots != "non") { - echo "<TR><TD> </TD></TR>"; - echo "<TR><TD BGCOLOR='#EEEECC' BACKGROUND='img_pack/rien.gif'><B><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3 COLOR='#000000'>"._T('titre_config_groupe_mots_cles')."</FONT></B></TD></TR>"; + echo bouton_radio("articles_mots", "oui", _T('item_utiliser_mots_cles'), $articles_mots == "oui", "changeVisible(this.checked, 'mots-config', 'block', 'none');"); + echo " "; + echo bouton_radio("articles_mots", "non", _T('item_non_utiliser_mots_cles'), $articles_mots == "non", "changeVisible(this.checked, 'mots-config', 'none', 'block');"); + +// afficher_choix('articles_mots', $articles_mots, +// array('oui' => _T('item_utiliser_mots_cles'), +// 'non' => _T('item_non_utiliser_mots_cles')), "<br />"); + echo "</TD></TR></table>"; + + if ($articles_mots != "non") $style = "display: block;"; + else $style = "display: none;"; + + echo "<div id='mots-config' style='$style'>"; + + echo "<p />"; + debut_cadre_relief("", false, "", _T('titre_config_groupe_mots_cles')); + + echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; echo "<TR><TD class='verdana2'>"; echo _T('texte_config_groupe_mots_cles'); echo "</TD></TR>"; @@ -313,12 +313,13 @@ if ($options == "avancees") { afficher_choix('config_precise_groupes', $config_precise_groupes, array('oui' => _T('item_utiliser_config_groupe_mots_cles'), 'non' => _T('item_non_utiliser_config_groupe_mots_cles'))); - echo "</TD></TR>"; + echo "</TD></TR></table>"; + fin_cadre_relief(); if ($forums_publics != "non"){ - echo "<TR><TD> </TD></TR>"; - echo "<TR><TD BGCOLOR='#EEEECC' BACKGROUND='img_pack/rien.gif'><B><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3 COLOR='#000000'>"._T('titre_mots_cles_dans_forum')."</FONT></B></TD></TR>"; - + echo "<p />"; + debut_cadre_relief("", false, "", _T('titre_mots_cles_dans_forum')); + echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; echo "<TR><TD class='verdana2'>"; echo _T('texte_mots_cles_dans_forum'); echo "</TD></TR>"; @@ -330,15 +331,19 @@ if ($options == "avancees") { 'non' => _T('item_non_ajout_mots_cles'))); echo "</FONT>"; echo "</TD></TR>"; + echo "</table>"; + fin_cadre_relief(); } - } + echo "</div>"; + + echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; echo "<TR><td style='text-align:$spip_lang_right;'>"; echo "<INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS='fondo'>"; echo "</TD></TR>"; echo "</TABLE>\n"; - fin_cadre_relief(); + fin_cadre_trait_couleur(); echo "<p>"; } @@ -348,7 +353,7 @@ if ($options == "avancees") { // Actives/desactiver systeme de syndication // -debut_cadre_enfonce("site-24.gif"); +debut_cadre_trait_couleur("site-24.gif", false, "", _T('titre_referencement_sites').aide ("reference")); $activer_sites = lire_meta('activer_sites'); $activer_syndic = lire_meta("activer_syndic"); @@ -357,91 +362,104 @@ $visiter_sites = lire_meta("visiter_sites"); $moderation_sites = lire_meta("moderation_sites"); echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; -echo "<TR><TD BGCOLOR='$couleur_foncee' BACKGROUND='img_pack/rien.gif'><B><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3 COLOR='#FFFFFF'>"._T('titre_referencement_sites')."</FONT></B>".aide ("reference")."</TD></TR>"; - echo "<TR><TD BACKGROUND='img_pack/rien.gif' ALIGN='$spip_lang_left' class='verdana2'>"; -afficher_choix('activer_sites', $activer_sites, - array('oui' => _T('item_gerer_annuaire_site_web'), - 'non' => _T('item_non_gerer_annuaire_site_web'))); -echo "</TD></TR>\n"; + echo bouton_radio("activer_sites", "oui", _T('item_gerer_annuaire_site_web'), $activer_sites == "oui", "changeVisible(this.checked, 'config-site', 'block', 'none');"); + echo " "; + echo bouton_radio("activer_sites", "non", _T('item_non_gerer_annuaire_site_web'), $activer_sites == "non", "changeVisible(this.checked, 'config-site', 'none', 'block');"); +echo "</TD></TR></table>\n"; -if ($activer_sites != 'non') { - // + + +if ($activer_sites != 'non') $style = "display: block;"; +else $style = "display: none;"; + + echo "<div id='config-site' style='$style'>"; + // Utilisateurs autorises a proposer des sites references // - if ($options == "avancees") { + echo "<p />"; + debut_cadre_relief(); + echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; echo "<TR><TD BACKGROUND='img_pack/rien.gif'>"; echo "<FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=2 COLOR='#000000'>"; - echo "<hr><p>"._T('info_question_proposer_site'); + echo _T('info_question_proposer_site'); echo "<center><SELECT NAME='proposer_sites' CLASS='fondo' SIZE=1>\n"; echo "<OPTION".mySel('0',$proposer_sites).">"._T('item_choix_administrateurs')."\n"; echo "<OPTION".mySel('1',$proposer_sites).">"._T('item_choix_redacteurs')."\n"; echo "<OPTION".mySel('2',$proposer_sites).">"._T('item_choix_visiteurs')."\n"; echo "</SELECT></center><P>\n"; echo "</FONT>"; - echo "</TD></TR>"; - } + echo "</TD></TR></table>"; + fin_cadre_relief(); - echo "</TABLE>\n"; - - debut_cadre_relief(); - - echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; - - echo "<TR><TD BGCOLOR='EEEECC' BACKGROUND='img_pack/rien.gif'><B><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3 COLOR='#000000'>"._T('titre_syndication')."</FONT></B> ".aide ("rubsyn")."</TD></TR>"; - // - // Reglage de la syndication - // - echo "<TR><TD BACKGROUND='img_pack/rien.gif' class='verdana2'>"; - echo _T('texte_syndication'); - echo "</TD></TR>"; - - echo "<TR><TD BACKGROUND='img_pack/rien.gif' ALIGN='$spip_lang_left' class='verdana2'>"; - afficher_choix('activer_syndic', $activer_syndic, - array('oui' => _T('item_utiliser_syndication'), - 'non' => _T('item_non_utiliser_syndication'))); + if ($options == "avancees") { + debut_cadre_relief("", false, "", _T('titre_syndication').aide ("rubsyn")); + + echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; + // + // Reglage de la syndication + // + echo "<TR><TD BACKGROUND='img_pack/rien.gif' class='verdana2'>"; + echo _T('texte_syndication'); + echo "</TD></TR>"; + + echo "<TR><TD BACKGROUND='img_pack/rien.gif' ALIGN='$spip_lang_left' class='verdana2'>"; - if ($activer_syndic != "non" AND $options == "avancees") { - // Moderation par defaut des sites syndiques - echo "<p><hr><p align='$spip_lang_left'>"; - echo _T('texte_liens_sites_syndiques')."<p>"; + echo bouton_radio("activer_syndic", "oui", _T('item_utiliser_syndication'), $activer_syndic == "oui", "changeVisible(this.checked, 'config-syndic', 'block', 'none');"); + echo "<br />"; + echo bouton_radio("activer_syndic", "non", _T('item_non_utiliser_syndication'), $activer_syndic == "non", "changeVisible(this.checked, 'config-syndic', 'none', 'block');"); - afficher_choix('moderation_sites', $moderation_sites, - array('oui' => _T('item_bloquer_liens_syndiques'), - 'non' => _T('item_non_bloquer_liens_syndiques'))); - // Si indexation, activer/desactiver pages recuperees - $activer_moteur = lire_meta("activer_moteur"); - if ($activer_moteur == "oui") { + + if ($activer_syndic != "non") $style = "display: block;"; + else $style = "display: none;"; + + echo "<div id='config-syndic' style='$style'>"; + + // Moderation par defaut des sites syndiques echo "<p><hr><p align='$spip_lang_left'>"; - echo _T('texte_utilisation_moteur_syndiques')." "; - echo "<blockquote><i>"._T('texte_utilisation_moteur_syndiques_2')."</i></blockquote><p>"; - - afficher_choix('visiter_sites', $visiter_sites, - array('non' => _T('item_limiter_recherche'), - 'oui' => _T('item_non_limiter_recherche'))); - } + echo _T('texte_liens_sites_syndiques')."<p>"; + + afficher_choix('moderation_sites', $moderation_sites, + array('oui' => _T('item_bloquer_liens_syndiques'), + 'non' => _T('item_non_bloquer_liens_syndiques'))); + + // Si indexation, activer/desactiver pages recuperees + + $activer_moteur = lire_meta("activer_moteur"); + if ($activer_moteur == "oui") { + echo "<p><hr><p align='$spip_lang_left'>"; + echo _T('texte_utilisation_moteur_syndiques')." "; + echo "<blockquote><i>"._T('texte_utilisation_moteur_syndiques_2')."</i></blockquote><p>"; + + afficher_choix('visiter_sites', $visiter_sites, + array('non' => _T('item_limiter_recherche'), + 'oui' => _T('item_non_limiter_recherche'))); + } + echo "</div>"; + + echo "</TD></TR>\n"; + + echo "</TABLE>\n"; + + fin_cadre_relief(); } - echo "</TD></TR>\n"; + echo "</div>"; - echo "</TABLE>\n"; - fin_cadre_relief(); - - echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; -} +echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; echo "<TR><td style='text-align:$spip_lang_right;'>"; echo "<INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS='fondo'>"; echo "</TD></TR>"; echo "</TABLE>\n"; -fin_cadre_enfonce(); +fin_cadre_trait_couleur(); echo "<p>"; @@ -450,13 +468,12 @@ echo "<p>"; // Gestion des documents joints // -debut_cadre_relief("doc-24.gif"); +debut_cadre_trait_couleur("doc-24.gif", false, "", _T('titre_documents_joints')); $documents_rubrique = lire_meta("documents_rubrique"); $documents_article = lire_meta("documents_article"); echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; -echo "<TR><TD BGCOLOR='$couleur_foncee' BACKGROUND='img_pack/rien.gif'><B><FONT FACE='Verdana,Arial,Sans,sans-serif' SIZE=3 COLOR='#FFFFFF'>"._T('titre_documents_joints')."</FONT></B> </TD></TR>"; echo "<TR><TD class='verdana2'>"; echo _T('texte_documents_joints'); @@ -480,7 +497,7 @@ echo "<INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS echo "</TD></TR>"; echo "</TABLE>\n"; -fin_cadre_relief(); +fin_cadre_trait_couleur(); echo "<p>"; diff --git a/ecrire/forum.php3 b/ecrire/forum.php3 index a0f06317bf..ed0119e8dd 100644 --- a/ecrire/forum.php3 +++ b/ecrire/forum.php3 @@ -13,6 +13,9 @@ if ($admin=='oui') { $urlforum = 'forum.php3'; } +// Afficher onglet si admin et forum_admin actif +if ($connect_statut == "0minirezo" AND lire_meta('forum_prive_admin') == 'oui') barre_onglets("forums", $statutforum); + debut_gauche(); diff --git a/ecrire/img_pack/admin-12.gif b/ecrire/img_pack/admin-12.gif index 5b93b97f2d9738391e84b85fa9a0d3450461a833..64634fcf17c7cae8800d4c88a83985cfe9aaecdc 100644 GIT binary patch literal 152 zcmV;J0B8S4Nk%w1VGIBa0J9GOx7h*7;4<~~^V8&L$jHdY$*Q%rut`ZtCMG6wa&nN6 zjp6H*+2EP>_}uF7ukP;dA^8LW000jFEC2ui01N;O000C<@JVxOA~L5_1~Z6}5yt|Y zK!FGnhn_*gJ_qxjiqaN$j6IvdONF5*1dhR=K}aA72-`wHZ3tC{S0I2Ily0{I7mQj& G0028)z&^eJ literal 143 zcmZ?wbhEHb<YC}pc+9}Ca(NFM8{6^Y$KJku`|rEn-Me?UZCn5Bmh`h{&#qj#vUiQt z$-_#$y<PudK=CIFBNqcdgAM}_fXrZEvH5V)^EI<$ge4QFYbuLe;e-PrLOR@b9UFEz q96IZj&=T}=F4H~b4IBnc4i7ITOfWQ=?5G&%;L|$Cu}p}O!5RP^Yd$*w diff --git a/ecrire/img_pack/administration-48.gif b/ecrire/img_pack/administration-48.gif deleted file mode 100644 index b36be00137f11a95b45c692bcaff18073c73f56d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1215 zcmV;w1VH;oNk%w1VK4wN0K^{v(ZjQkj*Q~s;>X6r#=5JtqmiScpuD@e<JryL-QA9c zeROYVp_q=|)5g!w&I1Di`uh4HA0AjwM%T-}!LXj@;oE9sTYh?VM?^r}+SglHRW>s) zu&=Gw)z$6m>Ez_(A^8LW0018VEC2ui05AYB000I5;3tk``DIbGZHge6a4gG7Br(gS z4N2nuv!GCeIYa`gK&O+*^nAjoNf2>t7!}6maUD1uOy5f?rFJ%z3Zl`lq>5g!m@E`* zA_tFp0+{$QDFFuqVPkYK0tpx!9(o7}egFgj09qRhUL8;(KQ3i185>_|kN~9w6q5@P z90zhPPfl|&usvrN2>}BQ6REs>sFQB3U=PN}53h*G4-p292Mq)T1q6P4lGX$^#19Z2 zE)EX^gb7m*kB<`@10Eb569ozi4A$4#0B#H%1Ku5993HeHR6@XmMhK5oFfd>O4mS%@ zU7J8)5`_o~3>@(GWTOFo9SS~}IHAFV0~HnjSOBD=-h>XnDo(KQV4t@i8v|%`P$Izt z3P6KxS)j6+g%uYlI9L;j0)UGdy@3;ub7#*E52#TC3SbMX0}D2+B+wuO0tdh(9c6Gc zQ9zxpNF>6_WyJ;zER7ieq=P_*3K<$uLIt3Jh5-J2ytO(a(F00-t_dzM;lcwA4;CyS zfFKR80n-X&Kn%e_f((n}Ha>_DAz%&}Dgbx@XdY}*enL~gpdf+=2N^mTcmS8@YBtE% zKnl>P0__a}E)a-a0iGnF1y~$h;$V12)gpXC9#5%&0}lweU@)K{nrC1IC}daQtx0#{ zj6XOA%D+Da1{7GZ00s*f5C8|j1%}rDQ}SW7T?YfO^__A0B_PfN5@e`hh8RfjfB_LO zV8DnIm=%~{@)Zz)Wdi&YA%5U}kN{R3l*9%k22d0t2Ul>w0Ygo!fuej5&?kTc0~~<Z zgmPh(M{5i{A`poC3<BIEyc9M~kq;c1Bx1$MmBC5rJi?D2BMqlfCJhKlQG8k$nWU01 zQdl8YeMHs(2WgDc+nP51QdoQn@ODs=94wh1ClDI5fIJo`FdHVTw9*F~!2CCjW{7!! zD42`tmw`A~RwF^7gWNSqNs*uu9|gT#K-#Bu7BnMk2ON+<dIkVs1Oo>|Hkf=sv1LI3 zY(a2<kD$iL$(WBAkN}$ea1cTNd=*vnUwj1^8-Pv+{b*pV1&v9G0S#0@Uyf8VKn(*7 z%+oD>8YrMsK*EV=S(vtp<5U|pF~k5y@D@yu0;??W?ME9iL+(}m9J4{N1JLAfGaG0i ztBCv{xvYT;gM<ibD}47ceX@S5^0)9ZoC$;<e>6}?Qw*>HF$P$Wp@AtJHsa4R=SqkZ z!I6_|u5!en0lXK?gX{qt1G2!;RFeao7`FWL#S)vC5WxT!FaS0WqY^Lx2djLcHW*=S zQp*!P7~(Zp0W7eR1{^fvKm`|60rwN0OwmaYUmLIh-VPi9T?Z|OCC1=~#4xcA8H`{v z8fb42IT`CQpn*A-Z;-(}1$S*O#d>>{U|`Oon;r!N7z`}85`A;vx)chqK=TI<C@_Eq d5!^0C*ZLLOTjj!U?!Yi|C-408&>s>406S7z(V+kU diff --git a/ecrire/img_pack/administration-48.png b/ecrire/img_pack/administration-48.png new file mode 100644 index 0000000000000000000000000000000000000000..e9a3e7fe30eb4729bf5c2cdde17cd205bbbdae01 GIT binary patch literal 2829 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 literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/aide-48.gif b/ecrire/img_pack/aide-48.gif deleted file mode 100644 index 02b201ce6ac9c7ed70a2b74d4cd19411b12e560f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 613 zcmV-r0-F6tNk%w1VK4wN0J8u992^`@OjcD>VRdzNf_tBmi?gGnqobX}t)<Vy!Nt9` z<<rjY;^gS$-}V3h|0?KYA^8LW000jFEC2ui05AYB000F3@X1N5y*TU5yZ>OQ83SMf zLn5vZalWU)dIoHt%&Y}>52!jzZ*VvWZi67@Mrbq^3x&~^R8pN$g%(ldy{a>t;;Ai{ z4+w8;R(e6r@NL2M0*2_PcRY?L9A6>~FbG)+P)>-23Vmt-0U<C2g-{6ujc8|hCNeZH z0S#sg28|~K2bnM*FnWdwUIDN#1qfw+o*kM5iVbuD0|Z>J1!a9OIUAm!W({otrdof_ zW(S&&8kz=i3(>P<&BN1;#~7Z9wLAf6QC<Sz#09q)H8Fcy1ns8_Z7A-<;^Z%s)k8o_ z)T;rs;1oLnhJv6{=JrI1Mx@?>Mi(?i)V7UbKZX99>`W+EFH`|9ze;L>$504Fm0FmY zaF(!S8bA~hyntC|0UiQ86@;XqNg&TQ9|ykRBw?R`jTQ+!<9X9W!+pAf8hQei&mR;N z_8sUNN@jp=FcD}9%TQ|r1Si^2-3Nf}Osxyxnve_g-U(|G=9x%ZucI%*?=%U>2?JqG zm2=SYp=Rj?feNGmw0o?T*nt8AGA9`K;Gqp)z&I-;Nbqy$9t0SWF70EcuK@!J6xmGx zcdXheWLscBx3=-x1QLv%ErCIT;>V-=GGJhN2H6P=e2wlyfK=+rg<r?6yf>`Oo?r>^ zE|mcF>ee~PcCP%r{rmXsD__oB!+iSt1r#XYfcwp-!+!`Ss9=9eH0Yob5dZ)?h#dv5 diff --git a/ecrire/img_pack/aide-48.png b/ecrire/img_pack/aide-48.png new file mode 100644 index 0000000000000000000000000000000000000000..c7c90aa5addb19074a647582e2c5c94d1c1edf72 GIT binary patch literal 1725 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 literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/aide-48_rtl.gif b/ecrire/img_pack/aide-48_rtl.gif deleted file mode 100644 index a8951c5713e38f507fbf9776d5380f4b7adfbe6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 620 zcmV-y0+anmNk%w1VK4wN0JHx9z`(%6!Nug?^-fGyl8du~d!MbP&%L$fqn*Rk&hAxH zVdCWIqobpBb#)vZ8~^|SA^8LW00000EC2ui05AYB000F45XecZy*TU5yZ>Og1&w1m z4I{1qbG~Q6dJAly>YN34?+m(2$)-RchPEIDc`6<f34x$+Qv#Sjqv61PO0kZh>oqVS zx@hkq$>O~Vgl#$vg*8|(MSRY$zeNLNdtFgdQc#2jFbg1KF=t$6WCa0;TnPj)ATR}x z2MAO)0}Kgh0)aRls3v+{2AL-VvL*wSgbA7)H7|n)1gHZD1_ceM1p;UZp(ZjLs}7xL z1*i&Kpr{SVrq3I@w4PkQCfNtC)TL>T&>GLZ;R>`*W`P3)ecTw{KXPaUNDZYB5KvHn z4;OVgEHH5wsTeI%<@oUtkjnxYaA=NDdtxxzG6#(RD!5@LF^#__mO4K9Q(>XX1H@<% zK&LVRJ_=+?&KZVHTg{Im-@N3qtN_iIF9J|dr;`t?21C10jIktE(>b7`MSTKqTvb+A z=Rgr~^yi5?6W)Y%B`#Z8g9#9v#d&t^yAuX{zWhgF6~Unc@xC><3ax~$%ov(<s9><u z7YPA;98jRs)mLz$8ZdxGse}b1V>KWkY%8Bvh+|P$u;3$^(ZV)wR=Jtjvlk&hg9Zab zR)Yqej2Q9vdzKH76<7xd;QF|89}RM^2F-wh!{^vvGzcJl`ts_PQ)j=SfC2aJ$w3FG z&Y*I51+s4U_DyLyYxEZGFJI5TzyJU2?ROs;2>R`3;DHDlcprW=Ea>2a5LzMOgcMp3 G0RTI^0RplB diff --git a/ecrire/img_pack/aide-48_rtl.png b/ecrire/img_pack/aide-48_rtl.png new file mode 100644 index 0000000000000000000000000000000000000000..1f9b8757be8ecc788312837e0416f28abc6e659a GIT binary patch literal 1752 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 HE-n5G<5;Rs literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/annonce.gif b/ecrire/img_pack/annonce.gif new file mode 100644 index 0000000000000000000000000000000000000000..4d34646e5ef0a0fd9e4601cf24b636d1e2e58c2e GIT binary patch literal 341 zcmV-b0jmB-Nk%w1VHyA$0J9GO`}VK={P_n52cMi_%*@P?kdLpgulMqG_x0OEL_=_J zaKOA<ac)!c?h^CvLF?=5A^8LW000jFEC2ui02%-q000F4@X1N5y*TU5HBm`Y5S^t6 zA}FYWz>t*@rUDTFKwzK-Q6x1AkWo0*0FFk(f!F~K00a<rvgLk(q;eTZ43s%R;XycV ziGb}E!T2f>pa)jl5T(@(K*62=JwOO*M1go+e0m9g2?1&Y0s#kV2M7WSN)BBLWC940 z4UQ`}4h}g$0s~At2|J-r0tNxGvH=LOJFx{nC<F+#b4;^Hm_)Q;22ZuGcS{EcbO1Y^ z2nAV63y*YomjRVZlgoqJ+Hee8kXtpL;#<%O>|58>>syoE4eA34g!ASJmdwot6zJ5f nph1ID3g7@hprHZ<4I@gN=ukwi78o;X+_<rX$B!2RA^-q8<DZ0T literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/article-24.gif b/ecrire/img_pack/article-24.gif index 83f4186bf78d5d7d48089ce4a22fdcb9ec09f69c..32a31a1f647036e514ba63a77e7f9efd92d48ec0 100644 GIT binary patch literal 211 zcmZ?wbhEHblwgox*v!H3|Nnmm28Od|&mMgu)7RH0BP*w;tMlW>w|DQ}0mU(a;!hSv z1_llW9gq~r3<j14fs>xAw<^At?K&UM(329$*3vjrN0K8`b=#Y20Y=ly&&>)Cob7Np z;~Ceqq-dtg+`2OvlRwyaE%p-+={yp&_1d!q8(h-d-C8OS#O*)V@MX5|`6~}UG1Q(v w{{KfqZhVHlqhoWSl}mR|Z>YPCO=i|algZXo`=`uQo1E3QKzz|+VL=9K02KXENdN!< literal 377 zcmV-<0fzoZNk%w1VHf}y0K^{vbCR-<kB!>c)tt1<|NsBT$H!fAP_nVGV~kwt>+1jj z0PF9_grdLr`1YWikg>$qE-fs=!M@+#+uP&HgMoZREf6Fk64B7l!p_`kdyAo@rbT8x zm930FQ%W2i9`5e$A^8LW0018VEC2ui02lxm000H{;3tk`X_kSauB_s{kZ~$kL)`e? z?1>aWCWS3WY$Of|0tHA?5T8a(vXPOEguASk=U_2EtuQNcpim57MPk5iy9XJCCQ>+L zJl6qW&u2^+dvOjI5)l*%R}Tz}j0+8afC>%;0uqObj2(*u3j>P)3IUW7U5TC+2p$Zc z03Lgx5fY?`A_^E96$rWza25s%aRITjR~Wgvx)v1%x+=o5rL`2u)YKcWmC;}v%m@bG z;NKnC#I<5#!U6)?U>X7M@bT|+>g);v5&8Q2`WN-IwR%(<sIH*F3-$=fTF6ksL3<7& XN}NbB;x7^@&S|7@qN7I<Apih7jA@}J diff --git a/ecrire/img_pack/asuivre-48.gif b/ecrire/img_pack/asuivre-48.gif deleted file mode 100644 index 7edee1b884f7f082b554b4594b928103751777e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1204 zcmV;l1WWrzNk%w1VK4wN0K^{vv9Yn)*x2~^_LGv3$i~ESaBWmkNfHqc;o;%*?CH+B zv+V5ZNJT!hM=pYafM#T0)YQ@G;N0}`@a*X3-rn5j<>J4-z17~(HZ(5p@9ke(QO?fI z;EH$W>E@%OqU7Y{A^8LW0018VEC2ui05AYB000I5;3tk`X`X1Rt}I!#a6DFm@XD<u zblG%Px>^S&kSuPfPEC@zbP~*0B~vRFktu}aQsD`Xq)xC}0T2j_1hgn=8#CAw1+uu< z#kECdQC-#`7H0$-2pKv|hD-=50Tvw)b{7;BKz&thMFa{KoCE<AZHa1eB@|~B8xW}# z6%mzvhXNU#3Yr!HYPlH+a9JAw2zC$@5t9h7Y;FP&X9~3tq0tEwiztl*9gz_Tt`V_g zOM)Ak5KtNC8661gC<q%Kb#{~!6RmC%xeGcI1c4Ug6!z%p&|$%Z2q_u`$aWz>1xg*J z2uQHxT&@k{`UNU<Zh^;oq(qqVAc2CU3iZ_g(Xb+cUakZgEdT&up@PRA6L?WOfgk{Y zfHqxCP)9+F5gxhPOt9drmVym>=;`@btrP*0T_zEW;7W(6oC(rwXc|a?L#gTXRH!-v z0R&(VTXA(&fufo=FY$F6@PGjZ0}ci_0ASEyND3A_bfD0o9)+8R)`)VGV1Nb#3>aY6 z%s>Nxp(shY12$<v(FlcU+{4$h!T`(|Vq;)X;DG@HpFI*{E20sAZ5_5nDA>5hIo3vA z%g)Taz~uoG5SyW3!kq^=2TSkT^Gyc<1IsnvzFok;0{{*jc(`?<(S~UUBlO_D<X!>4 zvkhq2&wsyx0t0w39Zy$n5P?*M>GRG10vmuATW1<P@Bn}MVQ}6*0q`b5PXG*1Kze2b z5C8?NnL~jC_=%@M0k!e>00tUtkf91A3Fbg;4}3U)85Ka_fdd*WcbkNKxoDw=)dfHR z03LWSz>_vg$Rdjl{-qz0{q<D<3_Yo$(M(M``J{j;-nQQZmhD#?0}deB&N>u`=p`qd zq*A4R<T<w=kbo710|A2Ns2%{rbckPm`t^6?elq&m!gt{@N1FzkVQ@ff<BbR4gau&e zs0toD_+glVVn%6|R+5*d1_ENpP70x7P{2%{DA2$F0YJbPXNPL`;e9KPX~r;aB0#`w z0}wC?1PXA_Km(}+-~pwlN{ZkAf9VBC(*~cCfB*&HIk15thE(9}17{2~KxUN6Hk+?3 z2G%OK8p3%1ZhY_|!H)<06Q`2AN+__vIyO0Mw;RU!7XWw^p#Y2-x&v@#6P`J6!P}0= z+qbI3=0PfWIO{=C-0F&`#RO-&EwM>%V8NvfSWt)r5Ik!}PtrapUXD|K7}&~1X=n<I zmd-Y^M*wt62m}snmLJdQWjn9N*6dh7YzJIwK(a0`c{OI6nV0RD0-DjNn;#6|vIpR0 zed%m)GneRW4-85ZO@X8mbP5nic$sW&2fkc{l-9i-Mu<b8G1_fWuyz4~yFK`thI^uw zF|W4p?JqwvAozocVmlo%<6JtP*p2SKd*#pc;*iB0GC6sp-+~5s3w5rq(38tdiYctC Sxt9(BGjyJDcJLyE0029}fd<L| diff --git a/ecrire/img_pack/asuivre-48.png b/ecrire/img_pack/asuivre-48.png new file mode 100644 index 0000000000000000000000000000000000000000..32c4cd112d412b6a2457461c72d9dc2ae9fca3f8 GIT binary patch literal 1879 zcmXX{Yg7|w8vc?@Zje9%sNqr=QBWhgTnYpvI6<UAxulWSG)4^wA_@qUilE4ZSR~*D zvKB?b299E+*&6VQOMw7k6U5yVtxH6ZwuqPAB1o6zR@skp_Q%Ye_nA5G^UU*JK9wl$ z6Q+%e4FG@{EsPYyr|;55qX0la$!0bTkW@je0Dz|hPvRy1Fm}$}D#_h(cz<qQVonMW zBp*&nL8CJgQ&Yq#iOKod=9Dl1C~u-81qnx=B`w$^3<<!1pP#>fXUMJ4w`7Hr1fV#E zG<#ocTm*z}#4-QFLP*!Eyu;&4L~tAj5l;=J=~N6fp-rE<5m?yi`!X^M%i5&*e&5L! z2NWN1$h%oH2<q)K_w1n66NohH+9)kw?t<bSp<FIkw2(d0L7?EEGc5!Ih8mUQyBF<? zoBaU|)h{;0R2L^j$dYGBdsecyau$24_e}-H=p3+g93(~D8y_(!8I96V8&lF(yB!_m z5RI@Cl+@I?iFg6^uFVI3;_5G+JlS0Y@pJssJOQP>t>~CN3p=`n<O&JYfdF9*%b85( zALr}<v6MVi{HMKbc$&MrdsMoaj^dJrxY}L}y^5`)kLN&%6Qs4(b<_>bOLFxDWPCTj zeNXhDFROd_){(RbsnkVghvJ+H{?+T(sX_EIgM9z7TJR*-*8`%8H?;B9J9qA+1O^61 zh1Hn>H0jSlna^j6rqm$>VUS!d>Lt_A`-k=U%U4w?u25;HxA=Y3u3fGq3{=*94E5=5 zN7_Ky=f!p&1Gm#0c{0nd&faHj;ZN||>sAn6Yg$^W6aV$}FN~g^9$qZ5VRA7#I$G0r z+S87Oy-uUA2RA~Rj&0|+t=1nIPoN%%h$O&*mR`A>HJ0e(752d4Kz{@qfwUL*%Q#5p zaH~q)ch{%Z75t*R9Q=ro5Mywgot;Xh6c!d{eT0wzA<{SFM8W)AcsNyV%as>=u+Mek zl>#Cy)eThzRFvKPHav8%Oy;I@Msd9qsF8vTK3$dDT}4+(2+Q&AK*8*LudZ|P?>36m zhPZL-Gt|?w6S{)@iaRiTB#ZE)N98s+sBa-dncdhv_|C~F$j=WkBvD{XX4Ecrg9?Ra zbpGGgfcu=a>y&EG@N#IA79|FK$*HNS;hg<#s7)XitJzX-zhWu%R>7bPcJSHYVAEUZ z^m381oCRK%uYVP{n^mc{jl2+$H<_9IYJ@dGQ*G4hblnzPsHV{O&{LlhWBG~zzzpub z*3;3`GGVFPGSW-^2pVtTfv@==Kc_Ee4oLSxM=Vq<mVw!pZaX_YJ<UmiNP<84+WDbF zRjWsG_}W=yTeN8%g925uM>oiVx-Om4_aZl9Rd<3meL2R^4o6kO0=H&^m`jU4z7(YJ zb%wkT6IV_ohlr+_pWAo9(fs)i_#sMp_YYs6lV)WxJK-{+kaz($OKUck{MI0hHGRW@ z!-$LN1#ZXZepl5sHkK())&7TYgY2qT)Y5d+G36YwgSQXz=mbdFQPI)P&P#54ajq+C z30f`^|E!$&$Kky%y82*T<IEhmIe=x(79ALzix63qP=VsFPFAZm%j~ti%J=xfOr@Z7 z@_J(O=WOe;MeD6pfiVO&Y$C#5yI_vtOCEYJ%?fZjVhLg!LGp48u!m;6sCY3Aj@N<b zS~(=SbdL)S8T-vsO2UE5dv^#$y~gOIw$L*P`pluwlEV4vx>AMovxbHSMssuXNb}sn z>=fg>oi`~D3G0(fRE}%>c|2Z4`U<$YuubL!^Ic6HLlR4FJS2F@)Jn)defO|o+6BF^ zYHD7(%nmLh(6~`xq-c%!p(k_?NY|JTLQSO1VchMcEZ$LB7wehjMfRt*#Qlv5l{F3p zh_p(ey&Mzw#;≠72)l9=#JhL4?h@je%eKLN8hsIGSxln#PGRSJh*&Sj_O)+**XG zoWBh}aU47x=>EM7CgQpag+ly7xHM{ve*WUMYpE>zbd|5{L9S}0w|9xA0Op%xk+s+8 z+%HUN8N)y1Wb)Szb(I8{!a<Gv)E%5jG4yZFi7Ki7@7$ZNDa|ixQP0<7u33HzZdBzX zq)DJCURnlLci>#+CXOGMy|Cy0Q{ctY&Xa6n#eJl2!cB96uc$(XlW-;pL2=W2&^M`9 z*dHH~N{Z}8(TX*RoKZoAl5S)PH)!_|jL6+>aG{z0PU;T5;=(!al$cK{ybTK{EF(xv zU0fd#t^e7iiO-kpAcw?5<{#a`)>S?`Djz3koVrSu$uqnq_iRzTbQ<W+5N*h!1D3~= zCZmt8s>I6+2cEqoy&6=hURUQ@cIi#bPeg676!l@CJm_l3p%O)>sR`r+!-jcDkeEs9 z-%<NX`c|;5U$a1i$BZQ?O!?qJ=y=`5EvGuRm^FJo6NxN%-YSpHC;BW_E8V@FOw+7< jv4#Tg?+E|zD_@YXqF3DK+qnjwj39bzT;%r=^5Xvi1C!+0 literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/barre-couleurs.gif b/ecrire/img_pack/barre-couleurs.gif index e28927ff870bb785cc42676c07f95f46cecf07a7..b68731ae92a0e2be8ddcbdae218d472969f60bbf 100644 GIT binary patch literal 194 zcmV;z06qUlNk%w1VMYK70HOu}#pE1^-`>E=)JU|``JxWrhr#RX>i_@%A^8LW000I6 zEC2ui07d``000Ar2)b-mFiJ<Ny)Nj@-S}YW2xMt8DBwtJL0xdh&0c7aW}Y@r8@(`# zY__S{K)76Kw^;cgz#w5r3>c4tq*B0CIG@oVm3TdBm0eX2Y>)~K)uI85G;EjMuP+>f w$E|a8S$20^d24%ZZc~17WjBO(X?iVu7>!krB9U8@h?R<NV>E$uXE_M~JK82sDgXcg literal 399 zcmV;A0dW3DNk%w1VMYKI0J97Lc5L<lpFCz{0RI30%>ZwVW;N+m13y1M0#h3_07*D> zuw(}Z|Ns900000000000A^8LW000aCEC2ui07d{6000F4P{~OdLpW=@y8o6Sj--{G zXlfm7>r${{X*9xpcu4MM>aVU~ta7PkZa9x_H|qINz+h`QnHe$2<YLJbIG>5A^gxwZ zuh}G*`F)C|Wmyr;&?*_-CIbv*jHhL1Mrk>Cd0u;bVSayPfpdd(c3XydZ9j~Eae_63 zAeCL0Dw$)Oke!ltYdnd3Z$TEZva__cwzs&svjDukz7_$&!owB=#>dDO2FuLN76j1I z(iR2P*4Mt-0KmiD#mL~w&EwC~=G52e+P@6l-VEU34CCYs=I0FQ>g&AR?!n*U852iu zS-E@A(CMqjuV1@=0O1K7IIo~Vdk7QeTgb4XzkdNd1rjWH5TU|_4Yxgn7&6{SdL{3j t)R*$3yO#1SUd*VGV@G~A-%X^b(?CpoJ`2=b2~y(3m-ToOn3*mD06Uh%w<rJr diff --git a/ecrire/img_pack/base-24.gif b/ecrire/img_pack/base-24.gif index 7e154ba02f00542ee9d4920bf13257653d2df394..dba1364766555a1ca537906b41613a5ffa07e01d 100644 GIT binary patch literal 224 zcmV<603ZKHNk%w1VHf}y0HOx~Pft&cjEv{z=J)vX1qB7?^r5@Ey8r+GA^8LW000L7 zEC2ui02lxm000A}cn93AFiK#Ay%xx=z%W553K};J!JrO>SDKKQuI=!`3rg2F?CvgH z3?&K$g}DL7V$cwtP-w(KJrDv*CZQt$6^#TG6(HDpEGmq_5cbf*=9TiI477KI@*?2< z0_-+;17>T5h9GwZiUoOF3u6v#RB%%^8+loXl|2eko+q3HUVo%^n-Z9rnjJO(o^zR| atV(iM0S>nfj-9Tad|ySoFrLH*2>?5-6Iek2 literal 379 zcmV->0fhcXNk%w1VHf}y0K^{vq@<*lmX_Pw+eb%6HZ?WX&ExLv?t6QC=H}+e$jDn; zTZxH@;Nal(_4VxM@ojBw>FMciTaEz%0kx*hQ&Lj+`1s=6>lzprw6wJU|NmG=c!hMO z&BNZs!>-A`+vMcrA^8LW0018VEC2ui02lxm000H};0H)#X#!uWuBpTzaLgo&#NMA& z1&Tub3d6&OTj>T43uh9!7!<@}t1>VonNFxwbxanp5bZWsArw55jph=LN+pfoU{1Io z#9N8M071ME9RLF+gc2wp7=<JR5(_ah2>~{ekq?%a2Rb}HKteWp2oNs}0s;w%R7p!s zPoE7CdkCch5D7<C7Fex02LL_;6bA|fjHwo1O>H><0nN_NI%a5UY+90vC2<sU19f+9 z5*cnedwqX_gGS;k*M$U<hdJvilmVBR0X1CnEe4^ZrA`Tp60XpzShH$jV8jK(tWpws Z{R%dWK({D03Nd@eQPP%n*bIdL06RxRoNE98 diff --git a/ecrire/img_pack/breve-24.gif b/ecrire/img_pack/breve-24.gif index b4273aa5b8e574cae8ac4af12eb2b264096c8117..9ab1f057d6eff539f20de9b806a3e0db7c5b6dae 100644 GIT binary patch literal 229 zcmV<B02=>CNk%w1VHf}y0J9GO|Ns90008#?#*dGWf`Wp^#>SYKn6$LCWMpJ-Z*Qom zs9IWDfq{Y6*4D$r!|v|xA^8LW000jFEC2ui02lxm000D%@X1N5ts(23FAawvj-(TK zQb4ZbiK+&{48lPOMCf`dyY3eiVj)Q61f1lq_d5Wd&}hR2Biv+xs1{1~Wfg;g0Z<qK z1_eNONK7!YTWyz>O&|aXG})|931U}oadLii0AOZeX$EFg4u*qV6H0XmcX?@LeJ_!c foQP+7jGH{2Pe2v{4V_acDU=$nva__cwGjY2;cH!G literal 298 zcmV+_0oDFTNk%w1VHf}y0K^{vb#-;VzP{k#;Hapm*x1-)WMsj?!NbGDY;0__w6wgu zyxZH`_V)IHfq{vMiU0rq0002#>FN0R_>Yf|#>U2if`a1W;@8*L*4EbO=;)Z3nAFtN zT3TAf#Kg(T$?op%A^8LW0018VEC2ui02lxm000H2;3tk`X_5e>uB-~2Ba}#VT{8y+ zi;xukz+gnT>uD+#M<h{+R1(A8rzZqvu0&X`z=<H9nU)yh;Q55IhkDJ%5RFJ@1H!Ja z-)Ad*Fqvo`6cY~<6c2b@T?lh_c6dTz4+sSh0EB>ohGs`i6^o2)Zw!xneS?-7f^P?- wpP(WRV|0>}m4$(sMXh&Iq=J2gsJL3XYFQ@`7`kp!2(c^$Qqj`W)YBmVJMplOP5=M^ diff --git a/ecrire/img_pack/cadre-b.gif b/ecrire/img_pack/cadre-b.gif deleted file mode 100644 index afaf01de744229d1b87697672366f1e57abf014b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51 zcmZ?wbhEHb<YQoEXkcJ?@ZdpOTAJcd76uT|0TCb>1}3hS{*|ZS3M`tlnSsF?07j|} ACjbBd diff --git a/ecrire/img_pack/cadre-bd.gif b/ecrire/img_pack/cadre-bd.gif deleted file mode 100644 index f094775b9fd922d38579770ded839437045405cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 73 zcmZ?wbhEHbWMyDwSj5Wk;K75mw6wmyzD?`bTt0W=|Ns9CV4(Pug^>ZML<htJsbyg1 V<FHz&aER5&MM9M$$cu@=8UTUM6cPXc diff --git a/ecrire/img_pack/cadre-bg.gif b/ecrire/img_pack/cadre-bg.gif deleted file mode 100644 index dcc20c7e1ccfa8311346083af6cfefcd334620f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 73 zcmZ?wbhEHbWMyDwSj5Kg;K75mw6ry=mX{Uf^!4>!x^VXY|NjgO42nNl7#SGY7<7Pa cph{K-24+49W}71mSPu4ZxJU%Mc`#T50Jhf_i~s-t diff --git a/ecrire/img_pack/cadre-d.gif b/ecrire/img_pack/cadre-d.gif deleted file mode 100644 index aa618f7a454d2fb8271cf86b50d45a86816d943f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56 zcmZ?wbhEHbWMvRyXkcJ?@ZdpOTAJcd76uT|0TCb>1}6R%!S-3#zfDUniHi6*RZ5J( F8UT+j4;KIc diff --git a/ecrire/img_pack/cadre-g.gif b/ecrire/img_pack/cadre-g.gif deleted file mode 100644 index 41643f5c281f51a283b8fc2a03eaa33c29f26187..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 67 zcmZ?wbhEHbWMz<Gn8?8J;K76C%a^C6r7<utDE?#tk_-$wAOa-Mz$6mV(6*p*pH#JR SQ0Mw>GQWPM%5sP>SOWlMLlV6J diff --git a/ecrire/img_pack/cadre-h.gif b/ecrire/img_pack/cadre-h.gif deleted file mode 100644 index 2857d908c34c66c9ffb4fbd3c30a76011c411177..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 70 zcmZ?wbhEHb<YbUwn8?iV;K76C%a^C6rTzc^U-2gkBLf37gAM}_faDpN#OL&{JpGn` Y@f@!k)y?;$fAF_G@|gBaQ;fkH095N4N&o-= diff --git a/ecrire/img_pack/cadre-hd.gif b/ecrire/img_pack/cadre-hd.gif deleted file mode 100644 index 7e35ab9297ee84f3827f74bd26ecba1df9b5d115..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 89 zcmZ?wbhEHbWMz<GSj5io;K75mw6x{RmtVbf*5BX1tSD#As^$Ox|5yCU!pOkD&Y;5p s1R%8x%yJdG?))=2b+SpqOCXU?z}1l9z=nzO4NO|MCh6~H<7BV~0OWih*#H0l diff --git a/ecrire/img_pack/cadre-hg.gif b/ecrire/img_pack/cadre-hg.gif deleted file mode 100644 index edb638f50508316c15646e1e59bebcd57164dd02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmZ?wbhEHbWMz<GSj5Kg;K75mw6qERJ<FFbzjyCmMOpFx|Nj{n7!-f9FfuT(G3Wr< p3?Q`(%+eXV?))=2b@K$rK{iD_c1J~q2OfDTGZ!siIf;|O8USHg9^C){ diff --git a/ecrire/img_pack/cal-messagerie.gif b/ecrire/img_pack/cal-messagerie.gif new file mode 100644 index 0000000000000000000000000000000000000000..6bf67514b77e9b89cc2a967a583633ead3fcc7e0 GIT binary patch literal 231 zcmV<D02u#ANk%w1VHyAw0J8u9;NRcDzrU)yN^^K*ovl=oo>`HOk8N#jX=`P!tE;25 zPmP#cm!($!|NmxXWxLQdA^8LV00000EC2ui02%-k000D((8)=wy(a0+dpFZ?08MG0 zs0kc{v@l~Ts|T~V4@}PJ$~-s6;*pE-N<Lz6NYovZN*pog2+W{S;j~#z1suQaa?7=v zzG1O+D?oG`Uxa`RToc<20wREB$jM_<cy|a03QY)Uby{4C0&`OgU{isTigb-xLzbAB hoJ*XYo{2#N2n3>{Z7mW73a_xSva$siwzm`!06X3XU<?2N literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/cal-suivi.gif b/ecrire/img_pack/cal-suivi.gif new file mode 100644 index 0000000000000000000000000000000000000000..2aa32394a4fa7be0dcdf787ecea2bd82ff0f0c2d GIT binary patch literal 264 zcmV+j0r&n#Nk%w1VHyAw0J8u9`up^PfPm=lz@(y~uB)rr<B*$}mv(e@x3#tF>gm<h z)#2daZEbD4&@*ObW&i*GA^8LV00000EC2ui02%-k000EF(8)=wwJqxcp8p<DXqrSe z0;qn%X=>>zx23bm_%mj211g39C16l|0JTiPlMpft2MWUxNO*Ry)Pli4coqc0fH5FA z7>ft(1=yki-bd7daJ0D#WaIS^8Wjfv1_lxX2Y*x#JT^Xl4}b#{hKK=*dyIE)bQE=& zd5alZTw!EkV+06zYM>2E4^3wlQ&m^24ILgpLK8$rA4y6%GCP+fF~S}+wxP(YBt09r OD<UVC7uVPh5db?1UTCBM literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/choix-layout.gif b/ecrire/img_pack/choix-layout.gif deleted file mode 100644 index bd43004d154834f57b858baa545bef27a497990c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 446 zcmV;v0YUypNk%w1VLJd10K^{v1Ox=Px3^SuipR&tOG`^MM^tBtq@1+FI5;>J78Z?- zjYwp7LRxNhm8{g=<QpX{>hAJxlBg#(K&z{(fuOT0Dk@`RV}Y5ooSd9of0%%PfO2wj z($?AE=Id~aspRD3A^8LW0018VEC2ui06PE=000I5;3tk`X`UjWqHOEF;s7K8-~e?p zz@G~6z!c;FC|n8v1LDUTBycv|b7$gA0>Mw>;<<P|jSR8{7$yo7q>@>h01(-lm%%V( z1h`g$5~27b7h(w_7#j*ZZU`6(BLNzRCn`n^1rHJz3k3;-C^dcz3wC%|Jw6j|K5zu7 zBR;OLus$S`6q%M30-A$`s|0Qp0~G)=Is=R>R-`ax2NVnsGaVTV3khxsO9+V{O9}uL zFxxz|1`-Jo4w;)800b6q*YAT*78Y<Mg^-DhjgM3%H4bDr(1AmPYFL7OLtr5Qf@~8$ zOb`aZLJ3!=T&ZGZBEf-X8SV(6#3l>A4ZVIlDI_+)SR@1tisU+jfRo7)*C4*(2EZG* oCMp7)p)utq33l$_&5)<1qCFRzY#Jq@umVGe5G7KyXfgx<JHj8LvH$=8 diff --git a/ecrire/img_pack/choix-layout.png b/ecrire/img_pack/choix-layout.png new file mode 100644 index 0000000000000000000000000000000000000000..3e0417f270562034e55c70a3df9c695eb23a8c5d GIT binary patch literal 1346 zcmV-I1-<%-P)<h;3K|Lk000e1NJLTq0027x000jN1^@s7Ey;(T00004XF*Lt007q5 z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$)Ja4^RCwBA z{Qv(y12SM_Wc&pbV}tPl0tkdcf%phWAu<MnogfSlK#b@nAOnB^0-;|(Tntqd2GcDo zEBhZHfZ#fTc7lwzLDn^G+O+@g-o0a}t*!L}%54XU&7M6QtYOWXH4Fd&#DMM|BzHXm z*#vSk5MM+R|K;lH3S#^M2q3&}#ufs|03d*vpo+q<X!MGRh+r)!C_piN)~s3or%s&; z76S+%5PA#?Qe@{rU33JE|GT-l`Ty<Pw?Ul800D%{zhTf&J^~AABsotI2C)GG2xoxd z!yp%|U%&ppo0}ULgIoi$42N2f&%AEky7eDwF<2cy0Kr2aibG*+WO3wJA_gNn5ah6g zgoOVZ8XEsWVGZJg90L$QEWik{gogQPApQcxr;y_1IuL8ZIG`8@#XOW74a7^)#gS75 zkj)ATnKy6VFi1*DGF-iS6(%kV5J02`u_aRcc|qx;P`Qh^f*TtK2q1!a5g#Cw?r{Nt z0AeD?GGNyJ53+E|lqsxiY;6Cnt*!s#aFitw{|2dr;>RE{fB-`ADX}gGSu|n71ct+h z4>Kq#Dl+u+^f3JT^@|aUrH{M2yJh(J_!vHY`UG+;LwkGs6Mz6>K}sMoP=&vN)JY(I z55(@E1O_U|kko-wXm)lsMo=RsJP^&w$|}Rp&kru#K7RbjU}0gwAOi#d0mOoog7aW0 z4@Zh*BQ-vM0|ChH4<9}-gocKKQ}GiZ00<x^X!hU%;u|1eK`jLNIvN@ebC4~9;!q_1 z5g^_Sjk_ag_P!Jq6=iU7abbA;_%Xxx@83aU;s60eQtE{|2$Y{e@n?!FpCTtDAaxLA zIg)S~Kmf6jm~cU%!V8TK2Bc7du@?a?PeF>3<DhhhZU{gCF_BXilUaU)eEl0%HUksc ze^B`hqG4q;RL+V5J1~l6WDF2MIHMI9V%k6ogg?WocuD{$+XBlI8Bmr5WnCa2?10ao zKQnM}a4@`j^@`!_*|QA0cJ2C2Y(WPqGG4rR!Eo^4L5859peMk(MJ6~nm|^YOwG8|B z?`Np1t7F))V+X_0qesDJ0t67)vp|bMNk9vTp91l5px7~J=2!|%vkQTkA1K~~+;{*| zW}v`;>A{!wficMH=;+Ac@9)oW=+GgC_wU~`JbLtq0aS#<#>O(7Idg{L*|TR1SFT+7 z3vv^X%|b)~f>OjrU?s{5;_utH4;*mH%E}DizI_AZi4!M+Qj<R@!T<sY-9URFZU-8& z14u81W=v3CxdOy9fZ}aXHLy$=4%KG`#5g^R98*9uK!K_Qs?34n+bF5(fE70@s3HKR z3Xn%HUcAU~_wHQ=adB~m6DLkE09$Mfz*Yq)AhrQps|)}E1S<R+fSf95!}lfBgF;B= zg4oH>R>ezD<_GElsS^j{B&Zq<Anw89pj4<nP>MMQEjU0PT>>qBrGT^mjui6+s^=K4 z0EERXu*Jfvq@=_EY^E}pnwm0z%Kg==S2H|+{+waKf(4**ARQF500BhnLJ8#AULf8K zEu1zZwPG(q3$2S#z9n)Y1;r&q6iA>tXF05Wn4h2j9~yCwKzwL><1t7*KmgIwqYY5U zfIK({$zh>Lo`Q)#MruX>hKkR@*7YJ_=VKVgCJzu`0AaRqy0GUaCjbBd07*qoM6N<$ Ef)9i>dH?_b literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/choix-layout_rtl.gif b/ecrire/img_pack/choix-layout_rtl.gif deleted file mode 100644 index 7d6b2b4ed146fd829a61adc8099cce2ace1c4ce1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 541 zcmZ?wbhEHbv}WLExcZ*~2o4-LP|&@yapvY%?>;$2<)wEnxpMc(rE521>SuVQl!ugb zshc@StLm7zhm=lTbN|`vyh$q>7i^xh<*=xj*!%bI@87?F{`~pl$B*ydzkmDo?d#XC zpFe+oe}8{{eSLg<yuZJ{y}iAKg@wGlJU>4_3kwU#O6mc{pDc_F42%pqAR|G3Vqp7! zprOD+N2>qOB%zZzR`Z>FIu~imdWCYaNd-*X@jxXpsE9{KwfV*ABLN%2-c(EH1+g_X z#(nTuFk3ZQgik0VD<?rz+9R}zm6eT?JEBZTP-uoAbDc=3oSeH?8Y>?!4>K2^$lM;) z8LV6rCrdetD=YZTcaGb$cVC>#BB7Pbgt%ADRS*>ymy=`^l^1oAciL6z)aBMFEX2wi zEWpXdB_gXV?!<8Zx!9{~3vMu8KbR`S#v>xgzH+rBgNjoN!-RM72O2;0+&FZ#MQ);& zu#itf!vjalC`O%>6Bia97U-3+DiD~I*s@#k)C|jJwcaQvWf8R!Z-q=oO&1S6gFiF; zPVBUr_nK)-wYh%WL?I=vDVAm)EUVQn&yW!DFgOs>;@a;qak1B7nMzlaqAwaOOFSm2 Ry<Ni;?Vf&PUSbn41Oc@-u0j9+ diff --git a/ecrire/img_pack/choix-layout_rtl.png b/ecrire/img_pack/choix-layout_rtl.png new file mode 100644 index 0000000000000000000000000000000000000000..a8808e505badc1e9dc957737f6f123973bb1a235 GIT binary patch literal 1206 zcmV;n1WEgeP)<h;3K|Lk000e1NJLTq0027x000jN1^@s7Ey;(T00004XF*Lt007q5 z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$NJ&INRCwBA z{Qv(y12SM_Wc&pbV}tPl0*C>sKoN)!g4i$&1Uo?(Ab=RrO+W?!0mK9}E)tuBoSfW$ zfB?d)bK10N|KGiP$52~a>jhM|9V9k;_H3|*HEY%|00a;NvRlyH^%saiw*EsC|K;lH z3S#^M2q3&RV}t-200<x^JQ}?sA|hA|3JOq6pEYaN|EW`_g2ey=2!!N;xDXVic)V~B zO8;(dZvKD!_H7X7F+czzD~N*9kx;|lA<+ks)Omt1hz$@xI0FnH2DxDU`t|?a+}ywz z<Qh-_;!yh-h`nyzy7eDwF<2cy01;yevWtHagOMEwa#%t_!ha17jsKvq2Ju0T0SF)# zV1$5zqz8yU0&zAFO8{{%5Ptw_7DA3BP>ciBgW|>ts%`^R{5~{tL5{RXQqKwsnKy6V zFi1*DGF-iS6(%kV5I|%FHCl*7q46V$(FYJfc+)i@Kq%eg0ssNTM2=;^to<Kk;gl&; zSlQUv{##pH|Ht7dOCbIYQVYe8L1F*_M3zrM7EPEif#LAs!wiawiVQtHJq*8o{bIyo z>ErJ1ZW%s4K88=9K7ky|(B9tu1R#J|hzLS(A_2J+N%(hmb~Z*(BPTo%&C1Fu!_UtT zF5EtT{K#NoVZk5+1ONd9Dng%uicyf^P|bIcX=H;4VW6_($Z`A|2tf3Q4<8spLPEe6 zKLG-O00PCSBoI#pVmqi>WuS$i(nT4IuZeOX5_l;pD$3yE;==Iw@neSX-@k*z!~p^b zS5|n2#I{3X|A!WL|8elqt1C-r;qe#=TLJ_SHS#J}2jas30mMY9r6f2G<m=zCvKg4j z{)5VA5DhD%p>kFf*nv?jBV&L7qNq?Ju>gAvEKg)WSr(Lafqbw7K7anqz`?=6@aoko zhO=kSGVI#5>o>6l9jM57@!|!;!Gi}Gf`Wpc0P7Z+;NW0}wQJWh?BBnip{}luVaJXg z3`dV11)B*FKoolxS_fqU&8fgwQUha<)zQ(B!QbDX;n1N&4Da8+XL$7J5d)|QiH(hA zICJI<!?S147_MBo@)zVLAe)%t3zQ-@0xMBg5P#pkec*soR#s;C_U#)OPn<Xrl$!iO zZ8CrWf_oO)%3BD;uYqFHBzX29wCJ*@a!SA(h@b!jR@|(hiU5=<Kpwq#@gl?ByLTDH z#l;y;oH)S%Y_TysfBqb-e$Spg3;+Sd0BsTcLavOVrA{%F4U<PHrI4FB=%o^RB@fmA zl*Igp*IcBA;4e^%rLwZ}KZphv^Z$XV<9~mDKe+h>lz#+kECK`&yflNhDhr{W+kj>$ zOnxpX*#Pl8B)MYrz(5Nmngk+Jfpi3jm&4kJ`T6<(p*@yIAU?Fc@ff5YAb?29v!J8} zRR53!^`Jm9hH~wpz6ro0uLHy)K>QXcp9GZy1!6l8y8y)w5nBi%wFqR<<pBZ=0M+uc UZcN0ug#Z8m07*qoM6N<$f}76;1poj5 literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/choix-layout_rtl_he.gif b/ecrire/img_pack/choix-layout_rtl_he.gif deleted file mode 100644 index 1b755cec53c97bf53baf42a5b326b422ab80bd95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 527 zcmZ?wbhEHbv}WLExT?nR`0?XwSFbiM*t~uF_Qsi;KYsjZsH+zh9<gTi>UneL#?;Tq zNKKow<*-Lexl>f$uAMuNA3r{^zdxj;E4_0`S#gPlg~f^E$JNaoq*ZmU+<lTaX~nB| zpYA_<ZEtO(EU(bg*i<@oO+oj{OV@6ixQB>}iLtP-{Qv)-fqFpkCkrD3gBpVl$ViZ% z7})+hOfK-yk?KD*N$6yb)qE$9P7{q(uTUYDte|N-9z1CaloE7X>iP6^%Y+SKZ>pv9 zCUGb>*|7vIn5~+uqRf<$l~d{wTE)jF%q0|2#w5iwO^T&X#hHPd)rrvsXwwo8uQWbo z32_!)WtG`os?+#*`zJCxGqQ20v9igDI0>>biio+yoj!9m?o=w%`ZY{K8#bx&3+@-= zXLp**Cg17b$iu`Z5iG;S%e!greKih2+4-D|9BlmVbLXoqw3uj=$}+WqQ`{rt#0RZu z0yPV{WGps3NNlQP>HP4C)knfG`9zvwz=4Kl4uSV26O9-3&NeULK4PeN@WC7=51|mn zD9&IxTb*jP4=*2=FL7aIPhG>is-ZXi0)wD>7*Ca;qnlFDlLJx)$5&og-Z-mH_O%KJ GgEatFm8gyY diff --git a/ecrire/img_pack/choix-layout_rtl_he.png b/ecrire/img_pack/choix-layout_rtl_he.png new file mode 100644 index 0000000000000000000000000000000000000000..5734c4ddb002dc26937be1a452f497ff2cdccb33 GIT binary patch literal 1201 zcmV;i1Wx;jP)<h;3K|Lk000e1NJLTq0027x000jN1^@s7Ey;(T00004XF*Lt007q5 z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$LrFwIRCwBA z{Qv(y12SM_Wc&pbV}tPl0*D1Fco|5Y1LCzXNubzH5DgGOjOZpH1AqWx0;>87#7EI3 z<mBZ30|XFWoztdG`~U9UJBHfYS}&lw?I5w)vuA@ftXZ>$0U&@FK$@{(AOP8>fkph6 ztE(%B@e3e;@Y;+X0_XrBfSB-T^oodxU@a&pKrwyRtXco3PMr!C0|+1x@`Kv00mNI7 zoTmk){gA|dH#ax`zkT~Qi1QdAfbjV_7l^+?{f=yaCkTVs00D$kGd>J*!TR;<|GT-l zficK6pa8_7_AwB9-MV$_Kh$EdI)DH|cHtI~H-Y#cRO~WTybC#&h{4DX1UW1rA>qG< zhQ@zTScCW=#{dKn-dM&Hi6BRX192%(e<G0Y2V}1YvYFA<f<oran>P&i@84(m_U#+P z_3PIecJAEC2oOMISxgN85I_`JOeo#s0ssNTM2=;^to<Kk;gl&;SlQUv{##pH|Ht7d zOCbIYQVYe8L1F*_M3zrM7EPEif#LAs!wiawiVQtHJq*8o{bIyo>ErJ1ZW%s4K88=9 zK7ky|(B9tu1R#K5W#L~?VgS)V?rR`h0+|g9N+k1sXJ=<)1T~Be3vyOgRvCVNesJOT z@#9AZ3kwSd86W@%AXxBzg3_RpP#DTC0Af*OgP?|eh0?`HVu3&$g2aco3<yB<hYueZ zLPA2o7C!+3fB<5G8Yl>*eSnx1%ASlZD*(YJC@lpl^P%h|Ks*tP+LxlDq6{uBE)0(! zKW6y;{X0lZ93X(mDV=hmG|0mDNX7qFENU&Gg~wwgYzYuR1Cmz(0*Hy6vY5>B8|3TX zu(BDL$o_-MXAli5qoHzE6xe}LEF)up0HRw6gR(8KJdpuqSy0vm^1%-H{P{Bj2L}hk zt5>fW&YnHXuxr<@-^3Plpd#bNix&(B4<2L)3JQ7xtXpJ)gM%5?u3gKpfB$}ly1F`s z9Xoa~96fpzY$iYeF(Em|4~X9bu@;h8E*3}oLF*U>7)?w`4Js}+ZQ8^DDl$Oj*~X0< z8GxQ=*sx&(s3>80{`@&4H%dt{0r4MV%mo$(Uc$n{zd>~xup*Ta5)xuKe*8Ftt*tFX zNl6I<NF3x*pi+O3dVl~ziCLhd<^w4cpqMVy)3HDdDi1?}Vmwea-q2Ek4~QQE#gzu6 zo&*LU&@-%{fCHt9ef#z?T)cRZ;qKkL4C3PA3@1*UU;wt*;DNYj&mIPV077qI<|36o zTF?>*UJ60QkAX0hy#={phNltt7gl;f%?0uQ0r3kYb(f*yAoVYRxSfbR3eM}G7E5Ji z<$n+jEav}TxpL)ye}6x?`2>`I1Zyk;1Q0z6CQwRv53Q_VVq2k}`;F8bK8DnG1bKQs zkp<EbAYKk@ALi%hgCsybmPa5yw7u~dq#huE2CTV8t3nW|MIehV4-jAgrO5%k*tIa^ P00000NkvXXu0mjfcVhdb literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/deconnecter-24.gif b/ecrire/img_pack/deconnecter-24.gif index 1db9e40963d5ab8051b5c3654f511279a2924a55..3df90e04dacec6c45ff3bf9b11be5c2bc745f876 100644 GIT binary patch literal 289 zcmZ?wbhEHblwuHJ*v!xH=;6bP%KY5i%w0Qnw6{0Rm{XsYnzrYHNm?oh>^^V2`+~{t z3&v?_Y5&1M@h1x-0|P&U4g(N?%wS+ScVWR4fvl-YALTYixtX3hq`^}>gFUdMN%_2S zsMd~3tvkUYTNWrbYAqG%c5P%}X36Bd<k%YZplY7_+KUd)f|k3q8(g?1usZ0{sn;oI z`8-Xh+lVmDZMf`naOsWu2$q6CtsGAeuL^#qYJXvm1ZxXM{hmHY4z@|$>~V}f(+k*U zt4-A4;z&+y;jGV@$HOMe>`)+~xv`UbAwOdQpV=}l_Kn_^GiGwEck5VXw=GJnF3X&& kJO7ePmZv+<aej`I#=@fFB5b@*ZCRKkoL|Op3Nly&0Nc!KZU6uP literal 391 zcmZ?wbhEHblwgoxc+Ag`m!JPuRf3(Fxv{ZPcZ#)WlJc)#zn(sQa`ecNfJ8r4HKp6P zZY^ED+}6qZ{kymS|NmF~$->CMz|Ww=00ba27+C&&IO(~1Z+^qs-RvHw8V;A{EMLTt zqiu3^f<)V91s-FAuG3mm9h=e$WW+d*IXo2B&}wE$PAHJ!>t3^H<q94tF2_R!XZ56f zT~iCVG=$omzg@`C(rOM?P++hSv*hyS5@Kf3V&bi4WMbfB;N@bPJcUb$lev2qBNH<N zC+`#xZ}w~^P7dBhlevT#me1y5=UvML6x`I!#KX?Z#0At0<n3Vu^0;}mE@}yJ@N#lZ z21#<W^KxnMYKb!Qa#b_&@Ue3<aB)83<pS}6s@eEBc)2*4xO5gQIMl$x#iC$Pz|hdd z!os1VFhL=SiB*(MrJ&#dLlc`RtCCuW$0P?vkkA4{2gk-q2Am=R0f`I^K$DK#Sqaqd Y$=bvv>$Rn^l~Hz*7Hh);M-~Qa0Izmzo&W#< diff --git a/ecrire/img_pack/deconnecter-24_rtl.gif b/ecrire/img_pack/deconnecter-24_rtl.gif index 8c83a4c4be0933524be3cf03a42231b433d267c7..c6f5141d11080d4f03414d5e8d26415fbfae93b9 100644 GIT binary patch literal 208 zcmV;>05AVXNk%w1VHyAw0J9GOt*x!1uu_YQi-CcG|NsAHW@g_2Bme*a#pE28mX`GN z^tR42`1tt5;vdt~)9&u>A^8LW000jFEC2ui02%-k000Diu*gZPl`j{<yZ>O3J=<WO zXo?b|MyM-z9PC)arfkqH`Qn4m!LX~jfWgj?IBOnmI3;mPeg2|^CAA8LWw&4}lA{Ih zx+<ypeD$h#PB9R`Q1fgrgnqAY1OyIJcSn4M2nz`S3S@&m1BQiufE+<RXh<uTAe)?) K7oQg+5db^N?pn71 literal 392 zcmZ?wbhEHblwgoxc+Ag`m!JPuRf3(Fxv{ZPcZ#)WlJc)#zn(sQa`ecNfJ8r4HKp6P zZY^ED+}6qZ{kymS|NmF~$->CMz|Ww=00ba27+C&&IO(~1DaVVm))HaLJxdm7_|8&m zFbeUq)H-v(;KU;dH=_`)nGS{t3S#W+=O;*nh&UZhs<N=)VRlPWc&XLW`*Km12Zu<n zWB4KgGrr5siVHcGu)S_~TCqb{hJlHZQIoln%ZQ1Kmw}IgshN?NNu7yVh^v#AlYyCO z;sQoyP7sHKlc{;lT1GINoon581|cq>IxZ$&b{?kfYdM9~Ppb2B1KCHLfox4pE?#yJ zZ;dh+CohK(*ELN}E(UIPJ|3oKE?%H*teii7a`AHTvGFi5X=E5E^f$4vaHuFuP)KBA zW#E%=P;hW;VyqMq@i;Njp{d1;RZ792-~dGE#feD{jI7KRDiRai9Z%0@m6BmFQ1EYN Za%kp~wMuf3W09Jq6}u|YVIBvAH2@E9ZCL;S diff --git a/ecrire/img_pack/documents-48.gif b/ecrire/img_pack/documents-48.gif deleted file mode 100644 index 184570628e71dacd527ddc5af2d309d0c52ab685..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1342 zcmV-E1;P49Nk%w1VK4wN0M$PL;^N{{R&&|eo3^*cy1Kd3)6`{ZhT`JV)z;amtGA1h zsWCNDx3>U{jEl_7%cZ8M$jQ;c!NJ|#-FkWj+S=M7A}QJ0+?|_uxwwuzKxV<i&iVQ1 z+}zQ-z091Twfg$?mmCgwewp6hzv<}S-rnE#_Sdhmy3Wtn4i6RZ@Ved9)a&cZ*Vo*~ z$H!<F7@?S#+S&lY#GdQx>DJb7!=<6p&Bx&2;M?5Z<>lko*Vo$H+uqC3;oRNw@ZHeR z(B$OgA^8LW002J#EC2ui05AYB000L6z@KnPEE<o<q;kn@I-k&}bV{vSl>opoo1@r< zHcF(GyZ&?*OScG!5C*2mS7$H;GKNAGK#|-mEC^*n76cF)a0v+!1|cDK3kw`nHzYPT z7J>y@Z4f6Xa3&813JD$o3mFwYQzRq+n1MMtSq>+G9VUt)9=Qe?krfeAHkJT?2!aRz zClCl08U(r_3IiICk*dQ`$2PEkIm!qc&jpAH3L(}ecEFJ>QLb4MnaL~#5D+XZ5Q)?s z0~Gv<6rh3wZa2J<02GKtjzb7ooXCaFz<>@OegV6);J}k(H@>N9=tF~sK!{9a3;{62 zosA0~XmNr`VWx)W2Hct`%4Guoj2ai*snB93lVcV{CVS?iLkE-tOx0=0QRspOtegN~ z@oM4HOb|@$?4U?NhF%#X2~|blOA`PKv)l+2k%bQkPg!Wt<>8Uj5E+1FC>SE^TduI` zv9M5}g;<Fc6$I#&VBp{dC}e7-CztMG2O9G3HRZPh;Ee^bezfq)h7P)nK|x>~Ie-GP z1FbGd00mR$WNGe-Hlb4B-@rl(zR>doF{ZBwD45U(N>_pmw-Z!F6~F`(5-hv{0&X|# zK8gtdUkrK&#S02hZX~qfITM8rCr=Phz>cK{cX%vdz&136M;~-P=ois`=wvX!0D-}j z8GKKWAOT$U6`(^t{Oo7{0yP04Hy8>H!1GZ;$G|3t4&>Ny&Mqdf09YgjL_&a3P1t}# zXZtWFfeItImXZlC^e~P~ff?Z5AX<^IV*xfupu-IXP>@3nGVt&K2Q75)zzZMjfI<uc z8Bl=%H)f$G7M9?!qY5hgQKbX4$RGg?G?>spTOSnQ0thZuU;+nOTyjYkTeRt>H*l)p zLk&5MAj1e<yl?>qC4A5W0X6*T!U7JsVxa^QSmKQlin<8^2RW!vfCC&zI_UuzG=M=0 z8)z!P1Pg%R!j=+PIZGF%o;m~o61b@>00+!cKn*L%I)VroT#!PhAFMC~0~KU|m6Zh) z;DZkZ%p!rYLU`l<CIxODZ~zA+6c8&81WYQx1p=gSfB_q%00RRPT;S}u4ir3Y7nTsA zBM$Ml`)<6^`tX7bE8KhS3n+ZxFTf3m>w^O=gxrDy<Wlg8!m0v*gS#BSTfhjEN-%-| z7H`0*2>(tn!3zb49KjeP`+zWx3+u>i%NM>Z!^<KF5W@u}Y+!=608bDC0WJKjbp#}r zdoIyC?$~mbTD;8e0WrkzKm#STaKNq;R1iQ6S`%P50b>YlGP*zL=p+YZ4^e;&4xs%2 z0XaOd!3!e99l!%M{A{-_#1TMeAAI+%GOKP0PQeH<n84fv5%j?83pHdd4RNB_-9iDy zb`Ay!tl}tJgt(#WFvJ57@M?nU(%k)X3qpTwd%9L0|3d-NNI--MchHTu$Og}X`I<*a zfIu^$CE|ex3WV>7BXu;ub=TJSVaY4XoACoII_O|(F^3}R{!y@~Y5)EF7ZC&iJ3*U7 A3IG5A diff --git a/ecrire/img_pack/documents-48.png b/ecrire/img_pack/documents-48.png new file mode 100644 index 0000000000000000000000000000000000000000..47497d9f452cb101256ee47c314515476abaf09e GIT binary patch literal 1732 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 literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/documents-48_rtl.gif b/ecrire/img_pack/documents-48_rtl.gif deleted file mode 100644 index 4f2b252be8cea76aa4a2d36358da5cbc751eee2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1348 zcmV-K1-tr3Nk%w1VK4wN0M!5h;^N{{R&&|eo3^*cy1Kd3)6`{ZhT`JV)z;amtGA1h zsWCNDx3>U{jEl_7%cZ8M$jQ;c!NJ|#-FkWj+S=M7A}QJ0+?|_uxwwuzKxV<i&iVQ1 z+}zQ-z091Twfg$?mmCgwewp6hzv<}S-rnE#_Sdhmy3Wtn4i6RZ@Ved9)a&cZ*Vo*~ z$H!<F7@?S#+S&lY#GdQx>DJb7!=<6p&Bx&2;M?5Z<>lko*Vo$H+uqC3;oRNw@ZHeR z(B$OgA^8LW002J#EC2ui05AYB000L6z@KnPEE<o<q;kn@I-k&}bV{u<bFB!)HndT4 z0KhS99Tp6kfWe^q*&?O^AtEMzEtYnbvskD@AqEi%32_<_1QtU%2rL#i5)^e(J{1{$ z9tjEt4<>OZClGW$00oQ|HZ~+TR1p<@83raD9wCIYjVBIaIgE}r03;++u9pi2AsPb; zwk8A`76=e000@i-j{vG%Q7wH7X|l>83JC)m1<@J^*4B@}HaC+_4iy2g1_}cm%!LCG zELcE*P=EzHY!bo<i*f+my$rEDbQqAYP=^x+59Kfz&;ki<@}K~C;0Iiq5c>joFw{tc z1|J-AyaR9}q!R!wEIo|aAwhuu5S=cvIB~9EBWxdSpn~F~K}m-wJFLlcu2F{$KBBRk zneB-U0y@7Lkmw;pxdcK_n1F!opvPb=<}vXR!rmo_A+93JWI{v04iI1(Y$OlB+b1JY z__=EUt%m^RW?@v@BHdtAaOEy(YHw#=sUi6KWzj){0}F#$6t<8MN`gN3z%}Lv*<v~f z15Tu4$3h1%5*9QoDe$7R$<O&#_Wc_e5AW67o|w27I}KU|8E)kkXo5o9t-o1Bq3{Al z8j}VlX0T;3;98hk9cg1R3`zt8$Bbo=7|28+6BudGfp@6!mP$?IJ)qc584NIhS+|&A z5P&{>*GMWXMCU{c4WJPJz+Gl76M}!905p&emhtwH1oa_CKp*&l69Nk+uxE}2HXxvZ z4yQZ^l5k4oP#zj5t<%E`o}A;`2r5WmSwMy1pdk`rR0#k922`+y0x_Vl!v`-s&_N3v zJivntHRM1+0XOI%fei%!fWt>ggpo=rVQ^rAJt2VLLIEFq)qn{!&>(>f0Oa7nnvbZU zf}B#)X@oYaNMNZjBsj2u3x3u>Ko1|3fWZYXd@+IyBjiwn4~{-+0}imNB9}HKMAAzy z6i84erwdFV0H_<JfI$No9B?YC95_&b3OR59X{;>@p^XH+6ySpo1(-rXQyEmizzi#V z5NZk+U?9S=Bdk#WgDE*2@GPvYbwR=x*E(SDwd`In0Ru3kuz>*wq#(cr0-Q<!4kK_- z00|r%Z~&|nz^V-q!K~?n11)6Sf&=(Auy4N~pzuNo<O;BY3@`YQ?!pZ}jKjjQQao=C z7iSzn1R2}=!UP|S;AyY~7fkI4Be2{u4q?PR#I!kB>%h%W<4iyZJb$}_2^*AfK@0+% zTL7wY>e{fJuS!X=D)eSSz}j=%976yV@GQUqEtJr}12M$#Fa<@EvL*-4B5n5BwmLw7 zCxxtia}5u`J%I=>Z16x11mJyu12Pn_^xtz1PDCoT7SO`lop|C5&NaNyYY!1TAVdKs z#4y5|McB|`EYed-%d`(!M8LK)bF^SWuMfB`gbuM|J882d<gWX)U(jr?#=b`oLmDO! zA%QcRFTVv73ROx$^iDtBz#4!6qQLqd@U_n&Cm<lfO?GYrx(>bpSw<07YD32U01RLd G002AZb3Y~k diff --git a/ecrire/img_pack/documents-48_rtl.png b/ecrire/img_pack/documents-48_rtl.png new file mode 100644 index 0000000000000000000000000000000000000000..a279cd36e27a336a26eef8a31450925db1b57fb2 GIT binary patch literal 1735 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 literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/fiche-perso-24.gif b/ecrire/img_pack/fiche-perso-24.gif index 77aaefec53a86fbd265462f1cef2ed90dd95fee4..803d6ce5f1d590ab4b1c76443a10dcf47b723ff2 100644 GIT binary patch literal 173 zcmV;e08;-)Nk%w1VHf}y0HOx~#pE0S005-JS_B3GgrhoGYAuSJPVVmRA^8LW000L7 zEC2ui02lxm000AWc)HyFFv=6E4U>%`x-SDZ4Mqo?s8EQ|V50CzuuV|HR=hr3oW}!) zEe80(c8q|4$du6zE}s!KYeaEVr*$a}5UUz4)~kCeiCF@Y(HqCWHSuYxelD)fy2K@y b5keUO1vdnRAa)T0iXjylj*pO$6A1u2D4#v+ literal 213 zcmZ?wbhEHblwgox*vx<vFtIV2q#3!*af+E161vSJZBNqI|BsUxUMT)#VPs(7XV3xZ z1ew9W()8h^=jy!{ugiCtOSh`{W~y=QQ1m{zr(m*-)T2W`R$sV&@ljtwUYX+4ral?w z#E+U2Pq8d4%FtN9%jsxY%QKOviJ~u#Hf~QY`XoKCV0U)RBHfjCt<PExB!$#hhGgoe r@^BSP<VUnMh?_N8adGrWuyfjT&Cn>(=9nuxTXEr{#Y@Bl85pbqF5O4w diff --git a/ecrire/img_pack/fiche-perso-48.gif b/ecrire/img_pack/fiche-perso-48.gif deleted file mode 100644 index efc83f63950f917f5350d1b0894a4ece0b161479..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 683 zcmV;c0#yA+Nk%w1VK4wN0J9GO`}_M<wMe$#u$`WqTwhzp#>Oj0ClDGBdBtx(g*Ifo zS>)*Bet&*=o^q7WjQ{`tA^8LW000jFEC2ui05AYB000F4@X1N5y*TS!1~Eq%8q82^ zXtsC<Q96R)I1NFx!;<c6+r+?`Y&L6vayv}{7jz(;h^TY+G#*Y#%fRr9K^2OCSPTY7 zqlv>HI|0}VUIchdubZO*k}kQh#piWm4hsSZbY+GH1bZnA41a-R4giz@fn^FLJ06gc zVgi)_hIV0j3@8N#FixIyla-~OX;>Hw2al|+bf62Px@nAB1Tu2E#;pk?02j7D4zb74 zV+p_)Tg1?<3IYqg(rFCK6$A}V*`BYI3*U;t4@*?%fuN!5(bQMs5?eF!b@ZVGd;_QN z0fPkQjPU{pz=5;?$re%Il28|bb?Gb(G+<zXz5@;a@E9uvP~gL42Ru$VaOPnsU-v*1 z_!z}spo|Y8qAbAZfP!MtO6G(pvu6W9$3oeRl&t6k0||f{OJ{E>9eh_95lDbk7eI%g zU?KxyfaioQ0j!D%H3)#oV<-ujm9Rt_f>7$z5(U9vW*ex{GG5e6G=vF#02mku9PlK^ z0|s&+UXmavA;Mx%-r`x%4d9_M$@X;zV996D$TSm>T;bw?1JqE<(j1wyh0-5l%f71l zRt|R(E~bL2TQ)TiAy(VI;2H$A%BYWvaIu_u=`E0-=afFZM0Ms1I^5v+9Qy30B3gK- zghDur5y{HSZ;E_`3ll0+xK}KKqyPV8rPsn(eKQr*UN-}HP+xzL2?&`Y-gRT3e%*91 z00SR5*q<UUM3^5N52#Z>2aaH9!-*$4k|0kWO~{5i;aPZLi6yMa;)fvKc2R{R_Sj=L RE#|0SB|u7835XE@06UoQAXESV diff --git a/ecrire/img_pack/fiche-perso.gif b/ecrire/img_pack/fiche-perso.gif new file mode 100644 index 0000000000000000000000000000000000000000..e4b554edd9d54916d1fd7af0f10391e6200c1305 GIT binary patch literal 248 zcmV<U00;j^Nk%w1VHyAw0J8u9&(F)Gqo0|UmUek+_V)A5+iT<K!ot)|+2fDv>gkP` zTdu3CiG_y$|NpztHD+aHA^8LV00000EC2ui02%-k000D~@X1N5wIl1n9%o=EhLYl( zXt6L&>ozMR5KZ@(D2fcg+W?e6t&~eG1il1iF}xK~09JCb=rwWAsBe3Hp0uq1Ny4;Y za|Ho2JgAh3Ps1bOBM2sMXVK6Z2wy;CO#ui64h0A_1_n`UErAbte=Y_GC~|a<cwGgZ ymS_S<nu2CtIdU{Vo28~F2n<$`d1t0zvR$nws4x>qthuiN0c{f?7stpG5db@vKxEzk literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/fond-agenda.gif b/ecrire/img_pack/fond-agenda.gif new file mode 100644 index 0000000000000000000000000000000000000000..5260c3c67882ae2cbef3e72a5454d7e8149bf338 GIT binary patch literal 51 zcmZ?wbhEHbWM<%FXkcVWO-+6M`nBRu7DfgJMg|=QAOOiQFmbgAH_Up?JG17P2!k~M DJoF4_ literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/fond-gris-anim.gif b/ecrire/img_pack/fond-gris-anim.gif new file mode 100644 index 0000000000000000000000000000000000000000..b8aa8e340bd8c4cc499ef03caef6b3c3c65deb93 GIT binary patch literal 347 zcmZ?wbhEHb<Y3@nSj5Kg`t|D*Cr&(h^5p#a^VhCjyL<QU|Ns9P7#I})bNji51Uowh zxEkphFf)RLezLG~F|aY{0NFsz91IN191^?k{4+Q;1G}UJK1mOJk`eeMHSkGt;FH9w N6R(|kT?_Z8H2{;yQ&s=~ literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/interface-display.gif b/ecrire/img_pack/interface-display.gif new file mode 100644 index 0000000000000000000000000000000000000000..d438659f3949d1632a92fb6e8d2cd8ade671d62c GIT binary patch literal 219 zcmV<103`oMNk%w1VHyAw0J8u9$;rvo)YQbp#Ep%OxVX5WprCtud*R{X=H}+y+}!Bs z=ul8lp{1#5X=zwkSgx+FA^8LV00000EC2ui02%-k000DtkjY7_wJPh)yOzizj$~;r z2)K9}VX&xltgJE=qmnO&yzV01LIC{r7zvsO;W)q&l4K3g5dMM-C?jy~Di{N+coC3r zYlBCPY*uy}-d&jih>H>q`wt+gvs^Vgd~|Lb1p|75eR>91j(dwRk7I*=9RUu3iVQ?2 Vo+bhk0;8m*rl+JAs;d(b06XDIT#Nt! literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/loupe.gif b/ecrire/img_pack/loupe.gif new file mode 100644 index 0000000000000000000000000000000000000000..49b8c11d9224dd9244b35eeccf5d0833d4848216 GIT binary patch literal 204 zcmZ?wbhEHblwuHJ*v!E2;>C-FOIHR21pNR1|HzReCr+Gr_Uzf6J9jQ!y7chj!!u{j zT)%#u0SPGnWC8PZKqSZv29`>L6P~NLD!e|sdzzbiPt$S92WEV43}#76sbt-rR-klo zX2NZYe!YSVKkC*bJXg^CHo;D{T{1#qq23LrrWLA-4H%kMTh%R{UFe{w#CS)pb&0^c wy;iN2cl*w<zo^bHm#S-MERbw%bd#xL=~iPAVwo~^+VmMy#b?hE7G$sn0PM|H5&!@I literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/message.gif b/ecrire/img_pack/message.gif new file mode 100644 index 0000000000000000000000000000000000000000..d4c083428d3b93a6bfcf78376359398ea7f39721 GIT binary patch literal 318 zcmV-E0m1%9Nk%w1VHyA$0J9GO{{H+)Nl63*1n2Lh%gf8IuCCYTbMW-Vg@%LC<XEx2 zU&Y@Z_V??`-#Fjj-|Oq^A^8LW000jFEC2ui02%-q000E*@X1N5y*TU5r$a$lSYL>Y z79j*kyE;>`w!vDd2yhIH6H2lIV+U~9CLu;*!Q=@LkEfEkI2chX#(>H^fMfszcfkMw z1B~&)fJ3VXg}^yIW<LW5HCz4wH^y*x0B>dz0tI<g4FDlV1Y1-Ij8IVm0z*p%3^JB0 zS_usX00@?H0RR9DsH>_WsH&{0R|H}MtEmPGmj(^CtYT$uR0al13oLXCp~b@t0+4DA z0uEwoT#UwQAj#HE1>MI8iQo$f4&VZ`<Wz&!x&VLcRmAl43TXBD`3D63{{3<O2^^@R Qlfi=s6Lwh0P(uU&JDUxFi~s-t literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/messagerie-48.gif b/ecrire/img_pack/messagerie-48.gif deleted file mode 100644 index b47352d72d8b99139eac29a831f9b1509926e9a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1027 zcmV+e1pNC)Nk%w1VK4wN0K^{vUR_$Ywzj33WY^Z##I92E-;ML;uHfL`^zF>a$;s5f zYT3z(l9Gk=<DBTzcIn)vxUz%Z(x1w{h~vmw@!Npn&2l$3GD=88)x1^Tv@G4oZK9%` z=f64d)M<HlXXNDMA^8LW0018VEC2ui05AYB000I5;3tk`X`X1RuIq6O3BwF7YqRbV zc%I}Xw8L#!$|ZOY14RJ<)`+)UfZ>TKDOgXy3B|o))hiaOumlFQE=o$Zj^9|pFQ_gK z0+%qHBB@Xc6cra+X>}qlR7rqXepnD55D<U@8%{!X2LNG<j&Tq&3k9MD0F{Mm2Nwup z5|0oPRDh$S5QB863>OcJk**S<vkk%p9;TOFh!<B7aeuQA8xX<`3l<w_$3!jzno1P{ z3=*Q^1q_lB(+?iDPf%X~<g=m;u+#PrgIvg87Q5r0<|IV0x4?=4IcM5wdl3MD0a206 z*=rDifk6ZKwkRC3Ex`o|52a0vumFOAlPD$sSkN~lL8$-?l}((6vSvj9O-|w1VPFS? zN*6X5uxG9&MgagU4APkGP&+9ehB|PtKn?>7Ln&?$dh)>n4;DQ93_$3~4lOWXBuEfo z0|1i`rpk4oz=Hq;_ApAgVBzP6EkJI4NC05~Kq?z#Sb0#P!d$r;RGn<_U~k{8fU#}7 zkN|-K1sXs<c%VT;W5;qSOpRP%v}L6XG6!iY!sP}83qFG`ZTj?M2Ne`Z0xLiO0RlWc z%uc~pQ)k?vd7nl-R|D7!$3ZK=fI<1j5@-@^xB%cTf(X2OH-0=JEQZe-xIf^KlQxMj zF)j!QjQ{~@_0-8#!32%Pr$Gc1aIlj9U?yzC!)l)q@IZeCO!wPV+fhZq1RVg7kbNWQ zz<^X0gchNM{xSC3b_6W2fCCw9Xa-9s96$wy|84i)aSKdnz-Jg7cib-(#K=Jh`FwYu zM-^DHN{;UZDWq}64Y_~@890DJ0T|4vWQg3HbfAw9OrXI8Itr<#1QIBaB?c4_kjIBA zyr9d3xH&n10S-(s0e4akDFJs{#z~$rARfXEo=KdyfB^^`fWU@+0(vEP6~IY=1uxN9 z;{h9ZKmervK}rp&2NdAv1n6O4CI@kb^_L|re8GbPq(;!6S9l)qKm-+VK;Q(1cFJH1 zU$mu(0{!_%VUPV4kO6_P${AFES&0^r>{fX&yX&qCATaHQu^Rj38u+!9ivW*)+g}Id z%4w`lQM{m*y87u#Ap#s!dnmS;bi|gr76^bR0v!~v>Acz6kVAN6h58Ys9LQM=z=qss x?^<M00YC)u&WcUOpQbwnSeVgDGP)*{MF_nsYrFAUft?$3h!3N2><}RU06WKTt*`(9 diff --git a/ecrire/img_pack/messagerie-48.png b/ecrire/img_pack/messagerie-48.png new file mode 100644 index 0000000000000000000000000000000000000000..83c734aa273beb5e3b27e7815289563a4248733e GIT binary patch literal 1557 zcmW-hdpwhS9LImpp55D+#4&~yYILzF)JZ&BQ*;$hO&qUnEXuUGlrGZ4vToEu=}d=7 zk#uV7CS6XWb&7I?l<qE(I(3|idg*$8`r~<?-|u;SzrXM2{r!D@znx)A<}>MzbN~P| zG(;Q@zx>gMN(KPok{WH`gqR>)ECk?Q=iQ|eA2?^H2TRf;RIAc6WT^@uj91AO+|XoM zf+AcYi{F^is0aXnR23=~Ms9d0|6)yKNB{-|0w14-&OH8Q!_~z$TpVNQCeBND28hLi zqkzbg5E41JU07eYwpT9xju5EIJ%xqsThjpx%exRmVqyFhf(dan8jXwtIhDyIC5ir; zv|d$Bp>hwMBv84=h5yFRs&#qLlkepJ4gNINSgv0ej3%mUZ5#Uf`lL))icm`#8}q$< z+A2(b?PXPliUVL|Ty~(0OAe^p`Vp$EUnDi#kM9g%urOX07<qa7x9O6v00qdl>0W9C z2NR-D81xmp^ENCEs^ly%Q{@Mr-9JuUH(@y=JmbUbC@7GS^lj+F@D_<!Ue4CJvAMX} zFLTrPek6QbdAr(=_a`9ipv}oM-Qg)AjL4r<#^gdyqjLL6uvtf#?gT5OI-@hI5QP8U zOS*ftPOhtm>T%BSsj|R;z1~qcRGPifU-guj*4Ebc&6WTVacUccDe%?N0f8D*YUo8N zR=Q+vi1*FB>WHeG5lB#QVP}5e1ccY`07FW3cpncv#wcHY=g{Lb=a8ba5NB<+(a7Jl zEXQ|sA@2s1G-X2*DJC=g`Dnt?+Zub6k@(UfdKngGbs!W%AkovJW@j8nH|2__XkU@; ziwq1h3zH<3CbX2+|GG~7UZ2xa7G(R&?Cdp7o)MLX=ZhdOk=D>aPjs6r785nq`k2ED z)k9x)?V@W*W9<2z4<6X;PhI}U%G~jAA;y407#;1@>HGQP;P<6WsAq<^7cARv5B*|` z<|7!ed6G4rtkEYAq)=ddXMv*!(0g@f;y`2qMFPVce{!lIBxr^vdn#-WIlefkE^SMY zht@5caNI>$KkAM#Sl#}D)07epZwZ8~3l3>+BFA>a0?mb<(6rr2m%=3@I4srrm;$@J zD1YACH)Jv#rMbeO$2l)r$|B}iVN>mJkTbchy&d)UtKQd&vF(degj*b;5Kk}c$<GU> zBJ4dekuYPPjPj1Qa!)+Iasdl}m8#2nzIGA@WK&OW&HDVwW!5cClbw9mnlK~g#85+G z2WM|7UvT--=3pDk65ff6)~_U2Ge-)fYY?r!#$*y`XJWv_%}}g372DkP;>8Vh;;lj8 zM){Z(79~=yC@wDksRl*}3>|@8;db{bat|2CK^Kb}8!?m}85!wt_S`x4u?~CK9ewSO z-UgF?pq_<@77O13!A)FdhYe{*^ZL8MptMHKWB16OUf$@SfPvl42!T0tTkkt2W<72$ zN!U9rpf2OHxy3ao@Xj^VXIGO|Ta%-evEE&!QmM<SuSJ6Rgal0oY{TCNhI_8>uJ5}! z+&=$BM1{6u++ge(cjUQ?giWhC19zf^f}NX4ol^2J2|r5v<hq-bzOMwHGth%QYVYb^ z4vl2?mE<0^3F>kI-S4-59CFJ@f!@g7wx}sYI%EH|)PWIeF0RcK(4mdp*H@(ET3zYu z0$e=gE$HPIXiywDz6+&tamjxjSsDS&l%}TQ1GTDWKaNVR3+B|yDH?|7toy`HnOmvm z=tS*B)TejHj7aEAV!}1uBj>VbS2hBDCE@&1j;Z?hj%D7`RdFl4y*!h#{GsMayu;?n z?gafjx#V;_ZLU%|<#I1IsSF{qS}XF5=Ue+d(g;Q-KKIhau7ef*H$C35TsIXv5FrB3 z+FW_b&@r>Kb^4=!h|*TNkHg);$^&sirk{M&@<Tvbg!sAVa2^^Y<-v)CJ#a(iW)EZ` z-FO6biWOQVvzR4C93FHJ!@^jjkt4Hq8d@3|?tp3-{|w%k@Le=I9)yV~a526)Vt1n} Q58mq_G<b>lq)3|cKi&ULmjD0& literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/mot-cle-24.gif b/ecrire/img_pack/mot-cle-24.gif index 0fac007bb5e73b98f4bf023c27d09dd578cd4276..506f79e9d443fada9e82e5a652403ad45e32252a 100644 GIT binary patch literal 175 zcmV;g08sx&Nk%w1VHf}y0HOx~_W0b(&W@+5brTZ|f`fcbPB`xJqwenRA^8LW000L7 zEC2ui02lxm000AYc)HyFkd#57RRw5Jt|fqB1f923SU3*mk(I{~2COM_u`t&jXmA0| zs^wA%0|K5WBN8Dgt>g@uM45b|Bs9tdkhU#fs7h4Gnv?PYyRx<hO#qo#AP5AabQxY3 d&|q%{0|R$TfdU02fNuqPi$sHlYLf>E06VK!Ksf*a literal 460 zcmZ?wbhEHblwgoxXpv`FJT-CW&Yde)uDo^Y*29Mn+uGV@&6;)P%9YPg)`a@#UN|)I z$HyDLzCAs2`qYslM`B`PKHZ=9_4(F{iV90pRVF5;ch?%fygq$ye}}W9*`{Tc3bG<+ zb{1zPST|J!f4DQ{|NsArKUo+V7~~mr7=Qp|Cj;xh2kL!Ko_h#~^0>U*bzUj@hT)zc z<t5$hv6GJ}m<xGGF&$4~Y>YAKW&CIySs=sIoW>ZK!NSfo@lb>hiwFaA(M1U<=A_2P zhytk|)+dV$E%+>%nIw2P1bD;*#3e=8_}DF(`6PG*1>^+88KhX5fP5AvDM3LlaY-PT zjggnxl9!cdDTkyKkjKQx&TPph!M&7ASOm&rXXW8oDk&nw#>B_V?7}7`#<5gJ3c>+O z$q5K@N%1oQO$la{5)>5>loVlQl95qxIC7AgkAb10V?skyBLgp+59fk~PECB0dKnc8 z3I`aOf|)W_I5;vl@Q8SEaTFLdbaXICX{9{apm>m(kx`1L;HM%(E2pTI&jAI;hGu3P tdl?Ofg_(?;OiU&c6TUb%GcfT;2nZZF*tkkbhDAU?!J(O1&zXV28UT-Ci7o&D diff --git a/ecrire/img_pack/naviguer-site.gif b/ecrire/img_pack/naviguer-site.gif index 35f13e0f204bf82a458035de16d01487017dacaf..d23b1d2782bc460e5b8d36b4c46c0325f31f9a08 100644 GIT binary patch literal 220 zcmV<203-iLNk%w1VHyAw0J8u9nV)&~_4RUeY>teH!On5S#<GZ#U#h%GnW$BMfO6N@ z*Uj5)@ATFG|NpztHD+aHA^8LV00000EC2ui02%-k000Du@X1N5wJz&y(EgtUa*r{B z5~HqaAqfR5t5Rd%wlcwZ-$;v~Fi5Bj2*aW1WDy)jshKKq0nBPX+u-sT1aQEl5Wsy1 zkiq2$(KK|P8EjTp0c7RAz=SGM_|#A(2RkSaVnYcDNMsTQNq9a3el`LVlQvOOGcGSI WfF~P#4<2z3pd*758fC0p5db@QeOb!@ literal 220 zcmV<203-iLNk%w1VHyAw0J8u9$jHdV#Khd(+|tt0;o;%t=H~zZ|4>j+p{1$J%*^QM z=m4-ZjnDKkwR6|k*Yuv8A^8LV00000EC2ui02%-k000Du5XniawJPh)yOzZvj$~;b z1$bC%)l#TLob*Y^hoSHJuJ^vf4Iwx%63B$%@JK2T3+GZGDf)ibW%fWtIE+$eIGS8K zBm*FCyB(mx<wGOve7X?{HTJ4sCL{oTa${itfP!p%h6sUMb8%!yON)(si9wWzmWmPq WHJ>8^odKk!rl+W+7ptrj5db@j(`2>) diff --git a/ecrire/img_pack/pave-blanc-16.png b/ecrire/img_pack/pave-blanc-16.png deleted file mode 100644 index 363993cc9f6d251088aa0cf42d4c5ecf94ecdaf8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAv7|ftIx;X^yK%)o!U)KhEOCt} z3C>R|DNig)WpGT%PfAtr%uP&B4N6T+sVqF1Y6CJMz$e6Y_3G9C|Np;r>(=Shr$2rA z^!oMdef#zSMV6<1iU6wNC<*cl2691w;a>CJNTAp%PZ!6Kid#tu>4{0n4$NoP^t@qU zJaXU=&youa!qURZ4h)6{hK5N@VrF3t3`q&eN0knqIKm^~z{ArM!N}~u@NfzPhr%2o z2F8|PCWVFqF9sF?Kh6e*Lz;{N4i>5mOdQKu2rKGnoXJ`3!pI`PtS!xbZ3Qcb0$ahE nWKSNDOU|7*)ua29fdv>$TbX(;ta@qzbTxygtDnm{r-UW|#~E?g diff --git a/ecrire/img_pack/pave-blanc-24.png b/ecrire/img_pack/pave-blanc-24.png deleted file mode 100644 index 742b554de819cc7d3e5e3cad7990d4533be8159f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 365 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TGEa{HEjtmUfZd~z?Faq)=OI#yL zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<v1o(uwu2`|+|Ns9tZ{Ga$>C>rG zr(VB)y=TuJph%@6t29szM@f)hFpvuZ4ELJ%Mgql-d%8G=RNP8RNKZ>jKEM?bA$gOL zsiScwt4AWMPmWIy1LKhcM~-xG8*JXl#3H~ft?ifTrY6?Fkd%;cgjs@tsiVQffkAKr z8;1hZB?d+p2PuUH4i9D)0mjS*1|<bv0SA^PK=UY3#LO+cuZ2gzfoDz5nTkz}4h)73 rpSjNYumDBg^sLd@v01^Pfsx^i3G;5d*9T4ly~N<@>gTe~DWM4fGUs#d diff --git a/ecrire/img_pack/pave-blanc-36.png b/ecrire/img_pack/pave-blanc-36.png deleted file mode 100644 index d57ed9bd948f988dd63f80fcfb6c83d253caa675..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 400 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`ZSkfJR9f7<XSNtQ4fPBdk*NBqf z{Irtt#G+IN$CUh}R0Yr6#Prml)Wnp^!jq{sKt&P(J|V6vR;>8{|NqUKH$Q#)bn4Wp z*RNmi*|P^IQmM!)4OGKX666;Q<bnXhz2?1<K(SYzE{-7;w~`Xl(~^=8Fh@j4-ehFz zXq?IF@sQCc$ESyZ@yLNAM>^yUHg9BN5nz_qW_0cG(E*7b@DMOyU=axHVqogfaAjb0 znWEIdpyVa!z#zDkL!qG~h(*A`MU#m`VUY+UZIvY@Br3%u0Nui@Ep2>o5xYWz#DS$E ojZQp3#tq5HNDk3<21Yi9mUdSCEQbvSKwmR>y85}Sb4q9e0PXg9?EnA( diff --git a/ecrire/img_pack/pave-blanc-48.png b/ecrire/img_pack/pave-blanc-48.png deleted file mode 100644 index 8bf1014b7e765f00e7d43c731d3b7293eafa2abc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 491 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`v7|ftIx;X^yK%)o!U)KhEOCt} z3C>R|DNig)WpGT%PfAtr%uP&B4N6T+sVqF1Y6Dax5#STzx?;tOn>TNM`t<44sZ+0C zzuvQF&wnt83{>g{s^KUJ@(YHD{Aak=yf>18fzj2|#WAGfR#HNGQc9`<r@`h88<|-I zn1zieC~+EWGTOul<R~jkuWaa?%Bs*H5fSNe?bxvsJOU0pJUJ;0Yz+)b!O{*46Ib#o zG@Q7?Cg6~g#mu2#v=yjr<}C)M4xd~GMwew~LsS{F@yoZK35Nwh9*>xLBBPB77#cfx py^9u$1BGtfjF{n>pTx`}!LU5UzBkx5Iusbl44$rjF6*2UngGMwp49*V diff --git a/ecrire/img_pack/pave-gris-16.png b/ecrire/img_pack/pave-gris-16.png deleted file mode 100644 index 07361cb5d2c0a06e5a41a6f630a5e7c45307e768..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAv7|ftIx;X^yK%)o!U)KhEOCt} z3C>R|DNig)WpGT%PfAtr%uP&B4N6T+sVqF1Y6CJMz$e7@<jIqN{`|Rn_wJ4zJFZ;0 zvU>IETeoig|NsA-cIj-O8jg}6zhEF21Q_l$?~MeC?e=tW45_%4l#rg1nC8l?<J0qo zf$_+J69*0)YT>#eF=M6#BU49X>&#wG<_!kMj4T4o#@xbU2M#a^IPk2wab)I=2u3E3 zb{1i62Zo1J7&sK>2r)3W1T!f#6nHVP2>5X}FdWik6mYOmWnki1&Vo}>QbOusIk3$K z8cY{SFaYi3j22;9ET+&PA#rnt<c$p~Yz+(`S0*|7+wmND!Yq)$ki*4Va>A{q5$FvD MPgg&ebxsLQ0LZ6#umAu6 diff --git a/ecrire/img_pack/pave-gris-24.png b/ecrire/img_pack/pave-gris-24.png deleted file mode 100644 index 6a3dc9a50be2e18afa7a3adc3d351746412a02a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 376 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TGEa{HEjtmUfZd~z?Faq)=OI#yL zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<v1o(uw?%A{F%a<=JSFXHq<HoUL z$4;F(b>_^O|Ns9BD=@eL)o_#q`2_>HAi!|1d2b|8?2@O8V@SoVq=fX8w1h)k5t5QO z8JRj7C$=`WPUYoJNKHseW8qL>OJg&OX_(q6sL&uG5mDf^*>D3BivY8*wzS+^2F4=? zj<m5GFtP|RW;QS=Deww7uq*)@(qQ7iAUJ`ILxJfM1EY(BltKfC2QyiU9D+b@2xF_^ zlmt0oW`SCXn3`JyLsCLYTGD~JoeV%1&z(3?v|NmZ!+@coQRp{wL-Ki`?-)E?{an^L HB{Ts5egAU{ diff --git a/ecrire/img_pack/pave-gris-36.png b/ecrire/img_pack/pave-gris-36.png deleted file mode 100644 index 6e4d873bb4699e0d6e8d17990bb94882ce7b7135..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`ZSkfJR9f7<XSNtQ4fPBdk*NBqf z{Irtt#G+IN$CUh}R0Yr6#Prml)Wnp^!jq{sKt&P(J|V7q_U!rc<;%*ID{tJmaqQT! zQ>RXyIdkU!|Np`Y3~oR*93?@1!9XquFx+e28wnKq>gnPbQgJIOAw4B6;Sh6#q~uLT zrjEvmt&OcydDRnA6Oz(cI272@*v$SkOzjj@XpoSI;Lu1)PGAL!s)d;~xiPW`FbhjN z9$*o0aM5JqP*@}a6bbBNVCv9tWngrfqSU~k<R$39Ah?u6p`jy)M#?r>IxrY+FcQ!+ z09xEQvD0DWp+iSF1RQvJ&iL@Oa2Yl*fV`NZ8Y08QBEc}dU;44`HLFZu05EvE`njxg HN@xNAJb`>r diff --git a/ecrire/img_pack/pave-gris-48.png b/ecrire/img_pack/pave-gris-48.png deleted file mode 100644 index 39b2772f40e2d0d14a2a7459869aa7807282fbaf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 509 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`v7|ftIx;X^yK%)o!U)KhEOCt} z3C>R|DNig)WpGT%PfAtr%uP&B4N6T+sVqF1Y6Dax5#STzdi?nDKY#wLSg~T;wr!U$ zU%q+s=AAot{{R1fZ08<npc;;nAirQB7X%pYHSdjNU|<aQba4!+xRsQUo|2fR#JORE z;U;Dl0cK@pW^QTChN+D+dj%C5BqAgtZhEljoXKHeJaXX7AvdFh1V#=8HnmHo8#fv; zvIs=px-o-+slz9ifzf4|Sp$Pou(Sii#Fe}X4JWR!2{@!=F>@#wZ3QZvd22{1Gc?#Z zX<heJPGAs7NSw%!Fk%3Pjr2=iuLNTekXYnQ&+Pq8(tAO{a_+=2rzqjsj5m(3aTqWp YZFjhN>t&1>FxVM9UHx3vIVCg!07rqSWB>pF diff --git a/ecrire/img_pack/pave-rouge-24.png b/ecrire/img_pack/pave-rouge-24.png deleted file mode 100644 index 71d6382ef4c32b6375754f216d7695b0f062a4dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TGEa{HEjtmUfZd~z?Faq)=OI#yL zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<v1o(uw{%2(TfBN*7&d%SdsZTa< zzI*rXPgB$X|Np;S>#z=}hNC3NFBr%L0fu|cdn18jCp=voLn>}1C8Vb$B_H6LAsKm- zk*T9`;>?+?qS^^b$w{mn3T$d=VKEJ@y@Co25;r0WyfzydGP4LUGi%EoU=VO%SpwA1 zVB)|aIDw5rf$0(hql<%-LIZ~fPz_^d1A~$RFJ+1(X3YGcn$p0KlyGG3g~po<Kvx{7 pWKCCN0=ld$%q{Isq=3Q!2LE6DQ`ya2?SXz`@O1TaS?83{1OSX=ah(7F diff --git a/ecrire/img_pack/pave-rouge-36.png b/ecrire/img_pack/pave-rouge-36.png deleted file mode 100644 index 7c18fb8a681d94f0599cdaafa489836baaf1d69d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`ZSkfJR9f7<XSNtQ4fPBdk*NBqf z{Irtt#G+IN$CUh}R0Yr6#Prml)Wnp^!jq{sKt&P(J|V9E&z}9?*Y`gs=RX6(e+h~I zK=A7qkZ4;b^Bt&$qa?^L7$gV;4ELJ%MgqnDc)B=-RNP8RNKZ&fJjOgj;>Ha|rjEwO z&Y27eDa;%SY;I|3Y-V9|7*g1n9T*HZFkF2Qc;wWnBWG9y92{ILrZSvON@L?tP)Jf` zm@yNmQ^S>k(PfHK1A~&6paX;8QVxZNjv$~~7fmJ(g+(HaECPXD475<jqQ%XTS}fMU zz%)(D=Z7exC<BWCGxLf$N&#O$ENSJ3PCN<?5;q#VK2B-ZS@1|e;Q+&~&tjkMB;V5q Ph697AtDnm{r-UW|$ee>M diff --git a/ecrire/img_pack/pense-bete.gif b/ecrire/img_pack/pense-bete.gif new file mode 100644 index 0000000000000000000000000000000000000000..c903332dfc1c5f3a295b72a8e8813631305491f9 GIT binary patch literal 307 zcmV-30nGkKNk%w1VHyA$0J9GOva+)M{{L`raG=)nj*gB1tLO&@2TxB=#pU=lH8sr4 z%-r1EOTO&u^Z4fG=IiV0A^8LW000jFEC2ui02%-q000Ew@X1N5y*TU5C&9w;af^{u zra&BqPzkPQ0D>VIM1Ty<lEeg`ZIZAhPND##z(hD~032a9X(_A*$CBAxJq(9y>??=@ z2#E%l%eX#{<Z5{qLado><EbS#M+0{S0{|y*d=iESB?<#~0S5vlb0ZHd3oHgE4R!?# z4N;kN1_~2VACL_Js;dF1PYER_7g<XKtPM*DXkU~RFluZJTb&I<7&DE5YYi|N34qFL zgR&MXoY7px#{k3F1q}zs(B4b~1Y;BiO2X{z?FfXk3iI^!_6kuKMWOut{Jk9l3d|4z F06QOacoYBt literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/puce-blanche-breve.gif b/ecrire/img_pack/puce-blanche-breve.gif index 597b7e52c7d4c23c46d45fda978729f21a578eae..c0404d9fb682c57a42ab41cfd2cec9df7b16b34c 100644 GIT binary patch literal 53 zcmZ?wbhEHbWM^P!XkcIn2nhK9|G(l-76uT|0TCb>1}2`C{Drfm_bM>ITNup1U=09O CS`5$t literal 132 zcmZ?wbhEHb<Y3@r*v!B%b?VfLii*dNAMf3}H$6T5-@kv|-QBNVy}Et-_Qi`A4;?ym z`t<4M=H^YCHZ57Q#Kpx$@h1xd2<U(akQodth96X%IXotH1_gLD6!thV2>31L>2)^X hQsOuvV8D4?k<H*mYis|42O1o_jSmGCY)k|htO1rtH2eSn diff --git a/ecrire/img_pack/puce-blanche.gif b/ecrire/img_pack/puce-blanche.gif index 6f2e0f34b88c929908c0bd994e75d4b715634af9..800fcd1ccb740f7c0a31729d7175bbdb8a8f774d 100644 GIT binary patch literal 56 zcmZ?wbhEHb<YeGvXkcLY|NnnLK!D;;76uT|0TCb>1}6TV{sr8}UdM44UHf6+Y$L*8 F4FHgM4zmCN literal 185 zcmV;q07m~uNk%w1VGRHd0J9GONJvO|d3mz3vXqpRi;IiY)YLLEGW7KHrKP3J%*<wH zW(o=l|NsBS#>U&*+vMcrA^8LW000jFEC2ui01W^R000DL@X2GAHAiX!9Ak$A5L<A3 zsH2d~c%oncFzX;Bcp@N!q5uN~LeL-zb^`!l*eE!i#iW8*I9RQPqEAqTfeHdeV32sB ntOJ4|ATWOp3HCu;@D>6J#{*$7D4q&^BoYDueH8{v5)lA9of$<X diff --git a/ecrire/img_pack/puce-orange-breve.gif b/ecrire/img_pack/puce-orange-breve.gif index 11fb0340d810ec03fe075fff33b4ec4969c2dfb3..70d0ec8b28deeea7fee6680c190700c140386e1d 100644 GIT binary patch literal 53 zcmZ?wbhEHbWM^P!XkcLY(HHjr|9{1wEDRu^10p~&3`{&N`GN~}_69T;y9P5bSOWlf CKn-~S literal 131 zcmZ?wbhEHb<Y3@r*v!E2{P~N=tD|4eHTZhSeZj=uX|0JrUKHF~+q%8PqcS^YVuf38 zVa~b32mgL+T9#mc>vW>xPZkCc&;b!3GZ<J51U5{)lyph(n8&Phifrc|ab&zwIP`#z hsfow!tx{`(Nw1&?%hAQ(0t6W5IVlD*xG*qS0|3GDG>HHJ diff --git a/ecrire/img_pack/puce-orange.gif b/ecrire/img_pack/puce-orange.gif index de6cfea24a658c45075b4dc651057fd3e3ba7776..efee1f26239149169632f3286b71dd6708433843 100644 GIT binary patch literal 55 zcmZ?wbhEHb<YeGvXkcLYF(Kmr|Nn|VSr|Y-2Sk8m7?}84`URI?+c#lOiQR{HOIaDL E0jPNpga7~l literal 177 zcmV;i08al$Nk%w1VGRHd0J9GOqLGn^ZeH)!(A%0^T2e`!R6pFfr1Z5q=9Vp@he!GF zeDu><(vv{UaWc%tS>)v8A^8LW000jFEC2ui01W^R000DD@JT>w1u_Q$dMANa3_>Xw zKo9~&0T?hm6kOXN19Id@(-t>`ZYcB>gomW^&}-=qi)b{-XfdD*g?3s^T(eq*lo0@U f!QsUq(Fr6RVXY%keozu`$2<YbP%IW04-o)6jypo~ diff --git a/ecrire/img_pack/puce-poubelle-breve.gif b/ecrire/img_pack/puce-poubelle-breve.gif index 6318666acfc7cfe33fdd1d46f81be9e73e302fe1..cbd60426afe89b3bef131b9b20c08e9c5748a429 100644 GIT binary patch literal 59 zcmZ?wbhEHbWM^P!n8*ME^XJe1|NlRbq4<*pET97-LGlbtJT3W((#v}n2nQLqa4}c| E0FYY@>Hq)$ literal 133 zcmZ?wbhEHb<Y3@r*v!DNb?erQj0_10iPqLuZ*OlSBctf(=%An=XJ_Y{ni^YM+s@8T z6&00NuU;`RF)duUQ1K@V0|@AV2#^^JEJhm`7l|+i-O*$y@<<R_@PLCSnQKjv42QPJ gK?9bq27|+&byyEMBt+=&HMuJXW{3&(axho}06+F7VgLXD diff --git a/ecrire/img_pack/puce-poubelle.gif b/ecrire/img_pack/puce-poubelle.gif index 0f615d5774f87c1fbf9d10579c0f1c8da9d12b88..36370094b6cbb075bc221448cd715a4e5a6fdd49 100644 GIT binary patch literal 64 zcmZ?wbhEHb<YeGvn8*ME|NsBrvu6*Gq4<*pET97-LGlbtf-U_*yNhlK1o+(&*Xm<4 Jsug9h1_1VY4|D(k literal 185 zcmZ?wbhEHb<YnMv*v!w++uPgR+-z@eKV!y>nwlDBW@a@tHD6y}XJ=;<6O+iu$il)x zAt50h9i9FA_dj{^MDZsJBLf3JgAM}_fXrZEN&DcL&}HiIDnx*hF^FT<3<f{0f)m0K zyo$nJ$%3H=C29^wupah5uFcoKr`bW1<sC~`Ym!!mk;Dbp1Z~k6%L@k*WFllFI*;ZV k=IQTw!}3@`ZZ<b3r{g^f4L&<g7AXdfFg7MeAwdRf07oA-!T<mO diff --git a/ecrire/img_pack/puce-rouge-breve.gif b/ecrire/img_pack/puce-rouge-breve.gif index 6f68035c2d3764d0b686f2f708913a325785afab..c3d310f975fabad4969bec4bcb68ed622cf5b10d 100644 GIT binary patch literal 61 zcmZ?wbhEHbWM^P!n8?8JABce9+&KmY2F0H&K$3w$2SkA68JPH5@)yo}G?9<xVCPN= ID^><;01iA5j{pDw literal 135 zcmZ?wbhEHb<Y3@r*v!E2>dl*;yzIBF74!T(KF{g>v3}OY5U+i^clFp=o+`=Cij7*< z+kG=B;$>yt^GoM;I9V$GWMKdS9S{LBgMr0FV9tUNivug4-U&M1q|!7&f$@_~+eW31 kgC@Mm3eAcFEeCiQ*%k&U7%+7^HcgjEuw&#>V`8ud0Pn6c%m4rY diff --git a/ecrire/img_pack/puce-rouge.gif b/ecrire/img_pack/puce-rouge.gif index a8aa20fdda596be197ed44fb1ca6327fe8e06d55..10a89da9efca373b75078551682b218aed11ad04 100644 GIT binary patch literal 66 zcmZ?wbhEHb<YeGvn8?8JABg_{|JU2gz`&sRlLbgJFzA2?kURsEa7+I}>0_^3rtn?~ PKD^{zYJZCZBZD;nXWkR$ literal 175 zcmV;g08sx&Nk%w1VGRHd0J9GOj8{>cmX&5&Sn!E`(pF2YLpt=TmgR0`!nLy*9~N;k zE~GOr@Rf+7dUo&D(B$OgA^8LW000jFEC2ui01W^R000DB@W~*O6+vo&k#C#^Hi%;) zpdcwg!x#oLG=&lXOQ91yQ7kM)uF&KCfC?h-!0aK3%z?C7+Z_gs?0~5Q6s|9r>`-U{ d2m_dU+qwa+Y6clF0SH<%yGldh`1cPH06R8xLwNuI diff --git a/ecrire/img_pack/puce-verte-breve.gif b/ecrire/img_pack/puce-verte-breve.gif index f4ef389a12b71effd81a16c7e677ea47717c62f1..2c83a13ca74d5011e6d403aab74c470b0d6a2376 100644 GIT binary patch literal 47 ucmZ?wbhEHbWM^P!XkcKNyNdw`6o0aSC<Yx60g_>0Vr%JNdAgUC!5RR-eh5MU literal 133 zcmZ?wbhEHb<Y3@r*v!BXkrMRi$^EVGiZfPQwjA@!?~U2HXM28CcIWPts;%C=)7ocU zj`u6GjB0Z{`LAp4-e$$0EDRu^10q0XFt8XI%wRrXD6~RAWCqVC8%}4_!xMOT5AYn> iB*1)Gz)4TQcOnPh@pTI_bc(v!+zK^B_-1o3SOWlODK7E= diff --git a/ecrire/img_pack/puce-verte.gif b/ecrire/img_pack/puce-verte.gif index f18e77d33d5a3ba0612f2a9c7a5c8b5ecd3f2b62..eb6e554d3e38810acdaa6938d1ef4f9331f4dace 100644 GIT binary patch literal 49 wcmZ?wbhEHb<YeGvXkcKNyNdw`6o0aSC<Yx60g_>0;%Mn#dHOBCKO=)R0M$DQ1^@s6 literal 173 zcmV;e08;-)Nk%w1VGRHd0J9GOWTiThkda<#S#y(KiOWl|>TlTJ&>0^V#QBCsX*oYi zI<UW_l)`45*I1y^Y2@VOA^8LW000jFEC2ui01W^R000D9@W~*K6+vpD!uo+CY~5m< z%OH%Q0DK=aB%P7~0Fe(kK-;&T&i4~G2*{odM`#op&|%`%ELg2apR0=KT6KZ}uh1<Q b2x1C=LH6nr5|x<Ykf|~gj$oR=NFo3`raeZO diff --git a/ecrire/img_pack/racine-site-24.gif b/ecrire/img_pack/racine-site-24.gif index 06d8632d70fff838c3a5745195152d7dc1277d6f..04957d4fb37d45db77e826263976ad096608092b 100644 GIT binary patch literal 341 zcmV-b0jmB-Nk%w1VHf}y0J9GO-1c5UNHm?Fm;L|r_5ZT*_1DtX(0Q3Ts?j6o`H*yZ zY^%m(y1%o?={L>ZpziMOA^8LW000jFEC2ui02lxm000F4@X0w16M`Aa`%^)vfTG6< zqBE>RVT6MDpodeeMeYu-;?ag1E?6MkdY!;wVPolnj_4t<nSc%ghXLnuBo>Q<I7Cq* zm=1z>-B=(H2Y8?$c`d=|L=@0&yyFM~3=#|qaSMD2d<~3#Z;wh60)Suu35|@8j}2my z2Mvn=1elqR2?Pf|4}}Pzq5}i~va_=U2>~$=FK?g(0|~&vii~^#4if<jjiSH=w!wS= zffOUeqR!aPin6I3$*$NsMbH5qDBB4-M%lNj93TtMTtznp0qz|n3@lC{3RNBqpa^k~ nAdCzEIS3Rmg5U@R7!aB;U;)F0h!!cz&_%JM$BrBVA^-q8W4(r} literal 477 zcmV<30V4iKNk%w1VHf}y0K^{v!`JPv%;}P|*R{2|H)EpN+TL+-anIoK;NauL#KmQT ztweLLsI<vii^H6qo`8p^ZI;Gzq}KWR`?|;3<@Wwdfxe=_;?B?0P+*NTOn;7}!FG3q zf{2dl?el=G+~nlsA^8LW0018VEC2ui02lxm000I5;3tmaux(HJYy;_%7q(4OEp^3% z6)(wP48#pVL=<q3MDH`eTo9dGp>QYw3KB%7<tk(z!CHq1xJ(#mOy=U!Jv5U}=P)@7 z9tw>9ODbR%Zwz!63<4Su3JU}oiy1s33>gXv8X5tH8WD&U1dE*+3?mwU3J?$$rVR}h z6^fk%3mF<C0t*Y15CW^Lt*)>T1hXQ#5ULRY5WK9mwiW;l!XFF^4G|sz9Tpzj9ueN& z0Tu+IA{Vw55CIh77VQ=S5ylM*Y$M4P4ITjP0qg?s)zG;JunNL40096fM5xVMg9$GV zLAa*yfW-s*{&|Sjhnt0q7Zvss@Q4JF3zh&{P@oX<z)A)Mh?qohA;AC#3@Augxsr~9 z0STU%EO6l_hZ7u<ZaBL1=Y^OfjMQ{+)PU8i29i3J8MQzHn-0Q?6$|t!f)`RR)cnf! Tt6Hc%icFb1x5(KMApih7PT<3o diff --git a/ecrire/img_pack/rayures-danger.gif b/ecrire/img_pack/rayures-danger.gif new file mode 100644 index 0000000000000000000000000000000000000000..1f8d50ef05e663f97ffcc85de7dc3a059f5e555d GIT binary patch literal 73 zcmZ?wbhEHb6krfwXkcUjf_LxUDgI;uG8q|kKzxu41Cv4v|H9Q3XXZ3|t4ZmcE6V;8 Xc#X9;L1N+5TN`53cd3OjFjxZsn64Ei literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/rayures-danger.png b/ecrire/img_pack/rayures-danger.png new file mode 100644 index 0000000000000000000000000000000000000000..1710a7927635ff42c74675e633520d6f91e9eebf GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!6#=yXs@#Xw?AcrO0(btiI;o6NW{t-q%zGR7O zL`iUdT1k0gQ7VIDN`6wRf@f}GdTLN=VoGJ<$y6JlqGz5ijv*Ddk`fXUGAh2mlVx^b zFl^vdU{`36NKj&6WD#fNP}srY!=TVGA@zU|1LF~nV74a>nGFnwE-(o=^aQXqPnaMO z!Ro+}ID=8Zp}_dU*~XVl913DFLI!3I3<uvjOmE0!f%64RK;}Q3%yJQElFNyS42&(0 zJaXOv?NF<kq%fJ0se^OAN(UQ|>vRvOOC&$3*Z^p>#(|{*vIlZlf#wvM9%67{*f?Re zAR7Y{hw_}xs~pTgvz*qs&FBVdZ;k0SU=VQ7d6Lz_2y~-l?-4dVhXzIlFYd;R8lRf? Q0)5Qj>FVdQ&MBb@07iCXS^xk5 literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/rayures-gris.gif b/ecrire/img_pack/rayures-gris.gif new file mode 100644 index 0000000000000000000000000000000000000000..8e5d215d20570bc9b03d899d1f17bf3842691cdc GIT binary patch literal 207 zcmV;=05JbYNk%w1VL$*t0Du4h^Yiom{{A8P1ONa4001li0000$06+i$0;YtIsk`A1 zqnv@++o;|Z`^$yWM`q$#rpL*uDvP=$EXp&@*(9Fp9>4MZfD|EySTtIY6XlW_aWbG$ zse%fzUa<~sg4^}3z~V8tYyfx4YBZpYhO^0W`utqS-?47F*zX0XC1^z`W$1*MsJ92@ z_Qv=Z88|suS$KJvxyaYIsbts4^cX7HnMXzXX;eyiDvG4~YMSaf>spKIXqyX5B-=~7 JtIJdX06TwtWN`oh literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/redac-12.gif b/ecrire/img_pack/redac-12.gif index a194f92115c42de2d7bf737f832e28e95fe4b400..a93970419a2e6abeebaf82e937fce6511224e8b8 100644 GIT binary patch literal 165 zcmV;W09yY?Nk%w1VGIBa0J9GO`|4cC$jJHYiudiS`s_5fwy@F6uKoM)Nl8g2CMI%n za*>dY`tC3L@Gt1-=<e?BA^8LW000jFEC2ui01N;O000D1@X3Oz3NkBXgeXao1<24a zsF64l$DA*quulo2#Im%;i#9UMV<Tu787d5DaTovuhkzmxNDK&rgZ3aGs0sul0YG>G T6{epN<^?ne@Hm_yhyVaPcRoW( literal 143 zcmZ?wbhEHb<YC}pc+9}iySRsqjqUJ}!*AcdwSQrM_wL=bo7Ng#)Oz;p*_A6-^j4|s zZ`1GS?D!7@ia%Kxxfu8vbQpjDWCjC^&4-houbCYqESWf6Q(5E+CmaY7(&4u2*s#mt p&{?m9mY|n&neHiX;4olvcz7{kf}zP|N5wz~pVm2!WkQS$)&TBJJ8l2~ diff --git a/ecrire/img_pack/redacteurs-24.gif b/ecrire/img_pack/redacteurs-24.gif index b558f83c6af60332af4d3340703ce6aca7c291dc..de7cb23883b7cfa39766caa0246577c1dcb199d6 100644 GIT binary patch literal 281 zcmV+!0p|WkNk%w1VHf}y0J9GO{r&sJ-yPQGYt+=!%HTBX@USQ-D2|SfN=iy?ZEeHe z0`c?Tx3{<7>WuRB%<k^)A^8LW000jFEC2ui02lxm000EW@X0w3x{2yNO=1Ic7zoFW zgVP8?u_T768AGGow*VxW{P2!jU>Hyc1~DH^pddOOB_CozXgZ69#6dY=Ua?v!!**2= z7EzgnY8@&XjI_yMU^uG62HGPt90mgb01gE%f*~**bq)dzf{%iXdI(z@Q+Nao4hw_= zMQ=zm3<YgMI8JDl5|>}CZwyI42c)g7XR%9dwNGIW22{IWuO$bwy1_+9F$iPF!Db6F fO92Gc*4Nlo4jD8H-rwNi;XNc5=I7|>F%bYeD$8#a literal 220 zcmV<203-iLNk%w1VHf}y0J9GO`19kjs+LhvOwhY=gn3K=005kodX<J!)5xT!mtQO~ zFc}*c?bU#~r(^Qy#pLAVA^8LW000jFEC2ui02lxm000Du@X1N5ttDr1yDUs77T#3= zPB4UIi5U)YtgSm03a}8gO`U{BW03LP9Ef4@rzvnO1;Zgx`zQnig|_->Vo(7BVZn7p zV~26MgwqkEYY$M^5R@~4%?~-GDli3kcvVqT1OiVtU<U?ET^c4ZG6qyeRÐmU9hM WaUBJG4UU^qnwF2GsH?0c5db?bDN_vq diff --git a/ecrire/img_pack/redacteurs-48.gif b/ecrire/img_pack/redacteurs-48.gif deleted file mode 100644 index 8fd47e993eee01dc1ed17ceeb045213170f0a547..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 783 zcmV+q1MvJuNk%w1VK4wN0K^{v3G&5{m7UG4Lvx4$!^6V}bMWI0&f~_CV{T)~I~!kZ z0s#sEvaY0=007%TAJfy*Q{~g<bb3=N5(0Ao{0Tj!>CWfO)`^FGuQeBn4Q@(RO3CEn z>9V;u5a!?C-{j=vA^8LW0018VEC2ui05AYB000I5;3tk`X`X1Ru59bRa4gSsZKKSh zFO28kuN>ln(C{8VAZw?Q>>fyuQsv?0b_)U_IxSswm&0KvDNB0EsW4DngaZ<>{LGy) zv5UC;AP^`nbvGUe3|~4Le0zKX7!D2*96*C|2s;NF1ABb}5)lp*pbk<r9t>w<7dog5 znw$&-2N9qYkup9AVmxAch+}hvuSl{KqcFFMO<;-_5*Go%QnC@Y6=7iq3<w$93<uZQ z&H-9U6w@&f6}Sf+V%ixB>T((v7llxx<uDZh0F3iuIo=IW(2U&`LR)@V$maqAKLH6G zB+!7M2!;g;258j4fL=y738jE4w!$F*K8{lVs>G<VrN#*pvLxg{!9YWPA2vjYsM1k` zpDta-gjUl+3zH%|M8LqaX9EctgAN$F#ee~GD>mT#;A3gi1Q>Qc4XQxE)CJEB)FhdL zUxlPfnMRBlHo?=V8vmRPVAVhx6<fK+otprxSP5j!PRL+2f)BPQ_PvGsK<?bScU?y9 z8(|z|6Am|w@bSP=;lhpVN}!0huYmyK0;SLjVYG(_L=c>w`;<+^4t<S0^W1`8ZNa!J zRxJFpcL(6mcfbzW!UI155H{Q<LQ%Pf=ir~i)?fs|Z~}j+Kqvr!eS!Dz3xpSMetaco z&_1i!0AYQ6`SKZoRsb5nRzO7q<~M_k2OId-T@g)GvOoc_1#qAn!y!S62LzJmT@&<3 z2%8S(y@H;8ERaUP1s*~;1U+n!2&00eJU{>g9a2P3I2FPc4vh=mcB79lK2yk%uobd} zhBc68<Bd2Psl}8^1|wULP-yXrl1oDIq?hS!c-xa*J~n0)VcK9O5@?!fW)~&6i6WeI N)@kRRc-{~K06Tu4NNNB8 diff --git a/ecrire/img_pack/redacteurs-48.png b/ecrire/img_pack/redacteurs-48.png new file mode 100644 index 0000000000000000000000000000000000000000..61e1c8542a2398befa1ec530aeb91db4c11a70ec GIT binary patch literal 2230 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 JxztIT@IN&}Y`Opd literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/rubrique-12.gif b/ecrire/img_pack/rubrique-12.gif index 4501c91912ffb3253f7777b80e8ecfde1af0fa56..9ecba432ea759652a641e89099f0f792ac54a3cd 100644 GIT binary patch literal 158 zcmV;P0Ac?}Nk%w1VGIBa0J9GO?Ck9L|H)}(PSVlQ%vv0HiWr!gkpBPSsHmufgKxCB znC9xw;^edCu66PD#_sO!A^8LW000jFEC2ui01N;O000C_@Vz0-kXV95NWIyRG(@8$ z2)Ho;;{=W(T!RtZ_+cQAvEVp|U?w;ifr>%_VGt-B$3UWB089)C#p1vaB&?VkDlyAo M7KpNWjfnsNJ1NOT+5i9m literal 224 zcmV<603ZKHNk%w1VGIBa0K^{v!^6X=U?jG*u++@DnVFf@kyh8&*UQ4JdTUtM(#4{k zkx@-XsHmvq+r);2gwDpYm6D3ex}te>Yu?$*`}XVL;NXRMXJunxe0+PmvYqDO(Kj_S zm5zQ)M?Kbd9^~ZYA^8LW0018VEC2ui01N;O000GD;P(j@k%*{RAzly=sYpacP?SLG zP*XBZ4}~KK5NHyKfwIA2d>}{V;Bk0JE&vE`N<Cx{3kC)<I36MgNC#VCNF<r$!Lngg aPyojTlIdU!F&_p57g&KP6$W=7Apkqs175cP diff --git a/ecrire/img_pack/rubrique-24.gif b/ecrire/img_pack/rubrique-24.gif index 2c1b67ac2f2b31acb591f9f1ec74b47bb64bb06d..fb8f4b49ae55937b8fe01c24ef7203d4f1cb0735 100644 GIT binary patch literal 244 zcmV<Q01N*|Nk%w1VHf}y0J9GO!>^cGT37b}#>K_O<zpKkA0FZAwu_E<b6^kq|K;G| z;E|{m#N!;i+8h4=`|j@UA^8LW000jFEC2ui02lxm000D`@X1N5y>FDGu%E#Z6hZe{ z8ljHCa8d!H&IswA8UW0MU>vqjNFdM=07M_Kb<re=$R`n4xPcDR>@yIcIJMv^3=7Tz z3V_KVkSJ%l1@t47aJ1dNLW8j=C<;k+cVHq74I~e7Q38Tt3k_Tn3RGl_c2Z{yBMB86 u8wNy;L;(vmCMYbRmI($0rZ_B72~<`mlZpb0FBJ|{a=T3jz{A8R5db^$(q1tD literal 378 zcmV-=0fqiYNk%w1VHf}y0K^{v*Vot6%edXv$9HvcvQh=dxuJ)Kg~-Uqwzjq3-``hL zOt^SK<K56nMnJWzlgYrV(3fZF<=d&LsAXYU$88)dDkhhXdd|kNf>tcqh&{ixo<lq_ zo0yUH@#xsm!0ztuA^8LW0018VEC2ui02lxm000H|;3tk`X`UZqAZSY}3#JULYa&>t z$BkjX6bgY5q--R=&jbMx4hb1q%{Aym1O>>V5b;O`lL7KX>o5ciMuOq-pgpSaR5Xd4 z1%h@vz~`em10*UPczJt$0T+q^3O*wP2UmI?h>8~v7aA3gbas=KiVv6^3L6t592^~= ze3qA@4`3EyN(qvnp|B1UVVfTc9uanViMgT$4;Bp*8wyAU%MJp=iLeg^*aHd;6&xc7 z0~-w%4`~7c*VqLP3JMi8CZwhu0eI*d1s3iNV<+GZ4F+h~qaj?kIVTQqU^aongI(|X Y{rI=6g0mzg6o%n|5TnPBBSHWGJHf$~ZU6uP diff --git a/ecrire/img_pack/rv-12.gif b/ecrire/img_pack/rv-12.gif new file mode 100644 index 0000000000000000000000000000000000000000..c172c116941589afe3b4a2b14ed2436bdaf8a390 GIT binary patch literal 154 zcmV;L0A>G2Nk%w1VGIBa0J9GO+S=Ox|NrIX<y2Huh=_<REG%4HT#Ss2fq{X#y1JQ} znf3Mc*4Ea~&(BUyPV4LIA^8LW000jFEC2ui01N;O000C>@I7!$Ddqq<#}UgS9K$9I zNe~=|nhb(Mr~!h|gklJIs{(@ptu|QDE<*;wkqTgV!v-S&lnsZuQ*-zdbUvz4i9@kq IG?EAaJ1$&4CIA2c literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/rv.gif b/ecrire/img_pack/rv.gif new file mode 100644 index 0000000000000000000000000000000000000000..db24b9c84efb79bf47fb2a843c6d1379744846ea GIT binary patch literal 191 zcmV;w06_moNk%w1VHyA$0J9DN|NsA0RaF200HdR$E-o(f^Yg#IzZVx5=H}+Hv9Zj| z%#@UrhK7cBcX#XS>i_@%A^8LW000gEEC2ui02%-q000DR(8)=wy*TU5yZ>M)j$~<` zs51mY8w?^57zI!m0RbKZ;0Hdy;NT(jf`Xt>w^=CxN#$!Zdq#taz(!D0UVR0@_6cn$ tyxVRNu{bcmVoj9{K=`svAU!zU823vaJaj`KGBh?gOdu;Q0(}w@06V*4NZ<ef literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/secteur-12.gif b/ecrire/img_pack/secteur-12.gif new file mode 100644 index 0000000000000000000000000000000000000000..9c4c2ecbce5a9ced2bb7f1af04a7b78d637b047d GIT binary patch literal 159 zcmV;Q0AT+|Nk%w1VGIBa0J9GOWNj{wm21Y(j*p`q$;ry8s-|~%Z;6SB$LJXP{ms_& zG^D}->FMO%?s}=PgYNF`A^8LW000jFEC2ui01N;O000C`@JUwAF@~^NOd&=<1O)?@ zppdL2aCE`C3WM7?fWaj6umAxCLJ<J^7QY~3NJAol!e!H$6GW%K1L0zA0stBbD1ZZ$ NB<RQXut7%v06T!#L0JF* literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/secteur-24.gif b/ecrire/img_pack/secteur-24.gif index 0024f01620a3b85f0e83554c3a205a9bad1c93ac..82360d945bcd63d635de3f41b2c1684661e0ce2a 100644 GIT binary patch literal 281 zcmV+!0p|WkNk%w1VHf}y0J9GO_xJa0ZE7PUBGTHa)YR0Jm5{~c9QFRjh>LTos;Z*D z0$XbVueFVao&vqYobK-KA^8LW000jFEC2ui02lxm000EW@X0v|prl;NX%S!;5*?R- z4ge6~a3BI%I$)v#UvccO;BbV1z;<i#c#NS0APn4a0>p8eOgumZhlM3@O_7U*;K~S? zg}U#~fmkRSW5F5$^L+>HhT<JR7z_sk1x-A73wnEeSAKtgcvuC8iHUHFjh6>Ph?9Gj za+jD0oRgl6pnw6RlzpdvnW~+vt*@}9rkJU!Z~<3#r?i|xRuU(^jlg?i0WuWD4vfHX fJ|z>*JGo*A)EysP0lUoG9Nhv1;^zh7B@qBSG|YGd literal 477 zcmV<30V4iKNk%w1VHf}y0K^{vX=!KI%d*+o*{haq%D9n{c}%#eip8^x;^N__r=^;i zn76mL#l^*vh;xdFg`|vJnSxd0+Qzt|b=Ab5-qN?lyrzD7a9B}8h;2U7(96QFhPbh# z&%T%C-p{|PedOfiA^8LW0018VEC2ui02lxm000I5;3tlxU?OCyj)-DefR!wXB76wC zB8jz80RyD5$!si{oQ||{{3slWq!Q@_0s{c!G-5as5ujl}wGs{*!r-#V+%nFNwPN^1 z0%x?ra9Fn!2^~2d1RDW&90Yk98e;<%4qg!zlm-nH9f^tuoCXpP4;~N}3l0+j6&no} z3LO-RXN?1(0}>4Y2@V_w9H(?euLolf5VRfzxVoGg2NM*j8CVe0#SgU*01Bpy9vZzA z84v{p)3g%E+7pW!9v%`L9vI{0))Fwe>g(-l^5oSI=dx|fgN7Zye*Xfd)3nUsfPVf! zNx-JylBRVB=M@{UMn-}L%^0HL@DL#=3>N@eeEG1zLIVvG5{)c552Z>4GeihT5QEnl zk{INnyZ{L&gA6zj2w>pCg0~4JFQjyUbHULYNlh^5VIhjt3sh%Z%|RlERu=%kDp0VX TjR3MclrC*M!|huVApih72nE9c diff --git a/ecrire/img_pack/set-ecran-etroit.gif b/ecrire/img_pack/set-ecran-etroit.gif new file mode 100644 index 0000000000000000000000000000000000000000..4a624b9f1c3ffa5b9f2409c94fc3e5c84296c33d GIT binary patch literal 264 zcmV+j0r&n#Nk%w1VHyAw0J8u9wX?I;)zyxfTY7kTnyFQ5Y-w(BWcKy-euiPJzDS6L zhNHAkcz$F5|NpztHD+aHA^8LV00000EC2ui02%-k000EF@X1N5wJy8#lK!7Te9|X8 z0tgZhLOvh!7;5|!uf|Hk;{U!K%H!Y}EQ+KuS*RFJsADD2s9F!r3N*7oP!v`xfWjCR zVVVb^X*h%%1Bqg=NTV~4DnJ1U2L=Fc3UzpQMO6WOeu@o)b|e5&ZedLY0CbNVUK3z% zV-sbC1X2`KZ&*%H2&57N0k5#H3Ka#L83{rRy1Tp+0z@SmGB`CE!#Nr!Da8&fE}2{% O%o$HF7uVPi5db@IU15p< literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/set-ecran.gif b/ecrire/img_pack/set-ecran.gif index 92c5e6cf92e498b24fba973b50312205d58d82f0..fd0d86592a545850e7ff354136f6ff0d828a43e0 100644 GIT binary patch literal 241 zcmV<N01p30Nk%w1VHyAw0J8u9o2pf}wY6((Y4`W|rnpVj)zyiNc5rfNwaGn=m|L&G zMd9G!cz$EM&^7=6|7K-nA^8LV00000EC2ui02%-k000D@@X1N5y$7JiyZ;RW9G9Vh zpuz|h(*kG%xD*Xs_;o)G`5cDAz(Fh$2LS`^(2z6|l7MkK4M-AA9zwF9dL0YN#@R3k zzF&cXLnau!gCW&GVDn^eYTRppWjSVOUTSs?3S5FlVGk!xP!CdxL{<-2PAn1z0R^0$ ro=Fn|SvwU645z3*6+1K&bTMu%r3o7`9S8}k6AXT~C^I?1IS~LmRLoj< literal 216 zcmV;}04M)PNk%w1VHW@s0J9GOjj6<Wn!D)j&1Q^Rh@rYtY)$|G0A-V4MKTtkwaH_J zR3sx9-$EW}j<aNepa1{=A^8LW000jFEC2ui02crg000Dqkg-QAl{QP9@9bWveWS&h zB-$Bl>%QP)G<0p(Mr;Ip9{>Vh4z%;}1jyddBQXG;fdT=L5G0-e!)D8H0tgGm0^3+P zvRjMciWm&U3CE(aTV~b>h5ImAAPRgeI&BAhd;^CEbUJ&5Z*B^a3U+EQmMtA86`GqV SoDZL%AEBZ#qNJpv5db@mrc;do diff --git a/ecrire/img_pack/site-24.gif b/ecrire/img_pack/site-24.gif index 32d2517247142278f800bb35572b37e2520c4b50..11f9350c3be9f87ba63ef08dc21ad1607be30215 100644 GIT binary patch literal 287 zcmV+)0pR{eNk%w1VHf}y0J9GOZE<P^1q0RSXyfmlK}RUj>`|-JB<t|g#^*NU^n9AC zUa!et!_l9Rt~7g_F7EE`A^8LW000jFEC2ui02lxm000Ec@X09wAt4h$d$*f1jEcp1 zlsO#iF$#i(R)o^B>o^DsF>j33&Ba(KdZ!ej!C>G<jKad;XgGYG&0-ORCZq;KqhZ)& z9fn0A@hu?U;kb+v2&=zuc-(+!1Udl-ZUqAgd3pu~Jb!eFYb;+dFa?SQ0E`n$i3u(V zBc6Da7ass`ggQEtZf046Yp6St0u5MM00OT&v62gO9yPMNlD;TfvXVWuGY=Ob0M8dm l%M%tE0j$#~0hig++nC)C*4CHf;3&`O>gw6%?in2s06UASb?^WH literal 454 zcmV;%0XhChNk%w1VHf}y0K^{vTUujCLz}R!wCnEmk&uzt*VxF%$J4W@udm6^(BdsF ziIt78ZDysOoS!5nJEC=i#Kqdx#l`O0($l`X_Uh)rz{tFvmb|#Te|>>+ZgJMm(L_U9 z&(F}`-{PjDtmNe6A^8LW0018VEC2ui02lxm000I5;3tlv;Wa2~kSxo21|?IHv0!UU zUV<z|lgVMh2mm}fQRPC594<m)Ai&rNbREy2Q_xg2kqePQ4s3EHL1$g)YBUJJxaz=k zSlR>x@-9p~9z_aM8yg&VA_W%%2?$U@L=S=r3L6d{h#wpf9S{f=76+13g8`HZ4h;o} z92K4j3!xT*rlhC@hawyZ2@4QJ9upM^MTDphxQHDM9Sg7w3z!2J3>g50s13Oy1RV$- zau*yg4;$6j4p!SA6%CCZ6&@E27yxF4mKhfXEClci1R4;)V6Bh?R2yJqN|YfWhKCsn z8br2l;fD?!>H*lu(UJoI4a8X#!No%cj}B5p0>BW`z{n9?3|y#J2ZaCw>yoe`U?HLb woNJQkAaIg^P!=(H)YFIooJgJR2x1TrK|q5I4MXz75|01@jvW0x9T5TmJAW3el>h($ diff --git a/ecrire/img_pack/statistiques-48.gif b/ecrire/img_pack/statistiques-48.gif deleted file mode 100755 index 9b91c0a6ff8f90e76b433136772c73478736027a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1453 zcmY+Bdr%Ws6voePHVK<u2pT04UcpA1IzSeR0Yz~Mh)Aho#StxP)Y^eUH3C|s(QXn! zv<N|~#rhxvDq8J`4h4!ql86N#Xi%oc!Pb<)2lW+!nWlw?2K5iU|K0Qb&iT%F@B9Tx zF*DatK*90300>BT*Ou&@|K5Vd=S|jz4a>6=X0JI|tX!Gc*KhZe$Nr*LRiC}o-m%rZ zazSCmnS{k_g`0GT7S0}c^7xS^=f&yo28UlBKT(?)Chh%ViQ@B|^ZN8v`wlExTiD*Y zHo!mNdDF4{&Ghv5r`<bRd8?;;=kAgN%Jj-p`KOmAT-GnCsa^6>VtmhUS*d%ExW-1$ zH=Ju)J}+onWzn9p%!E1D)-AlXV^eFJacTM|&kitMt;z=*SIDCx)3<ET$;s}#+A%gZ z7W@x}@L(>4g8PhT0*=d6tx66RRdgQ9yOKMr+Iq4e<);;AZMg!|v!XV8z4H)-W<G8x z>e_IjTfoQ`W6hyX<Mx|(7P$mIj7|bFi69Zeeb$v%tQJT>829Q1<dLIC0jsVh;aDxa zUFSD8H3Hde<OA8-41zcizU~Lo>@Hc|S`YtK`Sl?EgYvh!u{sh2J^~*d10yaFsG-@u z4xIqup`Zj$rfnMpdZCn=%MfuP-iY0T0>=s&dM6jI%!LpqsLUPMRLIN#6Ns370<dFl z*!2z#DUO=<J(FXp<ozvuNx0t#NF0b=TY)D+a}_X16bQoaRjsK3cEGI2&MsQVAz2)1 zxG*9ZVX!#J6h~-0K<E>=i_++{<>ah~DL2x-FJa-FmUrgBDQ>J!nl*TNM?bkgJErOx z6eA#cI}h^&!N{0`&SGL&UaqJiz*OaxU@0RYTwg_F3_-vYyH*K1%SqMh+no-zeDf5k z(m+SBOza>*DX1b4(0v+kozZ#i9iZ;!M_J{+7YubR1CG$CH+jzmyOs@<>RXS=uE%0w z=Dy&VUM(TF+0kg59*UuvLV&cPW>mG_a4E;*R#MF_&lE<B3-xp`gr_>@vGWEfUr*n5 zx!<naFJr2)^l+<=kCO;PxL@@Oce1fWSs)oqesFMH@RYn3OiWmi-Mvir%rqLGJv{KJ zT7-#ClF>HW;{C>QFrK})TOXg>ZPqJT$Y(!hlZSuxHrG|>Q6?g8R5{&k4!~+ugVxK} zs*hj4HN1*N_-Bdey2DygJn3KR(DF~XV0?{nH-<^z-0W@?^Qd~0g4HtkR}L1I<uDWS zNyHn(6;uW&dw+LQpZbH0YZm0-7SW}~2$caqW=jio+nFw#2nG}@yTeLRQra&*%MG(# z_>%A^4JMw<IgX6}8G*-^Q3`fc3_X=cU0=o+0}EB!){BiMGqBX-`N!=7$0}+3!_rK| zQ}RQV))*FTRbUa$s|c4Rb;R@C-$I{*R9efIIPE`s&bclg^q66y?%$o*FWz`9@UVA0 zIicN(az)lN0Mm@L0=?|@wCVoTP|AYN=utId?2MeS-avmh5}8F00Z+9_!^bC$B%pCd zmHCn3n^hJbCsg?_%1&k!ys~I}5zEhEFyH9ssl^IhXwx$fPlV7YzUu3b6%N^Oy$-1p zDlMGAlXfFm32#e3ODfiSOf%Y9xKY?U^fxY{EkyKFMuUV*s@DwNAPnemFlk`WJ1^2K zM4ZI>pKD~19&nk|>>0;se0PY8f|JGQhI$?64+B?LkKhwcZM-cTQCzIy=cZ}>&M3J- zPR2vgtn(YT=gS>#fI^5C{Z|5yAY84~32lxNS-r+n?YMxY+KcJ_BkU0Gi`eM%Qi-$= N({{FpL`HZ(?EfU(B^v+$ diff --git a/ecrire/img_pack/statistiques-48.png b/ecrire/img_pack/statistiques-48.png new file mode 100644 index 0000000000000000000000000000000000000000..1bcd5962ef5025bee553cac11ee4efa2c9e79e92 GIT binary patch literal 2795 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 JQRBuD{2v$6lFa}B literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/suivi-48.gif b/ecrire/img_pack/suivi-48.gif deleted file mode 100644 index 1bed4b985cf631e53b8f7e6217cda4dda69fab09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1521 zcmW-deNYp39>#zB0?DqMWP?#i0J~^NBG|YI5MGM1Nq|Dn(wuTv+iIJTB1jb@6Dr#3 zZP<w52*p}k&w&!uYG%&C;N>W#wr+sI*x{~A$7#{Fnpy>GDZbG=I1vu-`S<&Ip6@)* z^TmZ(*$x`e;FCN6U=Sn4Rm!C+5@K}E$hErUG@WYgYAVxYEHov*n440}m@HQFdPet> zC2eEDv#-BkEGx-){g0Lne_CI$K67(varJ9OwXd$-R#sYGUN)uI@7wZ+dzslgT-*2U zEPJn_s`l-gclYjT+3ozNvuywV`nCf#EiDI+et4w4qiwRG;q;kP=g$4Dx2v<K=kFK3 z=)2n$2!D0y>ydw5y*7Fy^5e~)$9}$jbNueu<el+ff1R9|ynFxQz5hIXH1+RCGmodA z%+Jox&nL~9tTp8hcln#tuC4A$s<g74dcOEY8;<LoD=8yQr%^9B-l{F5v{hTTZ+AGg z)CPC?*6Q*akTiorILHI5z=EEx0ix&l4p-4C)qCMnHJ7*LbO`=##Q*BKmyZVjdihRG zPoQqw2B`G1`&xtW*^T?tIJDvWzjU!{>86=^)}xJj2Lk$Cg^S~oo0GHkhu=SPL>bqz zOr$JmYtIueizl%}=jk&ki!odlixD4pTj1sKi&klk^ye48V6{rkswHw9KHm+J6-uKr zQ5g9~*t~ghN(Lp9fpB{oNS0GZqi+1pFXJf_znRpe1kl$D^iZ-~b9**DJq=U{VB^V# ziz-ufn++tf2lwQcQe-FZCEUhJ^oNZBN*bS8?YA)wM%-vEDkUF8yoADN1GytVp$C;I z>)I+SkV|utctebhrlC(-i8xa_lY}HTE7g6i8|D4^jb!R3Z^+>s@`y1q?uh{!*pJ+< z+=dpNT+ysL?Yb4-Nm)4Hl-Kq8d<o6}NPJ81JF4_83Aj!N=m9^F$ErcTC~)$k%Hi^c z47<7zTn2*7D+trHC<dH3<~iYOA~hx6tWL|i@%ZewOMOfdk9|Oc4|-WBlD#CO$_pNZ zQ1Ozie)rH}=OrnDFDLG>H3e);EG--}I}0DGR<A!48reN5N&I$Ay3cNh^W!z>g5A+@ z@zLta`}LBnh~4VR8vcDqn(Gx96jRu(YckjXD~_$Bt&)VfLp}?haDgoJn1UjaEccke zM`6ImW#)xxC_2^#EHx`CX;`#!)CFTYKa1d+Hm*MY+u!(pC^j7cf*#^QbSwibl63!5 zE@I~}H7nE;npV38&+#>u5u$v70lK<0govthd0@4=;-DmZ>Z(>+JsjYU=T5l>Ai0iW z#Mi^X3YKm1@mR(v!^LGsTwKRaUoRqC<2}wJBuPWYj6neg%Qv+$gefAlbnG4K=8kuc z-CelGu?%s3m_%^UxbVa1?S!Q%Q!BZ{8s60()D8wLU27(69$2QPo^k-eq8b@9JeTer zkxGqW7ffvFvyWl>+H6+;bJGzstWYnMYZp5>LhokzXob#YjoWvVJRtQ>vfE{Ar+pS! zt^+I%&D$4{b%FmQoFw>VH`19qA#k;y{dvMF#d3WNP=`sE#1N!I@Y4JUF9{BXxLVy< zpVe=CEN~)HM>EleE5c=hKFhPHBHzb~mU->{*m!WD|7vPbu&DL^y*;=lp%tJKk_SYZ z+lUaU6lF$9rj>_8arWt-8ns>15S|OnNVFnSPh`86bBj_Hb~Ea+2AW}sSKkMpI#ALF zOLWwKP3=|}1N4J-WK?VDW$VGxd?5$@erodZJ=w(dJ*YeZ@VMa$Urgwa+4$(eMK@;d zee-F_?C%(GS%{3M(Mf0|^vkV}cFfI;Ye`0I7#1+%Sq0!{r@q@U|77~c8(<+oXd-Bv z2OD-Dg;g|475U)UFca0lq8bJw-n4TiR~Cx1X7!b!(9*LJjv_k6d81OYhmWFL&61og zoHCe7(z6J$rD#BPjf^(5hKMSmJLwihFvP&_hN3|gdaDsCZjtN>4{CBAG}#WFP@E|$ KC_y3c-2VX26+zGd diff --git a/ecrire/img_pack/tout-site.gif b/ecrire/img_pack/tout-site.gif new file mode 100644 index 0000000000000000000000000000000000000000..caa4d9f0de5eeb9d85a8779979c9bd7287a2ecc2 GIT binary patch literal 306 zcmV-20nPqLNk%w1VHyAw0J8u9|Ns1ffq}v19M|<pJv}|Y!M&f$24#FW<oJQ~|ETZu z(kL()#@dshzE6ygh~(ttA^8LV00000EC2ui02%-k000EvFvv-(wIJ)wyO!Joh+9!O zj!9-902V;{6vtv8^=-NV+na~jjj>S_Y=J^cLvkz*43c7M1RM{om+(+fXpGZ@_n7@T z4-JMlL+vu&2SSfiJ2)6Hz_h?XG#WT@b1zQ@X$%Q{iUJJ=1_uUmK2}eEX$c5#1B?QW zkdh@hhMNeR0;iphj-Vh8kcJHd2&kv3s;oV(0;U5Aw6&@Tpc*s=yS)Gj1Ix_J3AmJw zy9odY*4L${1JFkesJ+$+nAe-za~n9?z2fZRrOU$`3*O7@R0`vzau)#v{{H|2`ilSn EI|$T(GXMYp literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/triangle-droite.gif b/ecrire/img_pack/triangle-droite.gif new file mode 100644 index 0000000000000000000000000000000000000000..3fdbd266c8212e1e0f9c3f67e4831ac0d47d1831 GIT binary patch literal 81 zcmZ?wbhEHb<Y3@nSj5g?Yis-T=~FK+uZ<fw78VvRS+c~<&F$U0cZxq*7#SGY8FUzc j0Hl_IS<GU4&4ROx0=HNeZO}e3&t+>uRC0$e6N5DXSF9T0 literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/triangle-droite_rtl.gif b/ecrire/img_pack/triangle-droite_rtl.gif new file mode 100644 index 0000000000000000000000000000000000000000..6a090c3ca3eee5be8dec1f9595d9d5843a83bf3b GIT binary patch literal 80 zcmZ?wbhEHb<Y3@nSj5g?Yis-T=~FK+uZ<fw78VvRS+c~<&F$U0cZxq*7#SGY8FUzc i0Hl_IS+ru8`5NX846n2ndAV*1Wn5@`!%UKs!5RQDh8b)C literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/visit-12.gif b/ecrire/img_pack/visit-12.gif index 522ae964e67d73777bcc6ccef887e7cadabe4d89..329148d8bb55d2206550cf5da302b31ac38ea55a 100644 GIT binary patch literal 155 zcmV;M0A&A1Nk%w1VGIBa0J9GO0jJgY`umv8-^a(ts<5(6y4XocNhT&Ha&mH|yv2-; zkl*U=2(i?8#ohp@(C+T;A^8LW000jFEC2ui01N;O000C?@X28+8Zsl3N+Sn084X}M z$+1WVVZIEqK8Em~iozy0;9QbT;g-S>42pn&QCJKRp@YED2v`>d)PdkQF}kLht@lDP J$hSrW06SOPK{WsX literal 142 zcmZ?wbhEHb<YC}pc+9}i-M?H~TKeYATVKC^O-X<F?%lhC2Tz1oU;Omx)617HJrkA( zW$kTmZ~qSiia%Kxxfu8vbQpjDWCjC^^@o$5ubCYqESWf6Q(5E+CmaY7(&4u2*s#mt o&{?m9mY|n&neHiX;4olvICU{$f}zP|N5wz~pVm1Vs!R;l0OjXBy8r+H diff --git a/ecrire/img_pack/visiter-48.gif b/ecrire/img_pack/visiter-48.gif deleted file mode 100644 index 83accc94ae548cc547fbba3ab8064e0ae945f5ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 966 zcmV;%13COhNk%w1VK4wN0J9GOhlhu@wzjCKsCamI+uPfdlaps>XVcTu<KyF3S64<x zMw^?P%gf91^76sK!Q|xRA^8LW000jFEC2ui05AYB000F4@X1N5Bny<yH&}-yj^smZ z0@AE(iwGJ~&eid$ZLT8)5Yi;xLPsp}3J9Qu0U!_$0fAt#5Cj|t9IkN~IFysAj*+o4 z&J0IjfyyG@?}7ll2;>|e2VqY*_|F0xYyxg@fk1UF2R#gLe1B&SY=Q+<1aL0}Ggd4J z4g)EUdyr|89hFp#d~zfV1r2ZkUT}{GXbx(Wlc;)pULptsu&@FHjR>{2k!pdby9Er7 z21ykKg|f%Vw`yyr-U|$VPyjVZZwvzg$lA*RQQq(%;s!qwO^zDtqma1V0r1{51h_R| z0s#Q)WF26q2A8{T0DJTRKoJcCdJ?Sp60lEMBmz<Y+&w!*aU#VJXkggmqp*+1QtA*K zm;z6O&66jM^)q0?nx7BiwmGCFOM{1-I4KTTDqtsrrhg1z5y~wT9}ELZPBf`>Y1V#~ zn)t!C%%4b6j|yZ(n$xQR0}LJ-7@#aeDYH@n?Lo#D8IzJYvw9t1;9&p*0MO*YD}~K~ zOPC@TP3rco6?X}AqPy%aZw3HMukMXZpjhCgZxhtP44@yV&TK#rHs(jPZC8R(r!L^& zOlH>!-U@#^n4az9Am>(2pqkHbH3OIrpR1hk!mE+b0hlYBumR=^*3ET?hq-j&-U*M+ zj%)$qwuH?GaPGxj0rTIddxy-v=uz3JC7=NR7JmHJnR)n4Hw`AkFfl*}U3n*90t7^2 zz!Y*JnBR17bi%`fRQ#tKa|#%9#s>tLXaj;83a7%0rctp=gsCZ@KvTFR5W<28FfbvD z!M%mUCmP5&360+gr~pg}WYkNFKeG517laulqln&pXJc#bP;>!ZeK;_o0#YKDnN}el zwVaJhKBRyQ5_s`P0X9Y%TyRU3bfrlnvbownJQ)O+g>{liW{`Onc_flbN|l!a_1J@> z8cMQ>U!o*+r)8ZE<h7Iq2qe%?r<E#+=vo}Kl_Z;;Hl_eI75M0n0F@egDqu?0$f;)o zk|01~h8e)7r9oCF;jmH}slWm=xMziP6#ooMEQ``EyT%j?B%lcm_vHmG0M&-eCIC?= zOO6r(EbDC@1qdr{iFII01-Ns7@c;wxPJ!*S9tiTRk!%S2g}o9W0PY6>C#<kqCBjOu o1YIa#fWk(eA}mG^i?E1|hyk?SmXT&W!U68p%I3r&(+~jwJ2d~6m;e9( diff --git a/ecrire/img_pack/visiter-48.png b/ecrire/img_pack/visiter-48.png new file mode 100644 index 0000000000000000000000000000000000000000..51564610e2567dd666703a29ecfe448798e1e3e4 GIT binary patch literal 2188 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 b4B)|yusYS6boEE@cLHqL9N>M)OPKzDog8Tx literal 0 HcmV?d00001 diff --git a/ecrire/img_pack/visiter-48_rtl.gif b/ecrire/img_pack/visiter-48_rtl.gif deleted file mode 100644 index e5d55ac6e12d29a8b4b7d0844dc94799ff46b4a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 984 zcmV;}11J1PNk%w1VK4wN0J8u9hlhu@wzjCKsCamI+uPfdlaps>XVcTu<KyF3S64<x zMw^?P%gf91^76sK!Q|xRA^8LW000jFEC2ui05AYB000F4@X1N5JPVY~H&}!vj^slW zfPge?>mtGymNa!}tE=xwcGM-rCbui@76k;*;usuSImE#c5G)n~LEyO~02s?j3_&g* zVueM(!Dut8AI4D-E~v`V7}DN8_z8dn4jB$Q0SiEOcm!5y91CoH2Z3Y^8eA-gG%=J6 zS9^~Rkqm!;WdZ{ZL{%hBfr3|$js<I@r37V70c8yZU=|1llYk5zpd4DFZhphK2n+)% z4J!jm6#!d)o*mp9YPHL^l>@tE2L%-e!pz6r$N}Jz&A0&r3}ppB6RB<iDDK_h)r!RI zl@I{Vyi8E%#u9*s{{W^DC~A$oKnKW~LMS1Hn+y;CAwmTBO^cw01sM&%i0**_QEUc; zocT{fH!KIp#FIoIV}L*a9x!+*3e^CaGee@Vi9%zUfwuhk@Kb;Q5|{vv9!<K`Lsk%! zV8DZE%Ygw>Qv?_gIMjevq%<E6$oI<GH;T&IkoyB*tw6V0v&MbMARz)=fb3)uIMC99 zJ_8a6RBHe*+>qq(Xg)j_%VNA4+yIaaZ$W~}fiVkkwy5sb4_UNKwih!&8wUkWqux5V zaNWAv-fm4J8x__BflTXuyY{#9o|Xqxo?baYDpAr+Dc>zq`j^dzU#ZjTmb!ri)@wx$ z6af9{)DI1S08a)``TNz~1E5kb0W${*ptqa<QcaZu9s#JCcba>&tRY<_1SAk3cOz{e zlN>8(W?p{oB_LZ9q3IRia&UQr#9U-R5sZT8x#!m*0vwP4Oadq{p=A|*l9e<WQrBUJ z034uK2$CsdqkuTt^a&DK6*A3qKcW}lJ!BZr5jJZ8aO8BaDH#h2Zau+ahXJkx2yPM( zpa5Go-k91Wd&reQUoE;9V1N!xlF<w<HF!vyBog?^Qb(Ovr-TwJ;ENwk*q}gcW^I|I zmxM~!;+=`U<c0x!N^lgUiB9-t2XaYgXPW^IBtTFVAfSL}0swgAdnI~R=y^v18Y@f* zSW^LjusRUxa!Qq2-JQBpWE%+!y!uInq=0f~>7}SD@FF}0&{0BeS6K09wNZwODlLnt zg-8urE~$l<)wYW&HnC-qKubW>_`xSyEHHq(Z5luetX4c4h6DimyCfD>#JPbMR$$@q zzP}9o00R4VcJRd*YYBj_5?^3|wcKF5<i}2QJi-k&8o(4cec70g$u(f`al5B2pidYP G0029Xg_lhL diff --git a/ecrire/img_pack/visiter-48_rtl.png b/ecrire/img_pack/visiter-48_rtl.png new file mode 100644 index 0000000000000000000000000000000000000000..25860b2af83ef8dfb7131a802fde79b694483256 GIT binary patch literal 2158 zcmW-jdpuP68^^zAX3R{CW+HMaj!2^1iBN~+7A2%fvS)+_BSIEYXONX2mUT(37`64w zhNU9)lbu{L<XY0C+5M&DUhA4d?6>|nuXDcV^8GxQ_wzjGqWb|yS!oq%0D!Eslf4H# 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 literal 0 HcmV?d00001 diff --git a/ecrire/inc.php3 b/ecrire/inc.php3 index d9f3a1e1a1..6f01d80a1a 100644 --- a/ecrire/inc.php3 +++ b/ecrire/inc.php3 @@ -67,96 +67,54 @@ $options = $prefs['options']; $spip_display = $prefs['display']; switch ($prefs['couleur']) { + case 6: + /// Jaune + $couleur_foncee="#9DBA00"; + $couleur_claire="#C5E41C"; + $couleur_lien="#657701"; + $couleur_lien_off="#A6C113"; + break; case 1: - /// Vert - $couleur_foncee="#02531B"; - $couleur_claire="#CFFEDE"; - $couleur_lien_off="#304C38"; - $couleur_lien="#854270"; + /// Violet clair + $couleur_foncee="#AA015D"; + $couleur_claire="#DF87C1"; + $couleur_lien="#E95503"; + $couleur_lien_off="#8F004D"; break; case 2: - /// Rouge - $couleur_foncee="#640707"; - $couleur_claire="#FFE0E0"; - $couleur_lien="#346868"; - $couleur_lien_off="#684747"; + /// Orange + $couleur_foncee="#D64F04"; + $couleur_claire="#F9A20E"; + $couleur_lien="#81A0C1"; + $couleur_lien_off="#FF5B00"; break; case 3: - /// Jaune - $couleur_foncee="#666500"; - $couleur_claire="#FFFFE0"; - $couleur_lien="#65659C"; - $couleur_lien_off="#6A6A43"; + /// Vert-eau + $couleur_foncee="#299B9A"; + $couleur_claire="#87DFDE"; + $couleur_lien="#5E0283"; + $couleur_lien_off="#472854"; break; case 4: - /// Violet - $couleur_foncee="#340049"; - $couleur_claire="#F9EBFF"; - $couleur_lien="#396B25"; - $couleur_lien_off="#472854"; + /// Bleu pastelle + $couleur_foncee="#127896"; + $couleur_claire="#48B4D3"; + $couleur_lien="#869100"; + $couleur_lien_off="#5B55A0"; break; case 5: /// Gris - $couleur_foncee="#3F3F3F"; - $couleur_claire="#F2F2F2"; + $couleur_foncee="#727D87"; + $couleur_claire="#C0CAD4"; $couleur_lien="#854270"; $couleur_lien_off="#666666"; break; - case 6: - /// Bleu - $couleur_foncee="#3874B0"; - $couleur_claire="#EDF3FE"; - $couleur_lien="#814E1B"; - $couleur_lien_off="#435E79"; - break; - case 7: - /// Bleu pastelle - $couleur_foncee="#766CF6"; - $couleur_claire="#EBE9FF"; - $couleur_lien="#869100"; - $couleur_lien_off="#5B55A0"; - break; - case 8: - /// Vert pastelles - $couleur_foncee="#009F3C"; - $couleur_claire="#E2FDEC"; - $couleur_lien="#EE0094"; - $couleur_lien_off="#02722C"; - break; - case 9: - /// Rouge vif - $couleur_foncee="#FF0000"; - $couleur_claire="#FFEDED"; - $couleur_lien="#D302CE"; - $couleur_lien_off="#D40202"; - break; - case 10: - /// Orange - $couleur_foncee="#E95503"; - $couleur_claire="#FFF2EB"; - $couleur_lien="#81A0C1"; - $couleur_lien_off="#FF5B00"; - break; - case 11: - /// Violet clair - $couleur_foncee="#CD006F"; - $couleur_claire="#FDE5F2"; - $couleur_lien="#E95503"; - $couleur_lien_off="#8F004D"; - break; - case 12: - /// Marron - $couleur_foncee="#8C6635"; - $couleur_claire="#F5EEE5"; - $couleur_lien="#1A64DF"; - $couleur_lien_off="#955708"; - break; default: - /// Bleu - $couleur_foncee="#3874B0"; - $couleur_claire="#EDF3FE"; - $couleur_lien="#814E1B"; - $couleur_lien_off="#435E79"; + /// Jaune + $couleur_foncee="#9DBA00"; + $couleur_claire="#C5E41C"; + $couleur_lien="#116E95"; + $couleur_lien_off="#50A4C7"; } diff --git a/ecrire/inc_agenda.php3 b/ecrire/inc_agenda.php3 index 31eee5270c..f58f0ca54d 100644 --- a/ecrire/inc_agenda.php3 +++ b/ecrire/inc_agenda.php3 @@ -92,10 +92,10 @@ function agenda ($mois, $annee, $jour_ved, $mois_ved, $annee_ved, $semaine = fal } else { if ($jour_semaine == 7) { - $couleur_fond = $couleur_claire; - $couleur = "#aaaaaa"; + $couleur_fond = "#aaaaaa"; + $couleur = "white"; } else { - $couleur_fond = "#eeeeee"; + $couleur_fond = "#ffffff"; $couleur = "#aaaaaa"; } if ($les_rv[$j] > 0) { @@ -163,7 +163,7 @@ function calendrier_jour($jour,$mois,$annee,$large = "large", $le_message = 0) { $nom = mktime(1,1,1,$mois,$jour,$annee); $jour_semaine = date("w",$nom); - if ($jour_semaine == 0) $bgcolor = $couleur_claire; + if ($jour_semaine == 0) $bgcolor = "#e0e0e0"; if ($large == "col" ) { echo "<div align='center' style='padding: 5px;'><b class='verdana1'><a href='calendrier_jour.php3?jour=$jour&mois=$mois&annee=$annee' style='color:black;'>".affdate_jourcourt("$annee-$mois-$jour")."</a></b></div>"; @@ -223,7 +223,8 @@ function calendrier_jour($jour,$mois,$annee,$large = "large", $le_message = 0) { } // rendez-vous personnels - $result_messages=spip_query("SELECT messages.* FROM spip_messages AS messages, spip_auteurs_messages AS lien WHERE ((lien.id_auteur='$connect_id_auteur' AND lien.id_message=messages.id_message) OR messages.type='affich') AND messages.rv='oui' AND messages.date_heure >='$annee-$mois-$jour' AND messages.date_heure <= '$annee-$mois-$jour 23:59:59' AND messages.statut='publie' GROUP BY messages.id_message ORDER BY messages.date_heure"); + $result_messages=spip_query("SELECT messages.* FROM spip_messages AS messages, spip_auteurs_messages AS lien WHERE ((lien.id_auteur='$connect_id_auteur' AND lien.id_message=messages.id_message) OR messages.type='affich') AND messages.rv='oui' AND messages.date_heure <='$annee-$mois-$jour 23:59:00' AND messages.date_fin > '$annee-$mois-$jour 00:00:00' AND messages.statut='publie' GROUP BY messages.id_message ORDER BY messages.date_heure"); + // Note: le $date_fin est strictement superieur a minuit while($row=spip_fetch_array($result_messages)){ $id_message=$row['id_message']; $date_heure=$row["date_heure"]; @@ -250,13 +251,40 @@ function calendrier_jour($jour,$mois,$annee,$large = "large", $le_message = 0) { $couleur_fond="#aaaaaa"; } + + $heure_debut = heures($date_heure); $minutes_debut = minutes($date_heure); + $jour_debut = journum($date_heure); + $mois_debut = mois($date_heure); + $annee_debut = annee($date_heure); + + // Verifier si debut est jour precedent + $unix_debut = date("U", mktime($heures_debut,$minutes_debut,0,$mois_debut, $jour_debut, $annee_debut)); + $unix_debut_today = date("U", mktime(0,0,0,$mois, $jour, $annee)); - // En attendant gestion heure de fin... + if ($unix_debut < $unix_debut_today) { + $heure_debut = 0; + $minutes_debut = 0; + } + + // Verifier si fin est jour suivant $heure_fin = heures($date_fin); $minutes_fin = minutes($date_fin); + $jour_fin = journum($date_fin); + $mois_fin = mois($date_fin); + $annee_fin = annee($date_fin); + + $unix_fin = date("U", mktime($heures_fin,$minutes_fin,0,$mois_fin, $jour_fin, $annee_fin)); + $unix_fin_today = date("U", mktime(23,59,0,$mois, $jour, $annee)); + + if ($unix_fin > $unix_fin_today) { + $heure_fin = 23; + $minutes_fin = 59; + } + + // Corriger pour l'affichage dans le tableau (debut et fin de tableau sont reduits) if ($heure_debut < 6) { $heure_debut = 6; $minutes_debut = 0; @@ -331,7 +359,7 @@ function calendrier_jour($jour,$mois,$annee,$large = "large", $le_message = 0) { } function liste_rv($query, $type) { - global $spip_lang_rtl, $spip_lang_left; + global $spip_lang_rtl, $spip_lang_left, $spip_lang_right; if ($type == annonces) { $titre = _T('info_annonces_generales'); @@ -354,12 +382,12 @@ function liste_rv($query, $type) { $result = spip_query($query); if (spip_num_rows($result) > 0){ - echo "<div> </div><div style='border: 1px solid #999999; background-color: $couleur_fond; -moz-border-radius: 5px;'>"; - echo "<div style='background-color: $couleur_titre; padding: 3px; color: $couleur_texte;'>"; - echo "<b class='verdana1'>$titre</b>"; - echo "</div>"; - echo "<div style='padding: 3px;'>"; + + debut_cadre_enfonce("", false, "", $titre); + + echo "<table width='100%' border='0' cellpadding='0' cellspacing='2'>"; while ($row = spip_fetch_object($result)) { + if (ereg("^=([^[:space:]]+)$",$row->texte,$match)) $url = $match[1]; else @@ -367,32 +395,57 @@ function liste_rv($query, $type) { $type=$row->type; $rv = $row->rv; $date = $row->date_heure; + $date_fin = $row -> date_fin; - if ($type=="normal") $bouton = "m_envoi"; - elseif ($type=="pb") $bouton = "m_envoi_bleu"; - elseif ($type=="affich") $bouton = "m_envoi_jaune"; - else $bouton = "m_envoi"; + if ($type=="normal") $bouton = "message"; + elseif ($type=="pb") $bouton = "pense-bete"; + elseif ($type=="affich") $bouton = "annonce"; + else $bouton = "message"; + + //if ($rv == "oui") $bouton .= "-rv"; $titre = typo($row->titre); - - echo "<div style='margin: 5px; padding-$spip_lang_left: 20px; background: url(img_pack/$bouton$spip_lang_rtl.gif) $spip_lang_left center no-repeat;'>"; + if ($rv == "oui") { - echo "<b class='arial0'>".affdate_jourcourt($date)."</b><br />"; + echo "<tr><td colspan='2'>"; + $date_jour = affdate_jourcourt($date); + if ($date_jour != $date_rv) echo "<div class='arial11'><b>$date_jour</b></div>"; + echo "</td></tr>"; } - echo "<b><a href='$url' class='arial1'>$titre</a></b>"; - echo "</div>\n"; + + echo "<tr>"; + echo "<td width='24' valign='middle'>"; + echo "<a href='$url'>"; + if ($rv == "oui") echo "<img src='img_pack/rv.gif' style='background: url(img_pack/$bouton.gif) no-repeat;' border='0'>"; + else echo "<img src='img_pack/$bouton.gif' border='0'>"; + echo "</a>"; + echo "</td>"; + + echo "<td valign='middle'>"; + if ($rv == "oui") { + echo "<div class='arial0' style='float: $spip_lang_left; line-height: 12px; color: #666666; margin-$spip_lang_right: 3px; padding-$spip_lang_right: 4px; background: url(img_pack/fond-agenda.gif) $spip_lang_right center no-repeat;'>".heures($date).":".minutes($date)."<br />".heures($date_fin).":".minutes($date_fin)."</div>"; + } + + echo "<div><b><a href='$url' class='arial1' style='color: #333333;'>$titre</a></b></div>"; + echo "</td>"; + echo "</tr>\n"; + + $date_rv = $date_jour; + } - echo "</div>"; - - echo "</div>"; + echo "</table>"; + fin_cadre_enfonce(); } } -function afficher_taches () { +function afficher_annonces () { global $connect_id_auteur, $options; $query = "SELECT * FROM spip_messages WHERE type = 'affich' AND rv != 'oui' AND statut = 'publie' ORDER BY date_heure DESC"; liste_rv($query, "annonces"); +} +function afficher_taches () { + global $connect_id_auteur, $options; $query = "SELECT * FROM spip_messages AS messages WHERE id_auteur=$connect_id_auteur AND statut='publie' AND type='pb' AND rv!='oui'"; liste_rv($query, "pb"); diff --git a/ecrire/inc_barre.php3 b/ecrire/inc_barre.php3 index 4f1ac6d16b..7c536571da 100644 --- a/ecrire/inc_barre.php3 +++ b/ecrire/inc_barre.php3 @@ -53,8 +53,8 @@ function afficher_barre($formulaire='',$texte='', $forum=false) { if (test_barre()) { $ret = afficher_script_barre(); $champ = "document.$formulaire.$texte"; - $ret .= "<table cellpadding='0' cellspacing='0' border='0' width='100%'>"; - $ret .= "<tr width='100%'>"; + $ret .= "<table class='spip_barre' width='100%' cellpadding='0' cellspacing='0' border='0'>"; + $ret .= "<tr width='100%' class='spip_barre'>"; $ret .= "<td style='text-align: $spip_lang_left;' valign='middle'>"; $col++; @@ -64,7 +64,7 @@ function afficher_barre($formulaire='',$texte='', $forum=false) { if (!$forum) { $ret .= bouton_barre_racc ("javascript:barre_raccourci('\n\n{{{','}}}\n\n',$champ)", "intertitre.png", _T('barre_intertitre'), $formulaire, $texte); } - $ret .= " "; + $ret .= "</td> <td>"; // Lien hypertexte, notes de bas de page, citations $ret .= bouton_barre_racc ("javascript:barre_demande('[','->',']', '".addslashes(_T('barre_lien_input'))."', $champ)", @@ -73,7 +73,7 @@ function afficher_barre($formulaire='',$texte='', $forum=false) { $ret .= bouton_barre_racc ("javascript:barre_raccourci('[[',']]',$champ)", "notes.png", _T('barre_note'), $formulaire, $texte); } if ($forum) { - $ret .= " "; + $ret .= "</td> <td>"; $ret .= bouton_barre_racc ("javascript:barre_raccourci('\n\n<quote>','</quote>\n\n',$champ)", "quote.png", _T('barre_quote'), $formulaire, $texte); } @@ -85,9 +85,11 @@ function afficher_barre($formulaire='',$texte='', $forum=false) { } $ret .= "</td>"; + + $ret .= "</td> <td>"; // Insertion de caracteres difficiles a taper au clavier (guillemets, majuscules accentuees...) - $ret .= "<td style='text-align:$spip_lang_right;' valign='middle'>"; + $ret .= "<td style='text-align:$spip_lang_left;' valign='middle'>"; $col++; if ($spip_lang == "fr" OR $spip_lang == "eo" OR $spip_lang == "cpf" OR $spip_lang == "ar" OR $spip_lang == "es") { $ret .= bouton_barre_racc ("javascript:barre_raccourci('«','»',$champ)", "guillemets.png", _T('barre_guillemets'), $formulaire, $texte); @@ -101,9 +103,7 @@ function afficher_barre($formulaire='',$texte='', $forum=false) { $ret .= bouton_barre_racc ("javascript:barre_raccourci('“','”',$champ)", "guillemets-simples.png", _T('barre_guillemets'), $formulaire, $texte); $ret .= bouton_barre_racc ("javascript:barre_raccourci('‘','’',$champ)", "guillemets-uniques.png", _T('barre_guillemets_simples'), $formulaire, $texte); } - $ret .= " "; if ($spip_lang == "fr" OR $spip_lang == "eo" OR $spip_lang == "cpf") { - $ret .= " "; $ret .= bouton_barre_racc ("javascript:barre_inserer('À',$champ)", "agrave-maj.png", _T('barre_a_accent_grave'), $formulaire, $texte); $ret .= bouton_barre_racc ("javascript:barre_inserer('É',$champ)", "eacute-maj.png", _T('barre_e_accent_aigu'), $formulaire, $texte); if ($spip_lang == "fr") { @@ -113,12 +113,15 @@ function afficher_barre($formulaire='',$texte='', $forum=false) { } $ret .= bouton_barre_racc ("javascript:barre_inserer('€',$champ)", "euro.png", _T('barre_euro'), $formulaire, $texte); $ret .= "</td>"; + + $ret .= "</td> <td>"; if ($flag_ecrire) { $ret .= "<td style='text-align:$spip_lang_right;' valign='middle'>"; $col++; $ret .= " "; $ret .= aide("raccourcis"); + $ret .= " "; $ret .= "</td>"; } $ret .= "</tr>"; diff --git a/ecrire/inc_config.php3 b/ecrire/inc_config.php3 index c98b076218..11a60c3aad 100644 --- a/ecrire/inc_config.php3 +++ b/ecrire/inc_config.php3 @@ -87,11 +87,12 @@ function init_config() { function avertissement_config() { + global $spip_lang_right, $spip_lang_left; debut_boite_info(); - echo "<div class='serif' align='justify'> - <center><B>"._T('avis_attention')."</B></center> - <img src='img_pack/warning.gif' alt='' width='48' height='48' align='right'>"; + echo "<div class='verdana2' align='justify'> + <p align='center'><B>"._T('avis_attention')."</B></p> + <img src='img_pack/warning.gif' alt='' width='48' height='48' align='$spip_lang_right' style='padding-$spip_lang_left: 10px;' />"; echo _T('texte_inc_config'); @@ -102,9 +103,11 @@ function avertissement_config() { } -function bouton_radio($nom, $valeur, $titre, $actif = false) { +function bouton_radio($nom, $valeur, $titre, $actif = false, $onClick="") { static $id_label = 0; - $texte = "<input type='radio' name='$nom' value='$valeur' id='label_$id_label'"; + + if (strlen($onClick) > 0) $onClick = " onClick=\"$onClick\""; + $texte = "<input type='radio' name='$nom' value='$valeur' id='label_$id_label'$onClick"; if ($actif) { $texte .= ' checked'; $titre = '<b>'.$titre.'</b>'; diff --git a/ecrire/inc_presentation.php3 b/ecrire/inc_presentation.php3 index d0d643ed0b..c9306b7c39 100644 --- a/ecrire/inc_presentation.php3 +++ b/ecrire/inc_presentation.php3 @@ -33,6 +33,8 @@ function bouton_imessage($destinataire, $row = '') { // si on passe "force" au lieu de $row, on affiche l'icone sans verification global $connect_id_auteur; global $spip_lang_rtl; + global $couche_invisible; + $couche_invisible ++; $url = new Link("message_edit.php3"); @@ -40,7 +42,6 @@ function bouton_imessage($destinataire, $row = '') { if ($destinataire == $connect_id_auteur) return; // verifier que le destinataire a un login - if ($row != "force") { $login_req = "select login, messagerie from spip_auteurs where id_auteur=$destinataire AND en_ligne>DATE_SUB(NOW(),INTERVAL 15 DAY)"; $row = spip_fetch_array(spip_query($login_req)); @@ -57,122 +58,143 @@ function bouton_imessage($destinataire, $row = '') { else $title = _T('info_ecire_message_prive'); $texte_bouton = "<img src='img_pack/m_envoi$spip_lang_rtl.gif' width='14' height='7' border='0'>"; - return "<a href='". $url->getUrl() ."' title=\"$title\">$texte_bouton</a>"; + + + $ret .= "<a href='". $url->getUrl() ."' title=\"$title\">"; + $ret .= "$texte_bouton</a>"; + + return $ret; + + } + // // Cadres // - -function debut_cadre($style, $icone, $fonction) { - global $spip_display; +function debut_cadre($style, $icone = "", $fonction = "", $titre = "") { + global $spip_display, $spip_lang_left; static $accesskey = 97; // a - if ($GLOBALS['spip_lang_rtl']) { - $g = 'd'; - $d = 'g'; - $bgright = 'right'; - } else { - $g = 'g'; - $d = 'd'; - } - // accesskey pour accessibilite espace prive $accesskey_c = chr($accesskey++); - $retour_aff .= "<a name='access-$accesskey_c' href='#access-$accesskey_c' accesskey='$accesskey_c'></a>"; + $ret = "<a name='access-$accesskey_c' href='#access-$accesskey_c' accesskey='$accesskey_c'></a>"; - if ($spip_display != 1){ - if (strlen($icone)<3) $icone = "rien.gif"; - $retour_aff .= "\n<table class='cadre' cellspacing='0' cellpadding='0'><tr>"; - $retour_aff .= "\n<td class='$style-h$g'></td>"; - $retour_aff .= "\n<td class='$style-h'>"; + + $ret .= "<div style='position: relative; z-index: 1;'>"; + if ($spip_display != 1 AND strlen($icone) > 1) { + $style_gauche = " style='padding-$spip_lang_left: 38px;'"; + $ret .= "<div style='position: absolute; top: 0px; $spip_lang_left: 10px; z-index: 2;'>"; if ($fonction) { - $retour_aff .= "<div style='background: url(img_pack/$icone) no-repeat $bgright; padding: 0px; margin: 0px;'>"; - $retour_aff .= "<img src='img_pack/$fonction'>"; - $retour_aff .= "</div>"; + $ret .= "<div style='$bgright"."background: url(img_pack/$icone) no-repeat; padding: 0px; margin: 0px;'>"; + $ret .= "<img src='img_pack/$fonction'>"; + $ret .= "</div>"; } - else $retour_aff .= "<img src='img_pack/$icone'>"; - $retour_aff .= "</td>"; - $retour_aff .= "\n<td class='$style-h$d'></td></tr>"; - $retour_aff .= "\n<tr><td class='$style-$g'></td>"; - $retour_aff .= "\n<td class='$style-c'>"; - } - return $retour_aff; -} + else $ret .= "<img src='img_pack/$icone'>"; + $ret .= "</div>"; -function fin_cadre($style) { - global $spip_display; - - if ($GLOBALS['spip_lang_rtl']) { - $g = 'd'; - $d = 'g'; - } else { - $g = 'g'; - $d = 'd'; + $style_cadre = " style='position: relative; top: 15px; margin-bottom: 15px; z-index: 1;'"; } - if ($spip_display != 1){ - $retour_aff .= "\n</td>"; - $retour_aff .= "\n<td class='$style-$d'></td></tr>"; - $retour_aff .= "\n<tr><td class='$style-b$g'></td>"; - $retour_aff .= "\n<td class='$style-b'></td>"; - $retour_aff .= "\n<td class='$style-b$d'></td></tr>"; - $retour_aff .= "\n<tr><td><img src='img_pack/rien.gif' alt='' width='1' height='5'></td></tr>"; - $retour_aff .= "\n</table>\n"; - } - return $retour_aff; -} - -function debut_cadre_relief($icone='', $return = false, $fonction=''){ - global $spip_display; - if ($spip_display != 1){ - $retour_aff = debut_cadre('r', $icone, $fonction); + if ($style == "e") { + $ret .= "<div class='cadre-e-noir'$style_cadre><div class='cadre-$style'>"; } else { - $retour_aff = "<p><div style='border-right: 1px solid #cccccc; border-bottom: 1px solid #cccccc; -moz-border-radius: 6px;'><div style='border: 1px solid #666666; padding: 5px; -moz-border-radius: 6px; background-color: white;'>"; + $ret .= "<div class='cadre-$style'$style_cadre>"; } + + if (strlen($titre) > 0) { + $ret .= "<div class='cadre-titre'$style_gauche>$titre</div>"; + } + + + $ret .= "<div class='cadre-padding'>"; + + + return $ret; +} + + +function fin_cadre($style="") { + if ($style == "e") $ret = "</div>"; + $ret .= "</div></div></div>\n"; + $ret .= "<div style='height: 5px;'></div>"; + + return $ret; +} + + + + +function debut_cadre_relief($icone='', $return = false, $fonction='', $titre = ''){ + $retour_aff = debut_cadre('r', $icone, $fonction, $titre); if ($return) return $retour_aff; else echo $retour_aff; } function fin_cadre_relief($return = false){ - global $spip_display; - if ($spip_display != 1){ - $retour_aff = fin_cadre('r'); - } - else { - $retour_aff = "</div></div></p>\n"; - } + $retour_aff = fin_cadre('r'); if ($return) return $retour_aff; else echo $retour_aff; } -function debut_cadre_enfonce($icone='', $return = false, $fonction=''){ - global $spip_display; - - if ($spip_display != 1){ - $retour_aff = debut_cadre('e', $icone, $fonction); - } - else { - $retour_aff = "<p><div style=\"border: 1px solid #333333; -moz-border-radius: 6px; background-color: #e0e0e0;\"><div style=\"padding: 5px; border-left: 1px solid #999999; border-top: 1px solid #999999; -moz-border-radius: 6px;\">"; - } +function debut_cadre_enfonce($icone='', $return = false, $fonction='', $titre = ''){ + $retour_aff = debut_cadre('e', $icone, $fonction, $titre); if ($return) return $retour_aff; else echo $retour_aff; } function fin_cadre_enfonce($return = false){ - global $spip_display; - if ($spip_display != 1) { - $retour_aff = fin_cadre('e'); - } - else { - $retour_aff = "</div></div></p>\n"; - } + $retour_aff = fin_cadre('e'); + + if ($return) return $retour_aff; + else echo $retour_aff; +} + + +function debut_cadre_gris_clair($icone='', $return = false, $fonction='', $titre = ''){ + $retour_aff = debut_cadre('gris-clair', $icone, $fonction, $titre); + + if ($return) return $retour_aff; + else echo $retour_aff; +} + +function fin_cadre_gris_clair($return = false){ + $retour_aff = fin_cadre('gris-clair'); + + if ($return) return $retour_aff; + else echo $retour_aff; +} + + +function debut_cadre_couleur($icone='', $return = false, $fonction='', $titre=''){ + $retour_aff = debut_cadre('couleur', $icone, $fonction, $titre); + + if ($return) return $retour_aff; + else echo $retour_aff; +} + +function fin_cadre_couleur($return = false){ + $retour_aff = fin_cadre('couleur'); + + if ($return) return $retour_aff; + else echo $retour_aff; +} + +function debut_cadre_trait_couleur($icone='', $return = false, $fonction='', $titre=''){ + $retour_aff = debut_cadre('trait-couleur', $icone, $fonction, $titre); + + if ($return) return $retour_aff; + else echo $retour_aff; +} + +function fin_cadre_trait_couleur($return = false){ + $retour_aff = fin_cadre('trait-couleur'); if ($return) return $retour_aff; else echo $retour_aff; @@ -198,14 +220,18 @@ function fin_boite_alerte() { // une boite info // function debut_boite_info() { - global $couleur_claire, $couleur_foncee; +/* global $couleur_claire, $couleur_foncee; echo " <p><div style='border: 1px dashed #666666;'><table cellpadding='5' cellspacing='0' border='0' width='100%' style='border-left: 1px solid $couleur_foncee; border-top: 1px solid $couleur_foncee; border-bottom: 1px solid white; border-bottom: 1px solid white' background=''>"; echo "<tr><td bgcolor='$couleur_claire' width='100%'>"; echo "<font face='Verdana,Arial,Sans,sans-serif' size='2' color='#333333'>"; + */ + + echo "<div class='cadre-info'>"; } function fin_boite_info() { - echo "</font></td></tr></table></div>\n\n"; + //echo "</font></td></tr></table></div>\n\n"; + echo "</div>"; } // @@ -233,6 +259,23 @@ function bandeau_titre_boite($titre, $afficher_auteurs, $boite_importante = true echo "</TD>"; echo "</TR>"; } +// +// une autre boite +// +function bandeau_titre_boite2($titre, $logo="", $fond="white", $texte="black") { + global $spip_lang_left, $spip_display; + + if (strlen($logo) > 0 AND $spip_display != 1) { + echo "<div style='position: relative;'>"; + echo "<div style='position: absolute; top: -12px; $spip_lang_left: 3px;'><img src='img_pack/$logo'></div>"; + echo "<div style='background-color: $fond; color: $texte; padding: 3px; padding-$spip_lang_left: 30px; border-bottom: 1px solid #444444;' class='verdana2'><b>$titre</b></div>"; + + echo "</div>"; + } else { + echo "<div style='background-color: $fond; color: $texte; padding: 3px; border-bottom: 1px solid #444444;' class='verdana2'><b>$titre</b></div>"; + } + +} // @@ -244,7 +287,7 @@ function debut_raccourcis() { debut_cadre_enfonce(); echo "<font face='Verdana,Arial,Sans,sans-serif' size=1>"; - echo "<b>"._T('titre_cadre_raccourcis')."</b><p>"; + echo "<b>"._T('titre_cadre_raccourcis')."</b><p />"; } function fin_raccourcis() { @@ -263,8 +306,9 @@ function afficher_liste($largeurs, $table, $styles = '') { reset($table); echo "\n"; while (list(, $t) = each($table)) { - $couleur_fond = ($ifond ^= 1) ? '#FFFFFF' : $couleur_claire; - echo "<tr bgcolor=\"$couleur_fond\">"; + // $couleur_fond = ($ifond ^= 1) ? '#FFFFFF' : $couleur_claire; + //echo "<tr bgcolor=\"$couleur_fond\">"; + echo "<tr class='tr_liste' onMouseOver=\"changeclass(this,'tr_liste_over');\" onMouseOut=\"changeclass(this,'tr_liste');\">"; reset($largeurs); if ($styles) reset($styles); while (list(, $texte) = each($t)) { @@ -284,6 +328,7 @@ function afficher_liste($largeurs, $table, $styles = '') { function afficher_tranches_requete(&$query, $colspan) { static $ancre = 0; + global $spip_lang_right; $query = trim($query); $query_count = eregi_replace('^(SELECT)[[:space:]].*[[:space:]](FROM)[[:space:]]', '\\1 COUNT(*) \\2 ', $query); @@ -306,7 +351,7 @@ function afficher_tranches_requete(&$query, $colspan) { $ancre++; $texte .= "<a name='a$ancre'></a>"; - $texte .= "<tr><td background=\"\" class=\"arial2\" colspan=\"".($colspan - 1)."\">"; + $texte .= "<tr style='background-color: #dddddd;'><td class=\"arial2\" style='border-bottom: 1px solid #444444;' colspan=\"".($colspan - 1)."\">"; for ($i = 0; $i < $num_rows; $i += $nb_aff){ $deb = $i + 1; @@ -323,7 +368,7 @@ function afficher_tranches_requete(&$query, $colspan) { } } $texte .= "</td>\n"; - $texte .= "<td background=\"\" class=\"arial2\" colspan=\"1\" align=\"right\" valign=\"top\">"; + $texte .= "<td class=\"arial2\" style='border-bottom: 1px solid #444444; text-align: $spip_lang_right;' colspan=\"1\" align=\"right\" valign=\"top\">"; if ($deb_aff == -1) { $texte .= "<B>"._T('info_tout_afficher')."</B>"; } else { @@ -346,6 +391,7 @@ function afficher_tranches_requete(&$query, $colspan) { } + // // Afficher tableau d'articles // @@ -383,11 +429,15 @@ function afficher_articles($titre_table, $requete, $afficher_visites = false, $a if (strlen($tranches) OR $toujours_afficher) { $result = spip_query($requete); - if ($afficher_cadre) debut_cadre_relief("article-24.gif"); - echo "<table width=100% cellpadding=0 cellspacing=0 border=0><tr><td width=100% background=''>"; - echo "<table width=100% cellpadding=3 cellspacing=0 border=0>"; + // if ($afficher_cadre) debut_cadre_gris_clair("article-24.gif"); + + + echo "<div style='height: 12px;'></div>"; + echo "<div class='liste'>"; + bandeau_titre_boite2($titre_table, "article-24.gif"); + + echo "<table width='100%' cellpadding='2' cellspacing='0' border='0'>"; - bandeau_titre_boite($titre_table, $afficher_auteurs); echo $tranches; @@ -426,6 +476,9 @@ function afficher_articles($titre_table, $requete, $afficher_visites = false, $a } $les_auteurs = substr($les_auteurs, 2); } + + + $les_auteurs = "<div class='liste_clip' style='width: 100px;'>$les_auteurs</div>"; switch ($statut) { case 'publie': @@ -451,7 +504,7 @@ function afficher_articles($titre_table, $requete, $afficher_visites = false, $a } $puce = "puce-$puce.gif"; - $s = "<div style='background: url(img_pack/$puce) $spip_lang_left center no-repeat; padding-$spip_lang_left: 17px;'>"; + $s = "<div style='background: url(img_pack/$puce) $spip_lang_left center no-repeat; margin-$spip_lang_left: 3px; padding-$spip_lang_left: 14px;'>"; //$s. = "<a href=\"articles.php3?id_article=$id_article\" title=\"$title\">"; @@ -474,6 +527,9 @@ function afficher_articles($titre_table, $requete, $afficher_visites = false, $a $s .= "<br><font size=\"1\"><a href='statistiques_visites.php3?id_article=$id_article'>"._T('lien_visites', array('visites' => $visites))."</a></font>"; if ($popularite > 0) $s .= "<br><font size=\"1\"><a href='statistiques_visites.php3?id_article=$id_article'>"._T('lien_popularite', array('popularite' => $popularite))."</a></font>"; } + + $s = "<div class='liste_clip' style='width: 100px;'>$s</div>"; + $vals[] = $s; $table[] = $vals; @@ -481,29 +537,32 @@ function afficher_articles($titre_table, $requete, $afficher_visites = false, $a spip_free_result($result); if ($afficher_auteurs) { - $largeurs = array('', 100, 90); + $largeurs = array('', 100, 100); $styles = array('arial2', 'arial1', 'arial1'); } else { - $largeurs = array('', 90); + $largeurs = array('', 100); $styles = array('arial2', 'arial1'); } afficher_liste($largeurs, $table, $styles); - echo "</table></td></tr></table>"; - if ($afficher_cadre) fin_cadre_relief(); + echo "</table>"; + echo "</div>"; + //if ($afficher_cadre) fin_cadre_gris_clair(); } return $tous_id; } + // // Afficher tableau de breves // function afficher_breves($titre_table, $requete, $affrub=false) { - global $connect_id_auteur, $spip_lang_right, $dir_lang; + global $connect_id_auteur, $spip_lang_right, $spip_lang_left, $dir_lang, $couleur_claire, $couleur_foncee; + if ((lire_meta('multi_rubriques') == 'oui' AND $GLOBALS['coll'] == 0) OR lire_meta('multi_articles') == 'oui') { $afficher_langue = true; @@ -516,19 +575,17 @@ function afficher_breves($titre_table, $requete, $affrub=false) { if (strlen($tranches)) { - debut_cadre_relief("breve-24.gif"); + //debut_cadre_relief("breve-24.gif"); + + if ($titre_table) echo "<div style='height: 12px;'></div>"; + echo "<div class='liste'>"; if ($titre_table) { - echo "<p><table width=100% cellpadding=0 cellspacing=0 border=0 background=''>"; - echo "<tr><td width=100% background=''>"; - echo "<table width=100% cellpadding=3 cellspacing=0 border=0>"; - echo "<tr bgcolor='#EEEECC'><td width=100% colspan=2><font face='Verdana,Arial,Sans,sans-serif' size=3 color='#000000'>"; - echo "<b>$titre_table</b></font></td></tr>"; - } - else { - echo "<p><table width=100% cellpadding=3 cellspacing=0 border=0 background=''>"; + bandeau_titre_boite2($titre_table, "breve-24.gif", $couleur_foncee, "white"); } + echo "<table width='100%' cellpadding='3' cellspacing='0' border='0' background=''>"; + echo $tranches; $result = spip_query($requete); @@ -546,7 +603,7 @@ function afficher_breves($titre_table, $requete, $affrub=false) { $id_rubrique = $row['id_rubrique']; switch ($statut) { case 'prop': - $puce = "puce-blanche-breve"; + $puce = "puce-orange-breve"; $title = _T('titre_breve_proposee'); break; case 'publie': @@ -559,37 +616,37 @@ function afficher_breves($titre_table, $requete, $affrub=false) { break; } - $s = "<a href='breves_voir.php3?id_breve=$id_breve' title=\"$title\">"; - $s .= "<img src='img_pack/$puce.gif' alt='' width='8' height='9' border='0'></a> "; + $s = "<div style='background: url(img_pack/$puce.gif) $spip_lang_left center no-repeat; margin-$spip_lang_left: 3px; padding-$spip_lang_left: 12px;'>"; $s .= "<a href='breves_voir.php3?id_breve=$id_breve'$dir_lang>"; $s .= typo($titre); $s .= "</a>"; if ($afficher_langue AND $lang != $langue_defaut) $s .= " <font size='1' color='#666666'$dir_lang>(".traduire_nom_langue($lang).")</font>"; + $s .= "</div>"; $vals[] = $s; - $s = "<div align='$spip_lang_right'>"; + $s = ""; if ($affrub) { - $rub = spip_fetch_array(spip_query("SELECT titre FROM spip_rubriques WHERE id_rubrique=$id_rubrique")); - $s .= typo($rub['titre']); + $rub = spip_fetch_array(spip_query("SELECT id_rubrique, titre FROM spip_rubriques WHERE id_rubrique=$id_rubrique")); + $id_rubrique = $rub['id_rubrique']; + $s .= "<a href='naviguer.php3?coll=$id_rubrique'>".typo($rub['titre'])."</a>"; } else if ($statut != "prop") $s = affdate_jourcourt($date_heure); else $s .= _T('info_a_valider'); - $s .= "</div>"; $vals[] = $s; $table[] = $vals; } spip_free_result($result); - $largeurs = array('', ''); - $styles = array('arial2', 'arial1'); + if ($affrub) $largeurs = array('', '170'); + else $largeurs = array('', '100'); + $styles = array('arial11', 'arial1'); afficher_liste($largeurs, $table, $styles); - if ($titre_table) echo "</TABLE></TD></TR>"; - echo "</TABLE>"; - fin_cadre_relief(); + echo "</table></div>"; + //fin_cadre_relief(); } return $tous_id; } @@ -607,18 +664,14 @@ function afficher_rubriques($titre_table, $requete) { if (strlen($tranches)) { - debut_cadre_relief("rubrique-24.gif"); + if ($titre_table) echo "<div style='height: 12px;'></div>"; + echo "<div class='liste'>"; + //debut_cadre_relief("rubrique-24.gif"); if ($titre_table) { - echo "<p><table width=100% cellpadding=0 cellspacing=0 border=0 background=''>"; - echo "<tr><td width=100% background=''>"; - echo "<table width=100% cellpadding=3 cellspacing=0 border=0>"; - echo "<tr bgcolor='#333333'><td width=100% colspan=2><font face='Verdana,Arial,Sans,sans-serif' size=3 color='#FFFFFF'>"; - echo "<b>$titre_table</b></font></td></tr>"; - } - else { - echo "<p><table width=100% cellpadding=3 cellspacing=0 border=0 background=''>"; + bandeau_titre_boite2($titre_table, "rubrique-24.gif", "#999999", "white"); } + echo "<table width=100% cellpadding=3 cellspacing=0 border=0 background=''>"; echo $tranches; @@ -629,11 +682,14 @@ function afficher_rubriques($titre_table, $requete) { $vals = ''; $id_rubrique = $row['id_rubrique']; + $id_parent = $row['id_parent']; $tous_id[] = $id_rubrique; $titre = $row['titre']; + + if ($id_parent == 0) $puce = "img_pack/secteur-12.gif"; + else $puce = "img_pack/rubrique-12.gif"; $s = "<b><a href=\"naviguer.php3?coll=$id_rubrique\">"; - $puce = "puce$spip_lang_rtl.gif"; $s .= "<img src=\"$puce\" alt=\"- \" border=\"0\"> "; $s .= typo($titre); $s .= "</A></b>"; @@ -650,9 +706,9 @@ function afficher_rubriques($titre_table, $requete) { $styles = array('arial2', 'arial2'); afficher_liste($largeurs, $table, $styles); - if ($titre_table) echo "</TABLE></TD></TR>"; echo "</TABLE>"; - fin_cadre_relief(); + //fin_cadre_relief(); + echo "</div>"; } return $tous_id; } @@ -756,6 +812,145 @@ function afficher_auteurs ($titre_table, $requete) { return $tous_id; } +/* + * Afficher liste de messages + */ + +function afficher_messages($titre_table, $query_message, $afficher_auteurs = true, $important = false, $boite_importante = true, $obligatoire = false) { + global $messages_vus; + global $connect_id_auteur; + global $couleur_claire, $couleur_foncee; + global $spip_lang_rtl, $spip_lang_left; + + // Interdire l'affichage de message en double + if ($messages_vus) { + $query_message .= ' AND messages.id_message NOT IN ('.join(',', $messages_vus).')'; + } + + + if ($afficher_auteurs) $cols = 3; + else $cols = 2; + $query_message .= ' ORDER BY date_heure DESC'; + $tranches = afficher_tranches_requete($query_message, $cols); + + if ($tranches OR $obligatoire) { + if ($important) debut_cadre_couleur(); + + echo "<div style='height: 12px;'></div>"; + echo "<div class='liste'>"; + // bandeau_titre_boite($titre_table, $afficher_auteurs, $boite_importante); + bandeau_titre_boite2($titre_table, "messagerie-24.gif", $couleur_foncee, "white"); + echo "<TABLE WIDTH='100%' CELLPADDING='2' CELLSPACING='0' BORDER='0'>"; + + + echo $tranches; + + $result_message = spip_query($query_message); + $num_rows = spip_num_rows($result_message); + + while($row = spip_fetch_array($result_message)) { + $vals = ''; + + $id_message = $row['id_message']; + $date = $row["date_heure"]; + $date_fin = $row["date_fin"]; + $titre = $row["titre"]; + $type = $row["type"]; + $statut = $row["statut"]; + $page = $row["page"]; + $rv = $row["rv"]; + $vu = $row["vu"]; + $messages_vus[$id_message] = $id_message; + + // + // Titre + // + + $s = "<A HREF='message.php3?id_message=$id_message'>"; + + switch ($type) { + case 'pb' : + $puce = "m_envoi_bleu$spip_lang_rtl.gif"; + break; + case 'memo' : + $puce = "m_envoi_jaune$spip_lang_rtl.gif"; + break; + case 'affich' : + $puce = "m_envoi_jaune$spip_lang_rtl.gif"; + break; + case 'normal': + default: + $puce = "m_envoi$spip_lang_rtl.gif"; + break; + } + + $s .= "<img src='img_pack/$puce' width='14' height='7' border='0'>"; + $s .= " ".typo($titre)."</A>"; + $vals[] = $s; + + // + // Auteurs + + if ($afficher_auteurs) { + $query_auteurs = "SELECT auteurs.id_auteur, auteurs.nom FROM spip_auteurs AS auteurs, spip_auteurs_messages AS lien WHERE lien.id_message=$id_message AND lien.id_auteur!=$connect_id_auteur AND lien.id_auteur=auteurs.id_auteur"; + $result_auteurs = spip_query($query_auteurs); + $auteurs = ''; + while ($row_auteurs = spip_fetch_array($result_auteurs)) { + $id_auteur = $row_auteurs['id_auteur']; + $auteurs[] = "<a href='auteurs_edit.php3?id_auteur=$id_auteur'>".typo($row_auteurs['nom'])."</a>"; + } + + if ($auteurs AND $type == 'normal') { + $s = "<FONT FACE='Arial,Sans,sans-serif' SIZE=1>"; + $s .= join(', ', $auteurs); + $s .= "</FONT>"; + } + else $s = " "; + $vals[] = $s; + } + + // + // Date + // + + $s = affdate($date); + if ($rv == 'oui') { + $jour=journum($date); + $mois=mois($date); + $annee=annee($date); + + $heure = heures($date).":".minutes($date); + $heure_fin = heures($date_fin).":".minutes($date_fin); + + $s = "<div style='background: url(img_pack/rv-12.gif) $spip_lang_left center no-repeat; padding-$spip_lang_left: 15px;'><a href='calendrier_jour.php3?jour=$jour&mois=$mois&annee=$annee'><b style='color: black;'>$s</b><br />$heure-$heure_fin</a></div>"; + } else { + $s = "<font color='#999999'>$s</font>"; + } + + $vals[] = $s; + + $table[] = $vals; + } + + if ($afficher_auteurs) { + $largeurs = array('', 130, 120); + $styles = array('arial2', 'arial1', 'arial1'); + } + else { + $largeurs = array('', 120); + $styles = array('arial2', 'arial1'); + } + afficher_liste($largeurs, $table, $styles); + + echo "</TABLE>"; + echo "</div>\n\n"; + spip_free_result($result_message); + if ($important) fin_cadre_couleur(); + } +} + + + // // Afficher les forums // @@ -937,11 +1132,20 @@ function bouton($titre,$lien) { // Presentation de l'interface privee, debut du HTML // -function debut_html($titre = "") { +function debut_html($titre = "", $rubrique="", $onLoad="") { global $couleur_foncee, $couleur_claire, $couleur_lien, $couleur_lien_off; global $flag_ecrire; - global $spip_lang_rtl; - + global $spip_lang_rtl, $spip_lang_left; + global $mode; + global $connect_statut, $connect_toutes_rubriques; + + /* + if ($rubrique == "administration") { + $GLOBALS["couleur_claire"] = "#e3d3d5"; + $GLOBALS["couleur_foncee"] = "#960014"; + } + */ + $nom_site_spip = entites_html(lire_meta("nom_site")); $titre = textebrut(typo($titre)); @@ -967,21 +1171,166 @@ function debut_html($titre = "") { afficher_script_layer(); ?> <script type='text/javascript'><!-- -function changeclass(objet, myClass) -{ - objet.className = myClass; -} -function changesurvol(iddiv, myClass) -{ - document.getElementById(iddiv).className = myClass; -} -var antifocus=false; // effacement titre quand new=oui + var init_gauche = true; + + function findObj(n, d) { //v4.0 + var p,i,x; + if(!d) d = document; + if((p = n.indexOf("?"))>0 && parent.frames.length) { + d = parent.frames[n.substring(p+1)].document; + n = n.substring(0,p); + } + if(!(x = d[n]) && d.all) x = d.all[n]; + for (i = 0; !x && i<d.forms.length; i++) x = d.forms[i][n]; + for(i=0; !x && d.layers && i<d.layers.length; i++) x = findObj(n,d.layers[i].document); + if(!x && document.getElementById) x = document.getElementById(n); return x; + } + + function changestyle(id_couche, element, style) { + + <?php if ($connect_statut == "0minirezo" AND $connect_toutes_rubriques) { ?> + findObj('bandeaudocuments').style.visibility = 'hidden'; + findObj('bandeauredacteurs').style.visibility = 'hidden'; + <?php if (lire_meta("activer_statistiques") != 'non') ?> findObj('bandeausuivi').style.visibility = 'hidden'; + findObj('bandeauadministration').style.visibility = 'hidden'; + <?php } ?> + + findObj('bandeaudeconnecter').style.visibility = 'hidden'; + findObj('bandeautoutsite').style.visibility = 'hidden'; + findObj('bandeaunavrapide').style.visibility = 'hidden'; + findObj('bandeauagenda').style.visibility = 'hidden'; + findObj('bandeaumessagerie').style.visibility = 'hidden'; + findObj('bandeausynchro').style.visibility = 'hidden'; + findObj('bandeaurecherche').style.visibility = 'hidden'; + findObj('bandeauinfoperso').style.visibility = 'hidden'; + findObj('bandeaudisplay').style.visibility = 'hidden'; + findObj('bandeauecran').style.visibility = 'hidden'; + findObj('bandeauinterface').style.visibility = 'hidden'; + + if (init_gauche) { + <?php if ($connect_statut == "0minirezo" AND $connect_toutes_rubriques) { ?> + decalerCouche('bandeaudocuments'); + decalerCouche('bandeauredacteurs'); + <?php if (lire_meta("activer_statistiques") != 'non') ?> decalerCouche('bandeausuivi'); + decalerCouche('bandeauadministration'); + <?php } ?> + init_gauche = false; + } + + + if (!(layer = findObj(id_couche))) return; + + layer.style[element] = style; + } + + function decalerCouche(id_couche) { + if (!(layer = findObj(id_couche))) return; + + <?php if ($spip_lang_left == "left") { /* uniquement affichage ltr: bug Mozilla dans offsetWidth quand ecran inverse! */ ?> + + if ( parseInt(layer.style.<?php echo $spip_lang_left; ?>) > 0) { + gauche = parseInt(layer.style.<?php echo $spip_lang_left; ?>) - Math.floor( layer.offsetWidth / 2 ) + Math.floor(<?php echo largeur_icone_bandeau_principal(_T('icone_a_suivre')); ?> / 2); + if (gauche < 0) gauche = 0; + + layer.style.<?php echo $spip_lang_left; ?> = gauche+"px"; + } + + <?php } ?> + + } + + function changeclass(objet, myClass) + { + objet.className = myClass; + } + function changesurvol(iddiv, myClass) + { + document.getElementById(iddiv).className = myClass; + } + function setActiveStyleSheet(title) { + var i, a, main; + for(i=0; (a = document.getElementsByTagName("link")[i]); i++) { + if(a.getAttribute("rel").indexOf("style") != -1 + && a.getAttribute("title")) { + a.disabled = true; + if(a.getAttribute("title") == title) a.disabled = false; + } + } + } + + function getHeight(obj) { + if (obj == "window") { + return hauteur_fenetre(); + } + else + { + obj = document.getElementById(obj); + if (obj.offsetHeight) return obj.offsetHeight; + } + } + function hauteur_fenetre() { + var myWidth = 0, myHeight = 0; + if( typeof( window.innerWidth ) == 'number' ) { + //Non-IE + myHeight = window.innerHeight; + } else { + if( document.documentElement && + ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) { + //IE 6+ in 'standards compliant mode' + myHeight = document.documentElement.clientHeight; + } else { + if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) { + //IE 4 compatible + myHeight = document.body.clientHeight; + } + } + } + return myHeight; + } + + + function hauteurFrame(nbCol) { + hauteur = hauteur_fenetre() - 40; + hauteur = hauteur - getHeight('haut-page'); + + if (findObj('brouteur_hierarchie')) hauteur = hauteur - getHeight('brouteur_hierarchie'); + + for (i=0; i<nbCol; i++) { + source = document.getElementById("iframe" + i); + source.style.height = hauteur + 'px'; + } + } + + function hauteurTextarea() { + hauteur = hauteur_fenetre() - 80; + + source = document.getElementById("text_area"); + source.style.height = hauteur + 'px'; + } + + function changeVisible(input, id, select, nonselect) { + if (input) { + findObj(id).style.display = select; + } else { + findObj(id).style.display = nonselect; + } + + } + + + var antifocus=false; // effacement titre quand new=oui + //--></script> + <link rel="alternate stylesheet" href="spip_style_invisible.css" type="text/css" title="invisible" /> + <link rel="stylesheet" href="spip_style_visible.css" type="text/css" title="visible" /> </head> <?php - echo "<body text='#000000' bgcolor='#e4e4e4' background='img_pack/degrade.jpg' link='$couleur_lien' vlink='$couleur_lien_off' alink='$couleur_lien_off' topmargin='0' leftmargin='0' marginwidth='0' marginheight='0'"; + echo "<body text='#000000' bgcolor='#f8f7f3' link='$couleur_lien' vlink='$couleur_lien_off' alink='$couleur_lien_off' topmargin='0' leftmargin='0' marginwidth='0' marginheight='0' frameborder='0'"; + if ($spip_lang_rtl) echo " dir='rtl'"; + //if ($mode == "wysiwyg") echo " onLoad='debut_editor();'"; + echo " onLoad=\"setActiveStyleSheet('invisible');$onLoad\""; echo ">"; } @@ -989,91 +1338,63 @@ var antifocus=false; // effacement titre quand new=oui function onglet_relief_inter(){ global $spip_display; - if ($spip_display != 1) { - echo "<td background='img_pack/barre-noir.gif'><img src='img_pack/rien.gif' alt='' width='1' height='40'></td>"; - } + + echo "<td> </td>"; + } function debut_onglet(){ global $spip_display; - if ($spip_display == 1) { - echo "\n"; - echo "<p><table cellpadding=0 cellspacing=3 border=0>"; - echo "<tr>"; - } - else { - echo "\n"; - echo "<p><table cellpadding=0 cellspacing=0 border=0>"; - echo "<tr><td>"; - if ($GLOBALS['spip_lang_rtl']) - echo "<img src='img_pack/barre-d.gif' alt='' width='16' height='40'>"; - else - echo "<img src='img_pack/barre-g.gif' alt='' width='16' height='40'>"; - echo "</td>"; - } + + echo "\n\n"; + echo "<div style='padding: 7px;'><table cellpadding='0' cellspacing='0' border='0' align='center'>"; + echo "<tr>"; } function fin_onglet(){ global $spip_display; - onglet_relief_inter(); - if ($spip_display == 1) { - echo "</tr>"; - echo "</table>"; - } else { - echo "<td>"; - if ($GLOBALS['spip_lang_rtl']) - echo "<img src='img_pack/barre-g.gif' alt='' width='16' height='40'>"; - else - echo "<img src='img_pack/barre-d.gif' alt='' width='16' height='40'>"; - echo "</td></tr>"; - echo "</table>"; - } + echo "</tr>"; + echo "</table></div>\n\n"; } function onglet($texte, $lien, $onglet_ref, $onglet, $icone=""){ - global $spip_display ; - if ($spip_display == 1) { - if ($onglet_ref == $onglet){ - echo "\n<td class='iconeon' valign='middle'>"; - echo "<font face='Verdana,Arial,Sans,sans-serif' size='2' color='black'><b>$texte</b></font>"; - echo "</td>"; - } - else { - echo "\n<td class='iconeoff' onMouseOver=\"changeclass(this,'iconeon');\" onMouseOut=\"changeclass(this,'iconeoff');\" onClick=\"document.location='$lien'\" valign='middle'>"; - echo "<a href='$lien' class='icone'><font face='Verdana,Arial,Sans,sans-serif' size='2' color='#666666'><b>$texte</b></font></a>"; - echo "</td>"; - } - } - else { - if ($onglet_ref == $onglet){ - onglet_relief_inter(); - if (strlen($icone)>3){ - echo "\n<td background='img_pack/barre-noir.gif' height=40 valign='top'>"; - echo " <img src='img_pack/$icone' border=0>"; - echo "</td>"; + global $spip_display, $spip_lang_left ; + + + echo "<td>"; + + if ($onglet != $onglet_ref) { + echo "<div style='position: relative;'>"; + if ($spip_display != 1) { + if (strlen($icone) > 0) { + echo "<div style='z-index: 2; position: absolute; top: 0px; $spip_lang_left: 5px;'><img src='img_pack/$icone' /></div>"; + $style = " top: 7px; padding-$spip_lang_left: 32px; z-index: 1;"; + } else { + $style = " top: 7px;"; } - echo "\n<td background='img_pack/barre-noir.gif' height=40 valign='middle'>"; - echo " <font face='Verdana,Arial,Sans,sans-serif' size='2' color='black'><b>$texte</b></font> "; - echo "</td>"; } - else { - onglet_relief_inter(); - echo "\n<td class='reliefblanc' onMouseOver=\"changeclass(this,'reliefgris');\" onMouseOut=\"changeclass(this,'reliefblanc');\" height='40' valign='middle'>\n"; - echo "<table border='0' cellspacing='0' cellpadding='0'><tr>\n"; - - if (strlen($icone)>3){ - echo "\n<td height=40 valign='middle'>"; - echo " <a href='$lien' class='icone'><img src='img_pack/$icone' border=0></a>"; - echo "</td>"; + + echo "<div onMouseOver=\"changeclass(this, 'onglet_on');\" onMouseOut=\"changeclass(this, 'onglet');\" class='onglet' style='position: relative;$style'><a href='$lien'>$texte</a></div>"; + + + echo "</div>"; + } else { + echo "<div style='position: relative;'>"; + if ($spip_display != 1) { + if (strlen($icone) > 0) { + echo "<div style='z-index: 2; position: absolute; top: 0px; $spip_lang_left: 5px;'><img src='img_pack/$icone' /></div>"; + $style = " top: 7px; padding-$spip_lang_left: 32px; z-index: 1;"; + } else { + $style = " top: 7px;"; } - echo "\n<td height=40 valign='middle'>"; - echo "<a href='$lien' class='icone'> <font face='Verdana,Arial,Sans,sans-serif' size='2' color='#666666'><b>$texte</b></font></a> "; - echo "</td>"; - - echo "\n</tr></table>"; - echo "\n</td>\n"; } + + echo "<div class='onglet_off' style='position: relative;$style'>$texte</div>"; + + + echo "</div>"; } + echo "</td>"; } @@ -1083,13 +1404,26 @@ function barre_onglets($rubrique, $onglet){ debut_onglet(); if ($rubrique == "statistiques") { - onglet(_T('onglet_evolution_visite_mod'), "statistiques_visites.php3", "evolution", $onglet, "statistiques-24.gif"); - onglet(_T('titre_liens_entrants'), "statistiques_referers.php3", "referers", $onglet, "referers-24.gif"); + // onglet(_T('onglet_evolution_visite_mod'), "statistiques_visites.php3", "evolution", $onglet, "statistiques-24.gif"); + // onglet(_T('titre_liens_entrants'), "statistiques_referers.php3", "referers", $onglet, "referers-24.gif"); } if ($rubrique == "repartition") { - onglet(_T('onglet_repartition_rubrique'), "statistiques.php3", "rubriques", $onglet, "rubrique-24.gif"); - if (lire_meta('multi_articles') == 'oui' OR lire_meta('multi_rubriques') == 'oui') + if (lire_meta('multi_articles') == 'oui' OR lire_meta('multi_rubriques') == 'oui') { + onglet(_T('onglet_repartition_rubrique'), "statistiques.php3", "rubriques", $onglet, "rubrique-24.gif"); onglet(_T('onglet_repartition_lang'), "statistiques_lang.php3", "langues", $onglet, "langues-24.gif"); + } + } + + if ($rubrique == "rep_depuis") { + onglet(_T('icone_repartition_actuelle'), "statistiques_lang.php3", "popularite", $onglet); + onglet(_T('onglet_repartition_debut'), "statistiques_lang.php3?critere=debut", "debut", $onglet); + + } + + if ($rubrique == "stat_depuis") { + onglet(_T('icone_repartition_actuelle'), "statistiquesphp3", "popularite", $onglet); + onglet(_T('onglet_repartition_debut'), "statistiques.php3?critere=debut", "debut", $onglet); + } if ($rubrique == "administration"){ @@ -1120,6 +1454,11 @@ function barre_onglets($rubrique, $onglet){ onglet(_T('module_fichiers_langues'), "lang_raccourcis.php3", "fichiers", $onglet, "traductions-24.gif"); } } + + if ($rubrique == "forums") { + onglet(_T('titre_forum'), "forum.php3", "privrac", $onglet, "forum-interne-24.gif"); + onglet(_T('icone_forum_administrateur'), "forum_admin.php3", "privadm", $onglet, "forum-admin-24.gif"); + } if ($rubrique == "suivi_forum"){ onglet(_T('onglet_messages_publics'), "controle_forum.php3?page=public", "public", $onglet, "racine-site-24.gif"); @@ -1136,27 +1475,47 @@ function barre_onglets($rubrique, $onglet){ } -function icone_bandeau_principal($texte, $lien, $fond, $rubrique_icone = "vide", $rubrique = "", $lien_noscript = ""){ +function largeur_icone_bandeau_principal($texte) { global $spip_display, $spip_ecran ; - global $menu_accesskey, $compteur_survol; + global $connect_statut, $connect_toutes_rubriques; if ($spip_display == 1){ - //$hauteur = 20; $largeur = 80; } else if ($spip_display == 3){ - //$hauteur = 50; $largeur = 60; - $title = " title=\"$texte\""; - $alt = " alt=\"$texte\""; } else { - //$hauteur = 80; if (count(explode(" ", $texte)) > 1) $largeur = 84; else $largeur = 80; $alt = " alt=\" \""; } + if ($spip_ecran == "large") $largeur = $largeur + 30; + + if (!($connect_statut == "0minirezo" AND $connect_toutes_rubriques)) { + $largeur = $largeur + 30; + } + + return $largeur; +} + +function icone_bandeau_principal($texte, $lien, $fond, $rubrique_icone = "vide", $rubrique = "", $lien_noscript = "", $sous_rubrique_icone = "", $sous_rubrique = ""){ + global $spip_display, $spip_ecran, $couleur_foncee ; + global $menu_accesskey, $compteur_survol; + + $largeur = largeur_icone_bandeau_principal($texte); + + if ($spip_display == 1){ + } + else if ($spip_display == 3){ + $title = " title=\"$texte\""; + $alt = " alt=\"$texte\""; + } + else { + $alt = " alt=\" \""; + } + if (!$menu_accesskey) $menu_accesskey = 1; if ($menu_accesskey < 10) { $accesskey = " accesskey='$menu_accesskey'"; @@ -1167,7 +1526,7 @@ function icone_bandeau_principal($texte, $lien, $fond, $rubrique_icone = "vide", $menu_accesskey++; } - if ($rubrique_icone == $rubrique) $class_select = " class='selection'"; + if ($sous_rubrique_icone == $sous_rubrique) $class_select = " class='selection'"; if (eregi("^javascript:",$lien)) { $a_href = "<a$accesskey onClick=\"$lien; return false;\" href='$lien_noscript' target='spip_aide'$class_select>"; @@ -1179,12 +1538,12 @@ function icone_bandeau_principal($texte, $lien, $fond, $rubrique_icone = "vide", $compteur_survol ++; if ($spip_display != 1) { - echo "<td class='cellule48' width='$largeur'>$a_href<img src='img_pack/$fond'$alt$title>"; + echo "<td class='cellule48' onMouseOver=\"changestyle('bandeau$rubrique_icone', 'visibility', 'visible');\" width='$largeur'>$a_href<img src='img_pack/$fond' width='48' height='48'$alt$title>"; if ($spip_display != 3) { echo "<span>$texte</span>"; } } - else echo "<td class='cellule-texte' width='$largeur'>$a_href".$texte; + else echo "<td class='cellule-texte' onMouseOver=\"changestyle('bandeau$rubrique_icone', 'visibility', 'visible');\" width='$largeur'>$a_href".$texte; echo "</a></td>\n"; } @@ -1217,8 +1576,6 @@ function icone_bandeau_secondaire($texte, $lien, $fond, $rubrique_icone = "vide" } if ($spip_display != 3 AND strlen($texte)>16) $largeur += 20; - if ($largeur) $width = "width='$largeur'"; - if (!$menu_accesskey) $menu_accesskey = 1; if ($menu_accesskey < 10) { $accesskey = " accesskey='$menu_accesskey'"; @@ -1236,7 +1593,8 @@ function icone_bandeau_secondaire($texte, $lien, $fond, $rubrique_icone = "vide" $a_href = "<a$accesskey href=\"$lien\"$class_select>"; if ($spip_display != 1) { - echo "<td class='cellule36' width='$largeur'>$a_href<img src='img_pack/$fond'$alt$title>"; + echo "<td class='cellule36' style='width: ".$largeur."px;'>"; + echo "$a_href<img src='img_pack/$fond'$alt$title>"; if ($aide AND $spip_display != 3) echo aide($aide)." "; if ($spip_display != 3) { echo "<span>$texte</span>"; @@ -1257,7 +1615,7 @@ function icone($texte, $lien, $fond, $fonction="", $align="", $afficher='oui'){ if ($spip_display == 1){ $hauteur = 20; - $largeur = 80; + $largeur = 100; $alt = " alt=\"\""; } else if ($spip_display == 3){ @@ -1268,7 +1626,7 @@ function icone($texte, $lien, $fond, $fonction="", $align="", $afficher='oui'){ } else { $hauteur = 70; - $largeur = 80; + $largeur = 100; } if ($fonction == "supprimer.gif") { @@ -1326,16 +1684,59 @@ function bandeau_barre_verticale(){ // lien changement de couleur -function lien_change_var($lien, $set, $couleur, $coords, $titre) { +function lien_change_var($lien, $set, $couleur, $coords, $titre, $mouseOver="") { $lien->addVar($set, $couleur); - return "\n<area shape='rect' href='". $lien->getUrl() ."' coords='$coords' title=\"$titre\">"; + return "\n<area shape='rect' href='". $lien->getUrl() ."' coords='$coords' title=\"$titre\" $mouseOver>"; } // // Debut du corps de la page // -function debut_page($titre = "", $rubrique = "asuivre", $sous_rubrique = "asuivre") { +function bandeau_rubrique ($id_rubrique, $titre_rubrique, $z = 1) { + global $zdecal; + global $spip_ecran, $spip_display; + global $spip_lang, $spip_lang_rtl, $spip_lang_left, $spip_lang_right; + + // Calcul du nombre max de sous-menus + $zdecal = $zdecal + 1; + if ($spip_ecran == "large") $zmax = 8; + else $zmax= 6; + + // Limiter volontairement le nombre de sous-menus + $zmax = 3; + + + if ($zindex < 1) $zindex = 1; + if ($zdecal == 1) $image = "secteur-12.gif"; + else $image = "rubrique-12.gif"; + + + + $result_rub = spip_query("SELECT * FROM spip_rubriques WHERE id_parent=$id_rubrique ORDER BY titre"); + + $i = spip_num_rows($result_rub); + if ($i > 0 AND $zdecal < $zmax) { + echo "<div style='position: relative; z-index: $z;' onMouseOver=\"findObj('bandeau_rub$id_rubrique').style.visibility = 'visible';\" onMouseOut=\"findObj('bandeau_rub$id_rubrique').style.visibility = 'hidden';\">\n"; + echo "<div style='background: url(img_pack/triangle-droite$spip_lang_rtl.gif) $spip_lang_right center no-repeat;'><a href='naviguer.php3?coll=$id_rubrique' class='bandeau_rub' style='background-image: url(img_pack/$image);'>$titre_rubrique</a></div>\n"; + echo "<div class='bandeau_rub' style='z-index: ".($z+1).";' id='bandeau_rub$id_rubrique'>"; + while ($row_rub = spip_fetch_array($result_rub)) { + $id_rub = $row_rub["id_rubrique"]; + $titre_rub = supprimer_numero(typo($row_rub["titre"])); + //echo "<a href='naviguer.php3?coll=$id_rub' class='bandeau_rub'>$titre_rub</a>"; + bandeau_rubrique ($id_rub, $titre_rub, ($z+$i)); + $i = $i - 1; + } + echo "</div>"; + echo "</div></n>"; + } else { + echo "<div><a href='naviguer.php3?coll=$id_rubrique' class='bandeau_rub' style='background-image: url(img_pack/$image); padding-$spip_lang_right: 2px;'>$titre_rubrique</a></div>"; + } + $zdecal = $zdecal - 1; + +} + +function debut_page($titre = "", $rubrique = "asuivre", $sous_rubrique = "asuivre", $onLoad = "") { global $couleur_foncee; global $couleur_claire; global $adresse_site; @@ -1345,7 +1746,7 @@ function debut_page($titre = "", $rubrique = "asuivre", $sous_rubrique = "asuivr global $connect_toutes_rubriques; global $auth_can_disconnect, $connect_login; global $options, $spip_display, $spip_ecran; - global $spip_lang, $spip_lang_rtl; + global $spip_lang, $spip_lang_rtl, $spip_lang_left, $spip_lang_right; $activer_messagerie = lire_meta("activer_messagerie"); global $clean_link; @@ -1361,90 +1762,81 @@ function debut_page($titre = "", $rubrique = "asuivre", $sous_rubrique = "asuivr if (strlen($adresse_site)<10) $adresse_site="../"; - debut_html($titre); + debut_html($titre, $rubrique, $onLoad); $ctitre = _T('titre_changer_couleur_interface'); echo "\n<map name='map_couleur'>"; - echo lien_change_var ($clean_link, 'set_couleur', 6, '0,0,10,10', $ctitre); - echo lien_change_var ($clean_link, 'set_couleur', 1, '12,0,22,10', $ctitre); - echo lien_change_var ($clean_link, 'set_couleur', 2, '24,0,34,10', $ctitre); - echo lien_change_var ($clean_link, 'set_couleur', 3, '36,0,46,10', $ctitre); - echo lien_change_var ($clean_link, 'set_couleur', 4, '48,0,58,10', $ctitre); - echo lien_change_var ($clean_link, 'set_couleur', 5, '60,0,70,10', $ctitre); - echo lien_change_var ($clean_link, 'set_couleur', 7, '0,11,10,21', $ctitre); - echo lien_change_var ($clean_link, 'set_couleur', 8, '12,11,22,21', $ctitre); - echo lien_change_var ($clean_link, 'set_couleur', 9, '24,11,34,21', $ctitre); - echo lien_change_var ($clean_link, 'set_couleur', 10, '36,11,46,21', $ctitre); - echo lien_change_var ($clean_link, 'set_couleur', 11, '48,11,58,21', $ctitre); - echo lien_change_var ($clean_link, 'set_couleur', 12, '60,11,70,21', $ctitre); + echo lien_change_var ($clean_link, 'set_couleur', 6, '0,0,10,10', $ctitre, "onMouseOver=\"changestyle('bandeauinterface','visibility', 'visible');\""); + echo lien_change_var ($clean_link, 'set_couleur', 1, '12,0,22,10', $ctitre, "onMouseOver=\"changestyle('bandeauinterface','visibility', 'visible');\""); + echo lien_change_var ($clean_link, 'set_couleur', 2, '24,0,34,10', $ctitre, "onMouseOver=\"changestyle('bandeauinterface','visibility', 'visible');\""); + echo lien_change_var ($clean_link, 'set_couleur', 3, '36,0,46,10', $ctitre, "onMouseOver=\"changestyle('bandeauinterface','visibility', 'visible');\""); + echo lien_change_var ($clean_link, 'set_couleur', 4, '48,0,58,10', $ctitre, "onMouseOver=\"changestyle('bandeauinterface','visibility', 'visible');\""); + echo lien_change_var ($clean_link, 'set_couleur', 5, '60,0,70,10', $ctitre, "onMouseOver=\"changestyle('bandeauinterface','visibility', 'visible');\""); echo "\n</map>"; echo "\n<map name='map_layout'>"; - echo lien_change_var ($clean_link, 'set_disp', 1, '1,0,18,15', _T('lien_afficher_texte_seul')); - echo lien_change_var ($clean_link, 'set_disp', 2, '19,0,40,15', _T('lien_afficher_texte_icones')); - echo lien_change_var ($clean_link, 'set_disp', 3, '41,0,59,15', _T('lien_afficher_icones_seuls')); + echo lien_change_var ($clean_link, 'set_disp', 1, '1,0,18,15', _T('lien_afficher_texte_seul'), "onMouseOver=\"changestyle('bandeauvide','visibility', 'visible');\""); + echo lien_change_var ($clean_link, 'set_disp', 2, '19,0,40,15', _T('lien_afficher_texte_icones'), "onMouseOver=\"changestyle('bandeauvide','visibility', 'visible');\""); + echo lien_change_var ($clean_link, 'set_disp', 3, '41,0,59,15', _T('lien_afficher_icones_seuls'), "onMouseOver=\"changestyle('bandeauvide','visibility', 'visible');\""); echo "\n</map>"; + + // Icones principales + + echo "<div id='haut-page'>"; echo "<div class='bandeau-principal' align='center'>\n"; - echo "<div class='bandeau-icones' style='width: ".$largeur."px'>\n"; - echo "<table class='gauche'><tr>\n"; - - icone_bandeau_principal (_T('icone_a_suivre'), "index.php3", "asuivre-48.gif", "asuivre", $rubrique); - icone_bandeau_principal (_T('icone_edition_site'), "naviguer.php3", "documents-48$spip_lang_rtl.gif", "documents", $rubrique); - icone_bandeau_principal (_T('icone_discussions'), "forum.php3", "messagerie-48.gif", "redacteurs", $rubrique); - if ($connect_statut == "0minirezo") { - bandeau_barre_verticale(); - if ($connect_toutes_rubriques) - icone_bandeau_principal (_T('icone_suivi_actualite'), "controle_forum.php3", "suivi-48.gif", "suivi", $rubrique); - else if (lire_meta("activer_statistiques") != 'non') - icone_bandeau_principal (_T('icone_statistiques'), "statistiques_visites.php3", "statistiques-48.gif", "suivi", $rubrique); + echo "<div class='bandeau-icones' >\n"; + echo "<table width='$largeur' cellpadding='0' cellspacing='0' border='0' align='center'><tr>\n"; + + icone_bandeau_principal (_T('icone_a_suivre'), "index.php3", "asuivre-48.png", "asuivre", $rubrique, "", "asuivre", $sous_rubrique); + icone_bandeau_principal (_T('icone_edition_site'), "naviguer.php3", "documents-48$spip_lang_rtl.png", "documents", $rubrique, "", "rubriques", $sous_rubrique); + icone_bandeau_principal (_T('titre_forum'), "forum.php3", "messagerie-48.png", "redacteurs", $rubrique, "", "forum-interne", $sous_rubrique); + icone_bandeau_principal (_T('icone_auteurs'), "auteurs.php3", "redacteurs-48.png", "auteurs", $rubrique, "", "redacteurs", $sous_rubrique); + if ($connect_statut == "0minirezo" AND $connect_toutes_rubriques AND lire_meta("activer_statistiques") != 'non') { + //bandeau_barre_verticale(); + icone_bandeau_principal (_T('icone_statistiques_visites'), "statistiques_visites.php3", "statistiques-48.png", "suivi", $rubrique, "", "statistiques", $sous_rubrique); } if ($connect_statut == '0minirezo' and $connect_toutes_rubriques) { - icone_bandeau_principal (_T('icone_admin_site'), "configuration.php3", "administration-48.gif", "administration", $rubrique); + icone_bandeau_principal (_T('icone_configuration_site'), "configuration.php3", "administration-48.png", "administration", $rubrique, "", "configuration", $sous_rubrique); } - echo "</tr></table>\n"; - echo "<table class='droite'><tr>\n"; + echo "<td> </td>"; - icone_bandeau_principal (_T('icone_aide_ligne'), "javascript:window.open('aide_index.php3?var_lang=$spip_lang', 'aide_spip', 'scrollbars=yes,resizable=yes,width=740,height=580');", "aide-48$spip_lang_rtl.gif", "vide", "", "aide_index.php3?var_lang=$spip_lang"); - icone_bandeau_principal (_T('icone_visiter_site'), "$adresse_site", "visiter-48$spip_lang_rtl.gif"); - echo "</tr></table>\n"; - // Merci le W3C pour l'alignement vertical / Thank you W3C idiots for vertical alignment - if ($spip_display == 1) $h = 8; - else if ($spip_display == 3) $h = 20; - else $h = 34; - echo "<div class='milieu' style='margin-top: ".$h."px'>"; - echo "<img src='img_pack/choix-layout$spip_lang_rtl".($spip_lang=='he'?'_he':'').".gif' alt='abc' vspace=3 border=0 usemap='#map_layout'>"; - echo "</div>\n"; - echo "<div class='fin'></div>\n"; + icone_bandeau_principal (_T('icone_aide_ligne'), "javascript:window.open('aide_index.php3?var_lang=$spip_lang', 'aide_spip', 'scrollbars=yes,resizable=yes,width=740,height=580');", "aide-48$spip_lang_rtl.png", "vide", "", "aide_index.php3?var_lang=$spip_lang", "aide-en-ligne", $sous_rubrique); + icone_bandeau_principal (_T('icone_visiter_site'), "$adresse_site", "visiter-48$spip_lang_rtl.png", "visiter","", "visiter", $sous_rubrique); - echo "</div>\n"; - echo "</div>\n"; + echo "</tr></table>\n"; + echo "</div>\n"; + + echo "<div style='text-align: $spip_lang_left; width: ".$largeur."px; position: relative; z-index: 2000;'>"; + // Icones secondaires $activer_messagerie = lire_meta("activer_messagerie"); $connect_activer_messagerie = $GLOBALS["connect_activer_messagerie"]; + + if ($rubrique == "asuivre"){ + $class = "visible_au_chargement"; + } else { + $class = "invisible_au_chargement"; + } + $decal = largeur_icone_bandeau_principal(_T('icone_a_suivre')); - echo "<div class='bandeau-secondaire' align='center'>\n"; - echo "<div class='bandeau-icones' style='width: ".$largeur."px'>\n"; - echo "<table class='gauche'><tr>\n"; - if ($rubrique == "asuivre"){ - icone_bandeau_secondaire (_T('icone_a_suivre'), "index.php3", "asuivre-24.gif", "asuivre", $sous_rubrique); - icone_bandeau_secondaire (_T('icone_informations_personnelles'), "auteurs_edit.php3?id_auteur=$connect_id_auteur", "fiche-perso-24.gif", "perso", $sous_rubrique); - icone_bandeau_secondaire (_T('icone_site_entier'), "articles_tous.php3", "tout-site-24.gif", "tout-site", $sous_rubrique); - if ($options == "avancees"){ - icone_bandeau_secondaire (_T('icone_suivi_activite'), "synchro.php3", "synchro-24.gif", "synchro", $sous_rubrique); - } + if ($rubrique == "documents"){ + $class = "visible_au_chargement"; + } else { + $class = "invisible_au_chargement"; } - else if ($rubrique == "documents"){ - icone_bandeau_secondaire (_T('icone_rubriques'), "naviguer.php3", "rubrique-24.gif", "rubriques", $sous_rubrique); + if ($connect_statut == "0minirezo" AND $connect_toutes_rubriques) { + echo "<div class='$class' id='bandeaudocuments' style='position: absolute; $spip_lang_left: ".$decal."px;'><div class='bandeau_sec'><table class='gauche'><tr>\n"; + //icone_bandeau_secondaire (_T('icone_rubriques'), "naviguer.php3", "rubrique-24.gif", "rubriques", $sous_rubrique); $nombre_articles = spip_num_rows(spip_query("SELECT art.id_article FROM spip_articles AS art, spip_auteurs_articles AS lien WHERE lien.id_auteur = '$connect_id_auteur' AND art.id_article = lien.id_article LIMIT 0,1")); if ($nombre_articles > 0) { @@ -1456,8 +1848,6 @@ function debut_page($titre = "", $rubrique = "asuivre", $sous_rubrique = "asuivr icone_bandeau_secondaire (_T('icone_breves'), "breves.php3", "breve-24.gif", "breves", $sous_rubrique); } - icone_bandeau_secondaire (_T('icone_auteurs'), "auteurs.php3", "redacteurs-24.gif", "redacteurs", $sous_rubrique); - if ($options == "avancees"){ $articles_mots = lire_meta('articles_mots'); if ($articles_mots != "non") { @@ -1472,173 +1862,483 @@ function debut_page($titre = "", $rubrique = "asuivre", $sous_rubrique = "asuivr icone_bandeau_secondaire (_T('icone_doc_rubrique'), "documents_liste.php3", "doc-24.gif", "documents", $sous_rubrique); } } + echo "</tr></table></div></div>"; } - else if ($rubrique == "redacteurs") { - icone_bandeau_secondaire (_T('titre_forum'), "forum.php3", "forum-interne-24.gif", "forum-interne", $sous_rubrique); - if ($connect_statut == "0minirezo" AND lire_meta('forum_prive_admin') == 'oui') - icone_bandeau_secondaire (_T('icone_forum_administrateur'), "forum_admin.php3", "forum-admin-24.gif", "forum-admin", $sous_rubrique); - - if ($activer_messagerie == "oui" AND $connect_activer_messagerie != "non") { - bandeau_barre_verticale(); - icone_bandeau_secondaire (_T('icone_agenda'), "calendrier_jour.php3", "agenda-24.gif", "calendrier", $sous_rubrique); - icone_bandeau_secondaire (_T('icone_messagerie_personnelle'), "messagerie.php3", "messagerie-24.gif", "messagerie", $sous_rubrique); + + $decal = $decal + largeur_icone_bandeau_principal(_T('icone_edition_site')); + + + + + if ($connect_statut == "0minirezo" AND $connect_toutes_rubriques) { + if ($rubrique == "redacteurs") { + $class = "visible_au_chargement"; + } else { + $class = "invisible_au_chargement"; } + + echo "<div class='$class' id='bandeauredacteurs' style='position: absolute; $spip_lang_left: ".$decal."px;'><div class='bandeau_sec'><table class='gauche'><tr>\n"; + if ($connect_toutes_rubriques) { + icone_bandeau_secondaire (_T('icone_suivi_forums'), "controle_forum.php3", "suivi-forum-24.gif", "forum-controle", $sous_rubrique); + icone_bandeau_secondaire (_T('icone_suivi_pettions'), "controle_petition.php3", "petition-24.gif", "suivi-petition", $sous_rubrique); + } + echo "</tr></table></div></div>"; + } - else if ($rubrique == "suivi") { - if ($connect_toutes_rubriques) { - icone_bandeau_secondaire (_T('icone_suivi_forums'), "controle_forum.php3", "suivi-forum-24.gif", "forum-controle", $sous_rubrique); - icone_bandeau_secondaire (_T('icone_suivi_pettions'), "controle_petition.php3", "petition-24.gif", "suivi-petition", $sous_rubrique); - } - if (lire_meta("activer_statistiques") != 'non') { - if ($connect_toutes_rubriques) bandeau_barre_verticale(); - icone_bandeau_secondaire (_T('icone_statistiques_visites'), "statistiques_visites.php3", "statistiques-24.gif", "statistiques", $sous_rubrique); - icone_bandeau_secondaire (_T('icone_repartition_visites'), "statistiques.php3", "rubrique-24.gif", "repartition", $sous_rubrique); + + $decal = $decal + largeur_icone_bandeau_principal(_T('icone_discussions')); + + + + + $decal = $decal + largeur_icone_bandeau_principal(_T('icone_auteurs')); + + // decalage pour barre verticale + //$decal = $decal + 11; + + if ($connect_statut == "0minirezo" AND $connect_toutes_rubriques AND lire_meta("activer_statistiques") != 'non') { + if ($rubrique == "suivi") { + $class = "visible_au_chargement"; + } else { + $class = "invisible_au_chargement"; } + echo "<div class='$class' id='bandeausuivi' style='position: absolute; $spip_lang_left: ".$decal."px;'><div class='bandeau_sec'><table class='gauche'><tr>\n"; + if ($connect_toutes_rubriques) bandeau_barre_verticale(); + + icone_bandeau_secondaire (_T('icone_repartition_visites'), "statistiques.php3", "rubrique-24.gif", "repartition", $sous_rubrique); + icone_bandeau_secondaire (_T('titre_liens_entrants'), "statistiques_referers.php3", "referers-24.gif", "referers", $sous_rubrique); + + echo "</tr></table></div></div>"; + + $decal = $decal + largeur_icone_bandeau_principal(_T('icone_suivi_actualite')); + } - else if ($rubrique == "administration") { - icone_bandeau_secondaire (_T('icone_configuration_site'), "configuration.php3", "administration-24.gif", "configuration", $sous_rubrique); - icone_bandeau_secondaire (_T('icone_gestion_langues'), "config-lang.php3", "langues-24.gif", "langues", $sous_rubrique); - bandeau_barre_verticale(); - if ($options == "avancees") { - icone_bandeau_secondaire (_T('icone_maintenance_site'), "admin_tech.php3", "base-24.gif", "base", $sous_rubrique); - icone_bandeau_secondaire (_T('onglet_vider_cache'), "admin_vider.php3", "cache-24.gif", "cache", $sous_rubrique); - } - else { - icone_bandeau_secondaire (_T('icone_sauver_site'), "admin_tech.php3", "base-24.gif", "base", $sous_rubrique); + + if ($connect_statut == '0minirezo' and $connect_toutes_rubriques) { + if ($rubrique == "administration") { + $class = "visible_au_chargement"; + } else { + $class = "invisible_au_chargement"; } - } + echo "<div class='$class' id='bandeauadministration' style='position: absolute; $spip_lang_left: ".$decal."px;'><div class='bandeau_sec'><table class='gauche'><tr>\n"; + //icone_bandeau_secondaire (_T('icone_configuration_site'), "configuration.php3", "administration-24.gif", "configuration", $sous_rubrique); + icone_bandeau_secondaire (_T('icone_gestion_langues'), "config-lang.php3", "langues-24.gif", "langues", $sous_rubrique); + + bandeau_barre_verticale(); + if ($options == "avancees") { + icone_bandeau_secondaire (_T('icone_maintenance_site'), "admin_tech.php3", "base-24.gif", "base", $sous_rubrique); + icone_bandeau_secondaire (_T('onglet_vider_cache'), "admin_vider.php3", "cache-24.gif", "cache", $sous_rubrique); + } + else { + icone_bandeau_secondaire (_T('icone_sauver_site'), "admin_tech.php3", "base-24.gif", "base", $sous_rubrique); + } + echo "</tr></table></div></div>"; + + + } + echo "</div>"; + echo "</div>\n"; - if ($options == "avancees" AND !($spip_display != 3 AND $rubrique == "documents" AND $spip_ecran == "etroit")) { - global $recherche; - if ($recherche == '' AND $spip_display != 2) { - $recherche_aff = _T('info_rechercher'); - $onfocus = " onfocus=\"if(!antifocus){this.value='';antifocus=true;}\""; - } else - $recherche_aff = $recherche; - bandeau_barre_verticale(); - echo "<td>"; - echo "<form method='get' style='margin: 0px;' action='recherche.php3'>"; - if ($spip_display == "2") - echo "<font face='Verdana,Arial,Sans,sans-serif' size=1 color='#505050'><b>"._T('info_rechercher_02')."</b></font><br>"; - echo '<input type="text" size="10" value="'.$recherche_aff.'" name="recherche" class="spip_recherche" style="width: 70px" accesskey="r"'.$onfocus.'>'; - echo "</form>"; - echo "</td>"; + // Bandeau + if ($rubrique == "administration") { + $style = "background: url(img_pack/rayures-danger.png); background-color: $couleur_foncee"; + echo "<style>a.icone26 { color: white; }</style>"; } + else { + $style = "background-color: $couleur_claire"; + } + echo "\n<div style=\"height: 27px; width: 100%; border-bottom: solid 1px white;$style\">"; + echo "<table align='center' cellpadding='0' background='' width='$largeur'><tr width='$largeur'>"; - echo "</tr></table>\n"; - if ($auth_can_disconnect) { - echo "<table class='droite'><tr>\n"; - icone_bandeau_secondaire (_T('icone_deconnecter'), "../spip_cookie.php3?logout=$connect_login", "deconnecter-24$spip_lang_rtl.gif", "", $sous_rubrique, "deconnect"); - echo "</tr></table>\n"; - } - echo "<div class='fin'></div>\n"; - echo "</div>\n"; - echo "</div>\n"; + echo "<td valign='middle'>"; + echo "<a href='articles_tous.php3' class='icone26' onMouseOver=\"changestyle('bandeautoutsite','visibility','visible');\"><img src='img_pack/tout-site.gif' border='0'></a>"; + $id_rubrique = $GLOBALS['id_rubrique']; + if ($id_rubrique > 0) echo "<a href='brouteur.php3?id_rubrique=$id_rubrique' class='icone26' onMouseOver=\"changestyle('bandeaunavrapide','visibility','visible');\"><img src='img_pack/naviguer-site.gif' alt='' width='26' height='20' border='0'></a>"; + else echo "<a href='brouteur.php3' class='icone26' onMouseOver=\"changestyle('bandeaunavrapide','visibility','visible');\" ><img src='img_pack/naviguer-site.gif' alt='' width='26' height='20' border='0'></a>"; - // Bandeau - echo "\n<table cellpadding='0' bgcolor='$couleur_foncee' style='border-bottom: solid 1px white; border-top: solid 1px #666666;' width='100%'><tr width='100%'><td width='100%'>"; - echo "<table align='center' cellpadding='0' background='' width='$largeur'><tr width='$largeur'>"; + echo "<a href='recherche.php3' class='icone26' onMouseOver=\"changestyle('bandeaurecherche','visibility','visible');\" ><img src='img_pack/loupe.gif' alt='' width='26' height='20' border='0'></a>"; - echo "<td>"; - echo "<font size=1 face='Verdana,Arial,Sans,sans-serif'>"; - if ($options == "avancees") { + echo"<img src='img_pack/rien.gif' width='10' />"; + + echo "<a href='calendrier.php3' class='icone26' onMouseOver=\"changestyle('bandeauagenda','visibility','visible');\"><img src='img_pack/cal-rv.gif' alt='' width='26' height='20' border='0'></a>"; + echo "<a href='messagerie.php3' class='icone26' onMouseOver=\"changestyle('bandeaumessagerie','visibility','visible');\"><img src='img_pack/cal-messagerie.gif' alt='' width='26' height='20' border='0'></a>"; + echo "<a href='synchro.php3' class='icone26' onMouseOver=\"changestyle('bandeausynchro','visibility','visible');\"><img src='img_pack/cal-suivi.gif' alt='' width='26' height='20' border='0'></a>"; + + + + echo"<img src='img_pack/rien.gif' width='10' />"; + + // Redacteur connecte + echo "<a href='auteurs_edit.php3?id_auteur=$connect_id_auteur' class='icone26' onMouseOver=\"changestyle('bandeauinfoperso','visibility','visible');\"><img src='img_pack/fiche-perso.gif' border='0' onMouseOver=\"changestyle('bandeauvide','visibility', 'visible');\">"; + echo $GLOBALS["connect_nom"]; + echo "</a>"; + + echo "</td>"; + + echo "<td> </td>"; + echo "<td class='bandeau_couleur' style='text-align: $spip_lang_right;' valign='middle'>"; + + + // Choix display + // echo"<img src='img_pack/rien.gif' width='10' />"; + if ($options != "avancees") { + $lien = $clean_link; + $lien->addVar('set_options', 'avancees'); + $simple = "<b>"._T('icone_interface_simple')."</b>/"._T('icone_interface_complet'); + } else { + $lien = $clean_link; + $lien->addVar('set_options', 'basiques'); + $simple = _T('icone_interface_simple')."/<b>"._T('icone_interface_complet')."</b>"; + } + echo "<a href='". $lien->getUrl() ."' class='icone26' onMouseOver=\"changestyle('bandeaudisplay','visibility', 'visible');\"><img src='img_pack/interface-display.gif' alt='' width='26' height='20' border='0'></a>"; + + echo "<img src='img_pack/rien.gif' width='10' height='1' />"; + echo "<img src='img_pack/choix-layout$spip_lang_rtl".($spip_lang=='he'?'_he':'').".png' alt='abc' align='middle' width='59' height='15' usemap='#map_layout' border='0' />"; + + + echo "<img src='img_pack/rien.gif' width='10' height='1' />"; + // grand ecran $lien = $clean_link; - $lien->addVar('set_options', 'basiques'); - echo "<span class='fondgris' - onMouseOver=\"changeclass(this,'fondgrison2')\" - onMouseOut=\"changeclass(this,'fondgris')\"><a - href='". $lien->getUrl() ."' class='icone'><font color='black'>"._T('icone_interface_simple')."</font></a></span>"; - echo " <span class = 'fondo'><b>"._T('info_interface_complete')."</b></span>"; + if ($spip_ecran == "large") { + $lien->addVar('set_ecran', 'etroit'); + echo "<a href='". $lien->getUrl() ."' class='icone26' onMouseOver=\"changestyle('bandeauecran','visibility', 'visible');\" title=\""._T('info_petit_ecran')."\"><img src='img_pack/set-ecran-etroit.gif' alt=\""._T('info_petit_ecran')."\" width='26' height='20' border='0'></a>"; + $ecran = "<div>"._T('info_petit_ecran')."/<b>"._T('info_grand_ecran')."</b></div>"; + } + else { + $lien->addVar('set_ecran', 'large'); + echo "<a href='". $lien->getUrl() ."' class='icone26' onMouseOver=\"changestyle('bandeauecran','visibility', 'visible');\" title=\""._T('info_grand_ecran')."\"><img src='img_pack/set-ecran.gif' alt=\""._T('info_grand_ecran')."\" width='26' height='20' border='0'></a>"; + $ecran = "<div><b>"._T('info_petit_ecran')."</b>/"._T('info_grand_ecran')."</div>"; + } + + + // choix de la couleur + echo "<img src='img_pack/rien.gif' width='10' height='1' />"; + echo "<img src='img_pack/barre-couleurs.gif' onMouseOver=\"changestyle('bandeauinterface','visibility', 'visible');\" alt='' width='70' height='10' border='0' usemap='#map_couleur'>"; + + + echo "<img src='img_pack/rien.gif' width='120' height='1' />"; + + if ($auth_can_disconnect) { + echo "<a href='../spip_cookie.php3?logout=$connect_login' class='icone26' onMouseOver=\"changestyle('bandeaudeconnecter','visibility', 'visible');\"><img src='img_pack/deconnecter-24$spip_lang_rtl.gif' border='0'></a>"; + } + echo "</td>"; + + + echo "</tr></table>"; + + echo "<table width='$largeur' cellpadding='0' cellspacing='0'' align='center'><tr><td>"; + echo "<div style='position: relative; z-index: 1000;'>"; + + + echo "<div id='bandeautoutsite' class='bandeau_couleur_sous' style='$spip_lang_left: 0px; width: 170px;'>"; + echo _T('icone_site_entier'); + + $result_racine = spip_query("SELECT * FROM spip_rubriques WHERE id_parent=0 ORDER BY titre"); + $i = spip_num_rows($result_racine); + if ($i > 0) { + echo "<div> </div>"; + echo "<div class='bandeau_rubriques' style='z-index: 1;'>"; + while ($row = spip_fetch_array($result_racine)) { + $id_rubrique = $row["id_rubrique"]; + $titre_rubrique = supprimer_numero(typo($row["titre"])); + + bandeau_rubrique ($id_rubrique, $titre_rubrique, $i); + + $i = $i - 1; + } + echo "</div>"; } - else { - $lien = $clean_link; - $lien->addVar('set_options', 'avancees'); - echo "<span class='fondgrison2'><b>"._T('info_interface_simple')."</b></span> <span class='fondgris' - onMouseOver=\"changeclass(this,'fondgrison2')\" - onMouseOut=\"changeclass(this,'fondgris')\"><a - href='". $lien->getUrl() ."' class='icone'><font color='black'>"._T('icone_interface_complet')."</font></a></span>"; + + echo "</div>"; + + + + + echo "<div id='bandeaunavrapide' class='bandeau_couleur_sous' style='$spip_lang_left: 30px; width: 300px;'>"; + echo _T('icone_brouteur'); + + + + $vos_articles = spip_query("SELECT articles.id_article, articles.titre, articles.statut FROM spip_articles AS articles, spip_auteurs_articles AS lien WHERE articles.id_article=lien.id_article ". + "AND lien.id_auteur=$connect_id_auteur AND articles.statut='prepa' ORDER BY articles.date DESC LIMIT 0,5"); + if (spip_num_rows($vos_articles) > 0) { + echo "<div> </div>"; + echo "<div class='bandeau_rubriques' style='z-index: 1;'>"; + bandeau_titre_boite2(_T('info_en_cours_validation'), "article-24.gif"); + echo "<div class='plan-articles'>"; + while($row = spip_fetch_array($vos_articles)) { + $id_article = $row['id_article']; + $titre = typo($row['titre']); + $statut = $row['statut']; + + echo "<a class='$statut' style='font-size: 10px;' href='articles.php3?id_article=$id_article'>$titre</a>"; + } + echo "</div>"; + echo "</div>"; + } + + $vos_articles = spip_query("SELECT articles.id_article, articles.titre, articles.statut FROM spip_articles AS articles WHERE articles.statut='prop' ". + " ORDER BY articles.date DESC LIMIT 0,5"); + if (spip_num_rows($vos_articles) > 0) { + echo "<div> </div>"; + echo "<div class='bandeau_rubriques' style='z-index: 1;'>"; + bandeau_titre_boite2(_T('info_articles_proposes'), "article-24.gif"); + echo "<div class='plan-articles'>"; + while($row = spip_fetch_array($vos_articles)) { + $id_article = $row['id_article']; + $titre = typo($row['titre']); + $statut = $row['statut']; + + echo "<a class='$statut' style='font-size: 10px;' href='articles.php3?id_article=$id_article'>$titre</a>"; + } + echo "</div>"; + echo "</div>"; + } + + $vos_articles = spip_query("SELECT * FROM spip_breves WHERE statut='prop' ". + " ORDER BY date_heure DESC LIMIT 0,5"); + if (spip_num_rows($vos_articles) > 0) { + echo "<div> </div>"; + echo "<div class='bandeau_rubriques' style='z-index: 1;'>"; + bandeau_titre_boite2(_T('info_breves_valider'), "breve-24.gif", "$couleur_foncee", "white"); + echo "<div class='plan-articles'>"; + while($row = spip_fetch_array($vos_articles)) { + $id_breve = $row['id_breve']; + $titre = typo($row['titre']); + $statut = $row['statut']; + + echo "<a class='$statut' style='font-size: 10px;' href='breves_voir.php3?id_breve=$id_breve'>$titre</a>"; + } + echo "</div>"; + echo "</div>"; + } + + + $query = "SELECT id_rubrique FROM spip_rubriques LIMIT 0,1"; + $result = spip_query($query); + + if (spip_num_rows($result) > 0) { + $id_rubrique = $GLOBALS['id_rubrique']; + if ($id_rubrique > 0) $dans_rub = "&id_rubrique=$id_rubrique"; + + echo "<table><tr>"; + + echo "<td>"; + icone_horizontale(_T('icone_ecrire_article'), "articles_edit.php3?new=oui$dans_rub", "article-24.gif","creer.gif"); + echo "</td>"; + echo "<td> </td>"; + echo "<td>"; + $activer_breves = lire_meta("activer_breves"); + if ($activer_breves != "non") { + icone_horizontale(_T('icone_nouvelle_breve'), "breves_edit.php3?new=oui$dans_rub", "breve-24.gif","creer.gif"); + } + echo "</td>"; + echo "</tr></table>"; } - echo "</font>"; - echo "</td>"; - if ($options == 'avancees') { - echo "<td> </td>"; - echo "<td>"; - global $id_rubrique; - if ($id_rubrique > 0) echo "<a href='brouteur.php3?id_rubrique=$id_rubrique' title='"._T('icone_brouteur')."'><img src='img_pack/naviguer-site.gif' alt='nav' width='26' height='20' border='0'></a> "; - else echo "<a href='brouteur.php3' title='"._T('icone_brouteur')."'><img src='img_pack/naviguer-site.gif' alt='nav' width='26' height='20' border='0'></a> "; - if ($activer_messagerie == "oui" AND $connect_activer_messagerie != "non") echo "<a href='calendrier.php3' title='"._T('icone_agenda')."'><img src='img_pack/cal-mois.gif' alt='jour' width='26' height='20' border='0'></a>"; + echo "</div>"; + + echo "<div id='bandeaurecherche' class='bandeau_couleur_sous' style='width: 100px; $spip_lang_left: 60px;'>"; + global $recherche; + $recherche_aff = _T('info_rechercher'); + $onfocus = "onfocus=this.value='';"; + echo "<form method='get' style='margin: 0px;' action='recherche.php3'>"; + echo '<input type="text" size="10" value="'.$recherche_aff.'" name="recherche" class="spip_recherche" accesskey="r" '.$onfocus.'>'; + echo "</form>"; + echo "</div>"; + + echo "<div id='bandeauagenda' class='bandeau_couleur_sous' style='width: 420px; $spip_lang_left: 100px;'>"; + echo _T('icone_agenda'); + + + debut_cadre_relief(); + + icone_horizontale("NOUVEAU RENDEZ-VOUS PERSONNEL","message_edit.php3?new=oui&type=pb", "pense-bete.gif", "rv.gif"); + icone_horizontale("NOUVEAU RENDEZ-VOUS","message_edit.php3?new=oui&type=normal", "message.gif", "rv.gif"); + if ($connect_statut == "0minirezo") { + icone_horizontale("NOUVEAU RENDEZ-VOUS GÉNÉRAL","message_edit.php3?new=oui&type=affich", "annonce.gif", "rv.gif"); + } + fin_cadre_relief(); + + + include_ecrire("inc_agenda.php3"); + + echo "<table style='border= 1px solid #cccccc; background-color: #dddddd; padding: 5px; margin-top: 5px;'><tr>"; + + echo "<td valign='top' width='200'>"; + echo "<div> </div>"; + echo "<div style='color: black;'>"; + afficher_taches(); + echo "</div>"; + + $today = getdate(time()); + $jour_today = $today["mday"]; + $mois_today = $today["mon"]; + $annee_today = $today["year"]; + $date = date("Y-m-d", mktime(0,0,0,$mois_today, 1, $annee_today)); + $mois = mois($date); + $annee = annee($date); + $jour = jour($date); + + // rendez-vous personnels dans le mois + $result_messages = spip_query("SELECT messages.id_message FROM spip_messages AS messages, spip_auteurs_messages AS lien ". + "WHERE ((lien.id_auteur='$connect_id_auteur' AND lien.id_message=messages.id_message) OR messages.type='affich') ". + "AND messages.rv='oui' AND messages.date_heure >='$annee-$mois-1' AND date_heure < DATE_ADD('$annee-$mois-1', INTERVAL 1 MONTH) ". + "AND messages.statut='publie' LIMIT 0,1"); + if (spip_num_rows($result_messages)) { + echo "<div>"; + agenda ($mois_today, $annee_today, $jour_today, $mois_today, $annee_today); + echo "</div>"; + } + echo "</td>"; + echo "<td valign='top' width='10'> "; + echo "</td>"; + echo "<td valign='top' width='200'>"; + echo "<div style='color: white;'>"; + // rendez-vous personnels dans le mois + calendrier_jour($jour_today,$mois_today,$annee_today, "col"); + echo "</div>"; + echo "</td>"; + echo "</tr></table>"; + + + echo "</div>"; + + echo "<div id='bandeaumessagerie' class='bandeau_couleur_sous' style='$spip_lang_left: 130px;'>"; + echo _T('icone_messagerie_personnelle'); + + debut_cadre_relief(); + + icone_horizontale(_T('lien_nouvea_pense_bete'),"message_edit.php3?new=oui&type=pb", "pense-bete.gif"); + icone_horizontale(_T('lien_nouveau_message'),"message_edit.php3?new=oui&type=normal", "message.gif"); + + if ($connect_statut == "0minirezo") { + icone_horizontale(_T('lien_nouvelle_annonce'),"message_edit.php3?new=oui&type=affich", "annonce.gif"); + } + + fin_cadre_relief(); + + echo "</div>"; + + echo "<div id='bandeausynchro' class='bandeau_couleur_sous' style='$spip_lang_left: 160px;'>"; + echo _T('icone_suivi_activite'); + echo "</div>"; + + echo "<div id='bandeauinfoperso' class='bandeau_couleur_sous' style='width: 200px; $spip_lang_left: 200px;'>"; + echo _T('icone_informations_personnelles'); + + // + // choix de la langue + // + if ($GLOBALS['all_langs']) { + echo "<div> </div>"; + echo menu_langues('var_lang_ecrire'); + } + + + echo "</div>"; + + + echo "<div id='bandeaudisplay' class='bandeau_couleur_sous' style='$spip_lang_right: 310px; text-align: $spip_lang_right;'>"; + echo $simple; + echo "</div>"; + + echo "<div id='bandeauecran' class='bandeau_couleur_sous' style='width: 200px; $spip_lang_right: 237px; text-align: $spip_lang_right;'>"; + echo $ecran; + echo "</div>"; + + echo "<div id='bandeauinterface' class='bandeau_couleur_sous' style='$spip_lang_right: 150px; text-align: $spip_lang_right;'>"; + echo _T('titre_changer_couleur_interface'); + echo "</div>"; + + + echo "<div class='bandeau_couleur_sous' id='bandeaudeconnecter' style='$spip_lang_right: 0px;'>"; + echo _T('icone_deconnecter').aide("deconnect"); + echo "</div>"; + + echo "</div>"; + echo "</td></tr></table>"; + + echo "</div>"; + echo "</div>"; + + // Ouverture de la partie "principale" de la page + // Petite verif pour ne pas fermer le formulaire de recherche pendant qu'on l'edite + echo "<center onMouseOver=\"if (findObj('bandeaurecherche').style.visibility == 'visible') { ouvrir_recherche = true; } else { ouvrir_recherche = false; } changestyle('bandeauvide', 'visibility', 'hidden'); if (ouvrir_recherche == true) { changestyle('bandeaurecherche','visibility','visible'); }\">"; + + if ($activer_messagerie != 'non' AND $connect_activer_messagerie != 'non') { - echo "</td><td> <font face='arial,helvetica,sans-serif' size=1><b>"; $result_messages = spip_query("SELECT * FROM spip_messages AS messages, spip_auteurs_messages AS lien WHERE lien.id_auteur=$connect_id_auteur AND vu='non' AND statut='publie' AND type='normal' AND lien.id_message=messages.id_message"); $total_messages = @spip_num_rows($result_messages); if ($total_messages == 1) { while($row = @spip_fetch_array($result_messages)) { $ze_message=$row['id_message']; - echo "<a href='message.php3?id_message=$ze_message'><font color='$couleur_claire'><b>"._T('info_nouveau_message')."</b></font></a>"; + echo "<div class='messages'><a href='message.php3?id_message=$ze_message'><font color='$couleur_foncee'>"._T('info_nouveau_message')."</font></a></div>"; } } - if ($total_messages > 1) echo "<a href='messagerie.php3'><font color='$couleur_claire'>"._T('info_nouveaux_messages', array('total_messages' => $total_messages))."</font></a>"; - echo "</b></font>"; + if ($total_messages > 1) echo "<div class='messages'><a href='messagerie.php3'><font color='$couleur_foncee'>"._T('info_nouveaux_messages', array('total_messages' => $total_messages))."</font></a></div>"; } - echo "</td>"; - } - // grand ecran - echo "<td style='text-align:center;'>"; - $lien = $clean_link; - if ($spip_ecran == "large") { - $lien->addVar('set_ecran', 'etroit'); - echo "<a href='". $lien->getUrl() ."'><img src='img_pack/set-ecran.gif' title='"._T('info_petit_ecran')."' alt='"._T('info_petit_ecran')."' width='23' height='19' border='0'></a>"; - } - else { - $lien->addVar('set_ecran', 'large'); - echo "<a href='". $lien->getUrl() ."'><img src='img_pack/set-ecran.gif' title='"._T('info_grand_ecran')."' alt='"._T('info_grand_ecran')."' width='23' height='19' border='0'></a>"; - } - echo "</td>"; + // Afficher les auteurs recemment connectes + + global $changer_config; + global $activer_messagerie; + global $activer_imessage; + global $connect_activer_messagerie; + global $connect_activer_imessage; + + if ($changer_config!="oui"){ + $activer_messagerie=lire_meta("activer_messagerie"); + $activer_imessage=lire_meta("activer_imessage"); + } + + if ($activer_imessage != "non" AND ($connect_activer_imessage != "non" OR $connect_statut == "0minirezo")) { + $query2 = "SELECT id_auteur, nom FROM spip_auteurs WHERE id_auteur!=$connect_id_auteur AND imessage!='non' AND en_ligne>DATE_SUB(NOW(),INTERVAL 15 MINUTE)"; + $result_auteurs = spip_query($query2); + $nb_connectes = spip_num_rows($result_auteurs); + } + + $flag_cadre = (($nb_connectes > 0) OR $rubrique == "messagerie"); + if ($flag_cadre) echo "<div class='messages' style='color: #666666;'>"; + + + if ($nb_connectes > 0) { + if ($nb_connectes > 0) { + echo "<b>"._T('info_en_ligne')."</b>"; + while ($row = spip_fetch_array($result_auteurs)) { + $id_auteur = $row["id_auteur"]; + $nom_auteur = typo($row["nom"]); + echo " ".bouton_imessage($id_auteur,$row)." <a href='auteurs_edit.php3?id_auteur=$id_auteur' style='color: #666666;'>$nom_auteur</a>"; + } + } + } + if ($flag_cadre) echo "</div>"; - // - // choix de la langue - // - if ($GLOBALS['all_langs']) { - echo "<td> </td>"; - echo "<td align='center'>"; - echo menu_langues('var_lang_ecrire'); - echo "</td>"; - } - // choix de la couleur - echo "<td style='text-align:center;'>"; - echo "<img src='img_pack/barre-couleurs.gif' alt=\"".entites_html(_T('titre_changer_couleur_interface'))."\" width='70' height='21' border='0' usemap='#map_couleur'>"; - echo "</td>"; - echo "</tr></table>"; - echo "</td></tr></table>"; - echo "<center>"; } function gros_titre($titre, $ze_logo=''){ global $couleur_foncee; - echo "<div>"; + echo "<div class='verdana2' style='font-size: 18px; color: $couleur_foncee; font-weight: bold;'>"; if (strlen($ze_logo) > 3) echo "<img src='img_pack/$ze_logo' alt='' border=0 align='middle'> "; - echo "<span style='border-bottom: 1px dashed $couleur_foncee;'><font size=5 face='Verdana,Arial,Sans,sans-serif' color='$couleur_foncee' ".$GLOBALS['dir_lang']."><b>"; echo typo($titre); - echo "</b></font></span></div>\n"; + echo "</div>\n"; } @@ -1664,12 +2364,10 @@ function fin_grand_cadre(){ // Cadre formulaires function debut_cadre_formulaire(){ - echo "\n<div style='width: 100%; border-top: 1px solid #aaaaaa; border-left: 1px solid #aaaaaa; border-right: 1px solid white; border-bottom: 1px solid white; margin: 0px; padding: 0px;'>"; - echo "\n<div class='verdana3' style='border: 1px dashed #666666; margin: 0px; padding: 10px; background-color:#e4e4e4;'>"; + echo "\n<div class='cadre-formulaire'>"; } function fin_cadre_formulaire(){ - echo "</div>"; echo "</div>\n"; } @@ -1710,57 +2408,6 @@ function debut_gauche($rubrique = "asuivre") { echo "<br><table width='$largeur_ecran' cellpadding=0 cellspacing=0 border=0> <tr><td width='$largeur' valign='top' class='serif' $rspan>\n"; - // Afficher les auteurs recemment connectes - - global $changer_config; - global $activer_messagerie; - global $activer_imessage; - global $connect_activer_messagerie; - global $connect_activer_imessage; - - if (!$flag_3_colonnes) { - if ($changer_config!="oui"){ - $activer_messagerie=lire_meta("activer_messagerie"); - $activer_imessage=lire_meta("activer_imessage"); - } - - if ($activer_messagerie!="non" AND $connect_activer_messagerie!="non"){ - if ($activer_imessage != "non" AND ($connect_activer_imessage != "non" OR $connect_statut == "0minirezo")) { - $query2 = "SELECT id_auteur, nom FROM spip_auteurs WHERE id_auteur!=$connect_id_auteur AND imessage!='non' AND messagerie!='non' AND en_ligne>DATE_SUB(NOW(),INTERVAL 5 MINUTE)"; - $result_auteurs = spip_query($query2); - $nb_connectes = spip_num_rows($result_auteurs); - } - - $flag_cadre = (($nb_connectes > 0) OR $rubrique == "messagerie"); - if ($flag_cadre) debut_cadre_relief("messagerie-24.gif"); - if ($rubrique == "messagerie") { - echo "<a href='message_edit.php3?new=oui&type=normal'><img src='img_pack/m_envoi$spip_lang_rtl.gif' alt='' width='14' height='7' border='0'>"; - echo "<font color='#169249' face='Verdana,Arial,Sans,sans-serif' size=1><b> "._T('lien_nouveau_message')."</b></font></a>"; - echo "\n<br><a href='message_edit.php3?new=oui&type=pb'><img src='img_pack/m_envoi_bleu$spip_lang_rtl.gif' alt='' width='14' height='7' border='0'>"; - echo "<font color='#044476' face='Verdana,Arial,Sans,sans-serif' size=1><b> "._T('lien_nouvea_pense_bete')."</b></font></a>"; - if ($connect_statut == "0minirezo") { - echo "\n<br><a href='message_edit.php3?new=oui&type=affich'><img src='img_pack/m_envoi_jaune$spip_lang_rtl.gif' alt='' width='14' height='7' border='0'>"; - echo "<font color='#ff9900' face='Verdana,Arial,Sans,sans-serif' size=1><b> "._T('lien_nouvelle_annonce')."</b></font></a>"; - } - } - - if ($nb_connectes > 0) { - echo "<div class='verdana2'>"; - if ($nb_connectes > 0) { - if ($options == "avancees" AND $rubrique == "messagerie") echo "<p>"; - echo "<b>"._T('info_en_ligne')."</b>"; - while ($row = spip_fetch_array($result_auteurs)) { - $id_auteur = $row["id_auteur"]; - $nom_auteur = typo($row["nom"]); - if ($options == "avancees") echo "<br>".bouton_imessage($id_auteur,$row)." $nom_auteur"; - else echo "<br> $nom_auteur"; - } - } - echo "</div>"; - } - if ($flag_cadre) fin_cadre_relief(); - } - } } @@ -1799,37 +2446,6 @@ function creer_colonne_droite($rubrique=""){ echo "<td width=$espacement rowspan=2> </td>"; echo "<td width=$largeur rowspan=2 align='$lang_left' valign='top'><p />"; - if ($changer_config!="oui") { - $activer_messagerie=lire_meta("activer_messagerie"); - $activer_imessage=lire_meta("activer_imessage"); - } - - if ($activer_messagerie!="non" AND $connect_activer_messagerie!="non") { - if ($activer_imessage != "non" AND ($connect_activer_imessage != "non" OR $connect_statut == "0minirezo")) { - $query2 = "SELECT id_auteur, nom FROM spip_auteurs WHERE id_auteur!=$connect_id_auteur AND imessage!='non' AND messagerie!='non' AND en_ligne>DATE_SUB(NOW(),INTERVAL 5 MINUTE)"; - $result_auteurs = spip_query($query2); - $nb_connectes = spip_num_rows($result_auteurs); - } - - $flag_cadre = ($nb_connectes > 0); - if ($flag_cadre) debut_cadre_relief("messagerie-24.gif"); - - if ($flag_cadre) { - echo "<font face='Verdana,Arial,Sans,sans-serif' size=2>"; - if ($nb_connectes > 0) { - if ($options == "avancees" AND $rubrique == "messagerie") echo "<p>"; - echo "<b>"._T('info_nombre_en_ligne')."</b>"; - while ($row = spip_fetch_array($result_auteurs)) { - $id_auteur = $row["id_auteur"]; - $nom_auteur = typo($row["nom"]); - if ($options == "avancees") echo "<br>".bouton_imessage($id_auteur,$row)." $nom_auteur"; - else echo "<br> $nom_auteur"; - } - } - echo "</font>"; - } - if ($flag_cadre) fin_cadre_relief(); - } } } diff --git a/ecrire/inc_sites.php3 b/ecrire/inc_sites.php3 index 75db4ac3eb..a529de1d20 100644 --- a/ecrire/inc_sites.php3 +++ b/ecrire/inc_sites.php3 @@ -276,7 +276,7 @@ function syndic_a_jour($now_id_syndic, $statut = 'off') { function afficher_sites($titre_table, $requete) { - global $couleur_claire; + global $couleur_claire, $couleur_foncee; global $connect_id_auteur; $activer_messagerie = lire_meta("activer_messagerie"); @@ -285,10 +285,11 @@ function afficher_sites($titre_table, $requete) { $tranches = afficher_tranches_requete($requete, 3); if ($tranches) { - debut_cadre_relief("site-24.gif"); - +// debut_cadre_relief("site-24.gif"); + if ($titre_table) echo "<div style='height: 12px;'></div>"; + echo "<div class='liste'>"; + bandeau_titre_boite2($titre_table, "site-24.gif", $couleur_claire, "black"); echo "<TABLE WIDTH=100% CELLPADDING=3 CELLSPACING=0 BORDER=0>"; - bandeau_titre_boite($titre_table, true); echo $tranches; @@ -300,9 +301,7 @@ function afficher_sites($titre_table, $requete) { $compteur_liste = 0; while ($row = spip_fetch_array($result)) { - $ifond = $ifond ^ 1; - $couleur = ($ifond) ? '#FFFFFF' : $couleur_claire; - + $vals = ''; $id_syndic=$row["id_syndic"]; $id_rubrique=$row["id_rubrique"]; $nom_site=typo($row["nom_site"]); @@ -316,9 +315,9 @@ function afficher_sites($titre_table, $requete) { $tous_id[] = $id_syndic; - echo "<tr bgcolor='$couleur'>"; + //echo "<tr bgcolor='$couleur'>"; - echo "<td class='arial2'>"; + //echo "<td class='arial2'>"; $link = new Link("sites.php3?id_syndic=$id_syndic"); $redirect = new Link; $link->addVar('redirect', $redirect->getUrl()); @@ -327,21 +326,21 @@ function afficher_sites($titre_table, $requete) { if (acces_restreint_rubrique($id_rubrique)) $puce = 'puce-verte-anim.gif'; else - $puce='puce-verte.gif'; + $puce='puce-verte-breve.gif'; $title = _T('info_site_reference'); break; case 'prop': if (acces_restreint_rubrique($id_rubrique)) - $puce = 'puce-blanche-anim.gif'; + $puce = 'puce-orange-anim.gif'; else - $puce='puce-blanche.gif'; + $puce='puce-orange-breve.gif'; $title = _T('info_site_attente'); break; case 'refuse': if (acces_restreint_rubrique($id_rubrique)) $puce = 'puce-poubelle-anim.gif'; else - $puce='puce-poubelle.gif'; + $puce='puce-poubelle-breve.gif'; $title = _T('info_site_refuse'); break; } @@ -350,37 +349,52 @@ function afficher_sites($titre_table, $requete) { $title = _T('info_panne_site_syndique'); } - echo "<a href=\"".$link->getUrl()."\" title=\"$title\">"; - echo "<img src='img_pack/$puce' width='7' height='7' border='0'> "; - if ($moderation == 'oui') - echo "<i>".typo($nom_site)."</i>"; + $s = "<a href=\"".$link->getUrl()."\" title=\"$title\">"; + $s .= "<img src='img_pack/$puce' width='7' height='7' border='0'> "; + + $s .= typo($nom_site); + /*if ($moderation == 'oui') + $s .= "<i>".typo($nom_site)."</i>"; else - echo typo($nom_site); - - echo "</a> <font size='1'>[<a href='$url_site'>"._T('lien_visite_site')."</a>]</font>"; - echo "</td>"; + $s .= typo($nom_site); + */ + $s .= "</a> <font size='1'>[<a href='$url_site'>"._T('lien_visite_site')."</a>]</font>"; + $vals[] = $s; + + //echo "</td>"; - echo "<td class='arial1' align='right'> "; + $s = ""; + //echo "<td class='arial1' align='right'> "; if ($syndication == "off") { - echo "<font color='red'>"._T('info_probleme_grave')." </font>"; + $s .= "<font color='red'>"._T('info_probleme_grave')." </font>"; } if ($syndication == "oui" or $syndication == "off"){ - echo "<font color='red'>"._T('info_syndication')."</font>"; + $s .= "<font color='red'>"._T('info_syndication')."</font>"; } - echo "</td>"; - echo "<td class='arial1'>"; + $vals[] = $s; + //echo "</td>"; + //echo "<td class='arial1'>"; + $s = ""; if ($syndication == "oui" OR $syndication == "off") { $result_art = spip_query("SELECT COUNT(*) FROM spip_syndic_articles WHERE id_syndic='$id_syndic'"); list($total_art) = spip_fetch_row($result_art); - echo " $total_art "._T('info_syndication_articles'); + $s .= " $total_art "._T('info_syndication_articles'); } else { - echo " "; + $s .= " "; } - echo "</td>"; - echo "</tr></n>"; + $vals[] = $s; + //echo "</td>"; + //echo "</tr></n>"; + $table[] = $vals; } + spip_free_result($result); + + $largeurs = array('','',''); + $styles = array('arial11', 'arial1', 'arial1'); + afficher_liste($largeurs, $table, $styles); echo "</TABLE>"; - fin_cadre_relief(); + //fin_cadre_relief(); + echo "</div>\n"; } return $tous_id; } diff --git a/ecrire/inc_version.php3 b/ecrire/inc_version.php3 index 1ff1a82eae..42427d6e23 100644 --- a/ecrire/inc_version.php3 +++ b/ecrire/inc_version.php3 @@ -176,7 +176,7 @@ if ($flag_ecrire) { $spip_version = 1.732; // version de spip -$spip_version_affichee = "1.7.2"; +$spip_version_affichee = "1.8 alpha 1 CVS"; // version de spip / tag cvs if (ereg('Name: v(.*) ','$Name$', $regs)) $spip_version_affichee = $regs[1]; diff --git a/ecrire/index.php3 b/ecrire/index.php3 index d4be2a1530..8cd1b24fc0 100644 --- a/ecrire/index.php3 +++ b/ecrire/index.php3 @@ -10,78 +10,18 @@ debut_gauche(); -function enfant($collection){ - global $les_enfants, $couleur_foncee, $lang_dir; - $query2 = "SELECT * FROM spip_rubriques WHERE id_parent=\"$collection\" ORDER BY titre"; - $result2 = spip_query($query2); - - while($row=spip_fetch_array($result2)){ - $id_rubrique=$row['id_rubrique']; - $id_parent=$row['id_parent']; - $titre=$row['titre']; - - $bouton_layer = bouton_block_invisible("enfants$id_rubrique"); - $les_sous_enfants = sous_enfant($id_rubrique); - - changer_typo($row['lang']); - $descriptif=propre($row['descriptif']); - - $les_enfants.= "<P>"; - if ($id_parent == "0") $les_enfants .= debut_cadre_relief("secteur-24.gif", true); - else $les_enfants .= debut_cadre_relief("rubrique-24.gif", true); - if (strlen($les_sous_enfants) > 0){ - $les_enfants .= $bouton_layer; - } - $les_enfants .= "<FONT FACE=\"Verdana,Arial,Sans,sans-serif\">"; - - if (acces_restreint_rubrique($id_rubrique)) - $les_enfants .= "<img src='img_pack/admin-12.gif' alt='' width='12' height='12' title='"._T('image_administrer_rubrique')."'> "; - - $les_enfants.= "<span dir='$lang_dir'><B><A HREF='naviguer.php3?coll=$id_rubrique'><font color='$couleur_foncee'>".typo($titre)."</font></A></B></span>"; - if (strlen($descriptif)>1) { - $les_enfants .= "<br><FONT SIZE=1><span dir='$lang_dir'>$descriptif</span></FONT>"; - } - - $les_enfants.= "</FONT>"; - - $les_enfants .= $les_sous_enfants; - $les_enfants .= fin_cadre_relief(true); - } -} - -function sous_enfant($collection2){ - global $lang_dir, $spip_lang_dir; - $query3 = "SELECT * FROM spip_rubriques WHERE id_parent=\"$collection2\" ORDER BY titre"; - $result3 = spip_query($query3); - - if (spip_num_rows($result3) > 0){ - $retour = debut_block_invisible("enfants$collection2")."\n<ul style='list-style-image: url(img_pack/rubrique-12.gif)'>\n<FONT SIZE=1 face='arial,helvetica,sans-serif'>"; - while($row=spip_fetch_array($result3)){ - $id_rubrique2=$row['id_rubrique']; - $id_parent2=$row['id_parent']; - $titre2=$row['titre']; - changer_typo($row['lang']); - - $retour.="<LI><A HREF='naviguer.php3?coll=$id_rubrique2'><span dir='$lang_dir'>".typo($titre2)."</span></A>\n"; - } - $retour .= "</FONT></ul>\n\n".fin_block()."\n\n"; - } - - return $retour; -} - - // // Infos personnelles : nom, utilisation de la messagerie // echo "<p>"; -debut_cadre_relief("fiche-perso-24.gif"); +if ($bonjour == "oui" OR $spip_ecran == "large") $titre_cadre = bouton_block_visible("info_perso"); +else $titre_cadre = bouton_block_invisible("info_perso"); +$titre_cadre .= majuscules(typo($connect_nom)); + +debut_cadre_relief("fiche-perso-24.gif", false, '', $titre_cadre); echo "<font face='Verdana,Arial,Sans,sans-serif' size='2'>"; -if ($bonjour == "oui" OR $spip_ecran == "large") echo bouton_block_visible("info_perso"); -else echo bouton_block_invisible("info_perso"); -echo "<font size='1' color='black'><b>".majuscules(typo($connect_nom))."</b></font>"; if ($bonjour == "oui" OR $spip_ecran == "large") echo debut_block_visible("info_perso"); else echo debut_block_invisible("info_perso"); @@ -113,7 +53,7 @@ fin_cadre_relief(); // Annonces // include_ecrire("inc_agenda.php3"); -afficher_taches(); +afficher_annonces(); // @@ -349,8 +289,8 @@ if (!$relief AND lire_meta('activer_syndic') != 'non' AND $connect_statut == '0m if ($relief) { echo "<p>"; - debut_cadre_enfonce(); - echo "<font color='$couleur_foncee' face='arial,helvetica,sans-serif'><b>"._T('texte_en_cours_validation')."</b></font><p>"; + debut_cadre_couleur(); + echo "<div class='verdana2' style='color: black;'><b>"._T('texte_en_cours_validation')."</b></div><p>"; // // Les articles a valider @@ -401,30 +341,11 @@ if ($relief) { } } - fin_cadre_enfonce(); + fin_cadre_couleur(); } if ($options == 'avancees') { - enfant(0); - - $les_enfants2=substr($les_enfants,round(strlen($les_enfants)/2),strlen($les_enfants)); - if (strpos($les_enfants2,"<P>")){ - $les_enfants2=substr($les_enfants2,strpos($les_enfants2,"<P>"),strlen($les_enfants2)); - $les_enfants1=substr($les_enfants,0,strlen($les_enfants)-strlen($les_enfants2)); - }else{ - $les_enfants1=$les_enfants; - $les_enfants2=""; - } - - // Afficher les sous-rubriques - echo "<p><table cellpadding=0 cellspacing=0 border=0 width='100%'>"; - echo "<tr><td valign='top' width=50%>$les_enfants1</td>"; - echo "<td width=20><img src='img_pack/rien.gif' width=20></td>"; - echo "<td valign='top' width=50%>$les_enfants2 "; - if (strlen($les_enfants2) > 0) echo "<p>"; - echo "</td></tr>"; - echo "</table>"; // // Vos articles publies diff --git a/ecrire/lang/spip_fr.php3 b/ecrire/lang/spip_fr.php3 index b9dece151e..2c17132252 100644 --- a/ecrire/lang/spip_fr.php3 +++ b/ecrire/lang/spip_fr.php3 @@ -443,7 +443,7 @@ Merci de votre participation 'icone_breves' => 'Brèves', 'icone_brouteur' => 'Navigation rapide', 'icone_calendrier' => 'Calendrier', -'icone_configuration_site' => 'Configuration du site', +'icone_configuration_site' => 'Configuration', 'icone_configurer_site' => 'Configurer votre site', 'icone_creation_groupe_mots' => 'Créer un nouveau groupe de mots', 'icone_creation_mots_cles' => 'Créer un nouveau mot-clé', @@ -491,7 +491,7 @@ Merci de votre participation 'icone_site_entier' => 'Tout le site', 'icone_sites_references' => 'Sites référencés', 'icone_statistiques' => 'Statistiques du site', -'icone_statistiques_visites' => 'Statistiques des visites', +'icone_statistiques_visites' => 'Statistiques', 'icone_suivi_activite' => 'Suivre la vie du site', 'icone_suivi_actualite' => 'Évolution du site', 'icone_suivi_forum' => 'Suivi du forum public : @nb_forums@ contribution(s)', @@ -814,7 +814,6 @@ exige d\'avoir un accès FTP au site Web.', 'info_nom_utilisateurs_connectes' => 'Votre nom apparaît dans la liste des utilisateurs connectés.', 'info_nombre_articles' => '@nb_articles@ articles,', 'info_nombre_breves' => '@nb_breves@ brèves,', -'info_nombre_en_ligne' => 'Actuellement en ligne :', 'info_nombre_partcipants' => 'PARTICIPANTS A LA DISCUSSION :', 'info_nombre_rubriques' => '@nb_rubriques@ rubriques,', 'info_nombre_sites' => '@nb_sites@ sites,', diff --git a/ecrire/message.php3 b/ecrire/message.php3 index d9e86a799e..c87cc5c5c1 100644 --- a/ecrire/message.php3 +++ b/ecrire/message.php3 @@ -83,15 +83,36 @@ if ($changer_rv) { } if ($jour) { - if (($heures_fin * 60) + $minutes_fin < ($heures_debut * 60) + $minutes_debut) { - $minutes_fin = $minutes_debut; - $heures_fin = $heures_debut + 1; - } - if ($heures_fin >=24){ - $heures_fin = 23; - $minutes_fin = 59; - } - spip_query("UPDATE spip_messages SET date_heure='$annee-$mois-$jour $heures:$minutes:00', date_fin='$annee-$mois-$jour $heures_fin:$minutes_fin:00' WHERE id_message='$id_message'"); + // Convertir dates a calendrier correct (exemple: 31 fevrier devient debut mars, 24h12 devient 00h12 du lendemain) + $date = date("Y-m-d H:i:s", mktime($heures,$minutes,0,$mois, $jour, $annee)); + + $jour = journum($date); + $mois = mois($date); + $annee = annee($date); + $heures = heures($date); + $minutes = minutes($date); + + // Verifier que la date de fin est bien posterieure au debut + $unix_debut = date("U", mktime($heures,$minutes,0,$mois, $jour, $annee)); + $unix_fin = date("U", mktime($heures_fin,$minutes_fin,0,$mois_fin, $jour_fin, $annee_fin)); + if ($unix_fin <= $unix_debut) { + $jour_fin = $jour; + $mois_fin = $mois; + $annee_fin = $annee; + $heures_fin = $heures + 1; + $minutes_fin = $minutes; + } + + $date_fin = date("Y-m-d H:i:s", mktime($heures_fin,$minutes_fin,0,$mois_fin, $jour_fin, $annee_fin)); + + $jour_fin = journum($date_fin); + $mois_fin = mois($date_fin); + $annee_fin = annee($date_fin); + $heures_fin = heures($date_fin); + $minutes_fin = minutes($date_fin); + + + spip_query("UPDATE spip_messages SET date_heure='$annee-$mois-$jour $heures:$minutes:00', date_fin='$annee_fin-$mois_fin-$jour_fin $heures_fin:$minutes_fin:00' WHERE id_message='$id_message'"); } if ($change_statut) { @@ -419,7 +440,16 @@ while($row = spip_fetch_array($result_message)) { // if ($rv == "oui") { - echo "<p><center class='verdana2'>"._T('titre_rendez_vous')." ".majuscules(nom_jour($date_heure))." <b>".majuscules(affdate($date_heure))."</b><br><b>".heures($date_heure)." "._T('date_mot_heures')." ".minutes($date_heure)."</b> <img src='puce$spip_lang_rtl.gif' border='0'> ".heures($date_fin)." "._T('date_mot_heures')." ".minutes($date_fin)."</center>"; + + if (jour($date_heure) == jour($date_fin) AND mois($date_heure) == mois($date_fin) AND annee($date_heure) == annee($date_fin)) { + echo "<p><center class='verdana2'>"._T('titre_rendez_vous')." ".majuscules(nom_jour($date_heure))." <b>".majuscules(affdate($date_heure))."</b><br><b>".heures($date_heure)." "._T('date_mot_heures')." ".minutes($date_heure)."</b>"; + echo " <img src='puce$spip_lang_rtl.gif' border='0'> ".heures($date_fin)." "._T('date_mot_heures')." ".minutes($date_fin)."</center>"; + } else { + echo "<p><center class='verdana2'>"._T('titre_rendez_vous')."<br> ".majuscules(nom_jour($date_heure))." <b>".majuscules(affdate($date_heure))."</b>, <b>".heures($date_heure)." "._T('date_mot_heures')." ".minutes($date_heure)."</b>"; + echo "<center class='verdana2'><img src='puce$spip_lang_rtl.gif' border='0'> ".majuscules(nom_jour($date_fin))." ".majuscules(affdate($date_fin)).", <b>".heures($date_fin)." "._T('date_mot_heures')." ".minutes($date_fin)."</b>"; + //echo " <img src='puce$spip_lang_rtl.gif' border='0'> ".heures($date_fin)." "._T('date_mot_heures')." ".minutes($date_fin)."</center>"; + + } } diff --git a/ecrire/message_edit.php3 b/ecrire/message_edit.php3 index 24edf85167..3fbefd4f87 100644 --- a/ecrire/message_edit.php3 +++ b/ecrire/message_edit.php3 @@ -62,7 +62,7 @@ if ($new == "oui") { $id_message = spip_insert_id(); if ($rv) { - spip_query("UPDATE spip_messages SET rv='oui', date_heure='$rv 12:00:00' WHERE id_message = $id_message"); + spip_query("UPDATE spip_messages SET rv='oui', date_heure='$rv 12:00:00', date_fin: '$rv 13:00:00' WHERE id_message = $id_message"); } if ($type != "affich"){ @@ -91,11 +91,21 @@ if ($row = spip_fetch_array($result)) { $expediteur = $row["id_auteur"]; if (!($expediteur == $connect_id_auteur OR ($type == 'affich' AND $connect_statut == '0minirezo'))) die(); + echo "<div class='arial2'>"; echo "<FORM ACTION='message.php3?id_message=$id_message' METHOD='post'>"; - if ($type == 'normal') $le_type = _T('bouton_envoi_message_02'); - if ($type == 'pb') $le_type = _T('bouton_pense_bete'); - if ($type == 'affich') $le_type = _T('bouton_annonce'); + if ($type == 'normal') { + $le_type = _T('bouton_envoi_message_02'); + $logo = "message"; + } + if ($type == 'pb') { + $le_type = _T('bouton_pense_bete'); + $logo = "pense-bete"; + } + if ($type == 'affich') { + $le_type = _T('bouton_annonce'); + $logo = "annonce"; + } echo "<font face='Verdana,Arial,Sans,sans-serif' size=2 color='green'><b>$le_type</b></font><p>"; @@ -118,23 +128,79 @@ if ($row = spip_fetch_array($result)) { // Fixer rendez-vous? // - debut_boite_info(); - echo "<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=3 WIDTH=100% BACKGROUND=''><TR><TD BGCOLOR='$couleur_foncee' colspan=2>"; - echo "<span class='serif2' color='#FFFFFF'><B>"._T('titre_rendez_vous')."</B></span>"; - echo "</td></tr></table>"; + + echo "<p />"; + + if ($rv == "oui") $fonction = "rv.gif"; + else $fonction = ""; + + debut_cadre_trait_couleur("$logo.gif", false, $fonction, _T('titre_rendez_vous')); echo "<input type='hidden' name='id_message' value='$id_message'>"; echo "<input type='hidden' name='changer_rv' value='$id_message'>"; if ($rv != "oui") { - echo "<INPUT TYPE='radio' NAME='rv' VALUE='oui' id='rv_on'>"; + echo "<INPUT TYPE='radio' NAME='rv' VALUE='oui' id='rv_on' onClick=\"changeVisible(this.checked, 'heure-rv', 'block', 'none');\">"; echo " <label for='rv_on'>"._T('item_afficher_calendrier')."</label> "; - echo " <br><INPUT TYPE='radio' NAME='rv' VALUE='non' CHECKED id='rv_off'>"; + + + echo "<div id='heure-rv' style='display: block; padding-top: 4px; padding-left: 24px;'>"; + echo "<SELECT NAME='jour' SIZE=1 CLASS='fondl'>"; + afficher_jour(jour($date_heure)); + echo "</SELECT> "; + echo "<SELECT NAME='mois' SIZE=1 CLASS='fondl'>"; + afficher_mois(mois($date_heure)); + echo "</SELECT> "; + echo "<SELECT NAME='annee' SIZE=1 CLASS='fondl'>"; + afficher_annee(annee($date_heure)); + echo "</SELECT>\n"; + + $heures_debut = heures($date_heure); + $minutes_debut = minutes($date_heure); + echo " <INPUT TYPE='text' CLASS='fondl' NAME='heures' VALUE=\"".$heures_debut."\" SIZE='3'> ".majuscules(_T('date_mot_heures'))." "; + echo "<INPUT TYPE='text' CLASS='fondl' NAME='minutes' VALUE=\"$minutes_debut\" SIZE='3'> "; + + + $heures_fin = heures($date_fin); + $minutes_fin = minutes($date_fin); + + if ($date_fin == "0000-00-00 00:00:00") { + $date_fin = $date_heure; + $heures_fin = $heures_debut + 1; + } + + if ($heures_fin >=24){ + $heures_fin = 23; + $minutes_fin = 59; + } + + + + echo " <br> <img src='puce$spip_lang_rtl.gif' border='0'> "; + + echo "<SELECT NAME='jour_fin' SIZE=1 CLASS='fondl'>"; + afficher_jour(jour($date_fin)); + echo "</SELECT> "; + echo "<SELECT NAME='mois_fin' SIZE=1 CLASS='fondl'>"; + afficher_mois(mois($date_fin)); + echo "</SELECT> "; + echo "<SELECT NAME='annee_fin' SIZE=1 CLASS='fondl'>"; + afficher_annee(annee($date_fin)); + echo "</SELECT>\n"; + + echo " <INPUT TYPE='text' CLASS='fondl' NAME='heures_fin' VALUE=\"".$heures_fin."\" SIZE='3'> ".majuscules(_T('date_mot_heures'))." "; + echo "<INPUT TYPE='text' CLASS='fondl' NAME='minutes_fin' VALUE=\"".$minutes_fin."\" SIZE='3'> "; + + echo "</div>"; + + + echo " <br><INPUT TYPE='radio' NAME='rv' VALUE='non' CHECKED id='rv_off' onClick=\"changeVisible(this.checked, 'heure-rv', 'none', 'block');\">"; echo " <B><label for='rv_off'>"._T('item_non_afficher_calendrier')."</label></B> "; } else { - echo "<INPUT TYPE='radio' NAME='rv' VALUE='oui' CHECKED id='rv_on'>"; + echo "<INPUT TYPE='radio' NAME='rv' VALUE='oui' CHECKED id='rv_on' onClick=\"changeVisible(this.checked, 'heure-rv', 'block', 'none');\">"; echo " <b><label for='rv_on'>"._T('item_afficher_calendrier')."</label></b> "; - echo "<div style='text-align: center; padding: 4px;'><SELECT NAME='jour' SIZE=1 CLASS='fondl'>"; + echo "<div id='heure-rv' style='display: block; padding-top: 4px; padding-left: 24px;'>"; + echo "<SELECT NAME='jour' SIZE=1 CLASS='fondl'>"; afficher_jour(jour($date_heure)); echo "</SELECT> "; echo "<SELECT NAME='mois' SIZE=1 CLASS='fondl'>"; @@ -146,31 +212,39 @@ if ($row = spip_fetch_array($result)) { $heures_debut = heures($date_heure); $minutes_debut = minutes($date_heure); - echo "<br><INPUT TYPE='text' CLASS='fondl' NAME='heures' VALUE=\"".$heures_debut."\" SIZE='3'> ".majuscules(_T('date_mot_heures'))." "; + echo " <INPUT TYPE='text' CLASS='fondl' NAME='heures' VALUE=\"".$heures_debut."\" SIZE='3'> ".majuscules(_T('date_mot_heures'))." "; echo "<INPUT TYPE='text' CLASS='fondl' NAME='minutes' VALUE=\"$minutes_debut\" SIZE='3'> "; $heures_fin = heures($date_fin); $minutes_fin = minutes($date_fin); - if (($heures_fin * 60) + $minutes_fin < ($heures_debut * 60) + $minutes_debut) { - $minutes_fin = $minutes_debut; - $heures_fin = $heures_debut + 1; - } if ($heures_fin >=24){ $heures_fin = 23; $minutes_fin = 59; } - echo " <img src='puce$spip_lang_rtl.gif' border='0'> <INPUT TYPE='text' CLASS='fondl' NAME='heures_fin' VALUE=\"".$heures_fin."\" SIZE='3'> ".majuscules(_T('date_mot_heures'))." "; + echo " <br> <img src='puce$spip_lang_rtl.gif' border='0'> "; + + echo "<SELECT NAME='jour_fin' SIZE=1 CLASS='fondl'>"; + afficher_jour(jour($date_fin)); + echo "</SELECT> "; + echo "<SELECT NAME='mois_fin' SIZE=1 CLASS='fondl'>"; + afficher_mois(mois($date_fin)); + echo "</SELECT> "; + echo "<SELECT NAME='annee_fin' SIZE=1 CLASS='fondl'>"; + afficher_annee(annee($date_fin)); + echo "</SELECT>\n"; + + echo " <INPUT TYPE='text' CLASS='fondl' NAME='heures_fin' VALUE=\"".$heures_fin."\" SIZE='3'> ".majuscules(_T('date_mot_heures'))." "; echo "<INPUT TYPE='text' CLASS='fondl' NAME='minutes_fin' VALUE=\"".$minutes_fin."\" SIZE='3'> "; echo "</div>"; - echo " <p><INPUT TYPE='radio' NAME='rv' VALUE='non' id='rv_off'>"; + echo " <p><INPUT TYPE='radio' NAME='rv' VALUE='non' id='rv_off' onClick=\"changeVisible(this.checked, 'heure-rv', 'none', 'block');\">"; echo " <label for='rv_off'>"._T('item_non_afficher_calendrier')."</label> "; } - fin_boite_info(); + fin_cadre_trait_couleur(); echo "<p><B>"._T('info_texte_message_02')."</B><BR>"; echo "<TEXTAREA NAME='texte' ROWS='20' CLASS='formo' COLS='40' wrap=soft>"; @@ -179,6 +253,7 @@ if ($row = spip_fetch_array($result)) { echo "<P ALIGN='right'><INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS='fondo'>"; echo "</FORM>"; + echo "</div>"; } fin_page(); diff --git a/ecrire/messagerie.php3 b/ecrire/messagerie.php3 index f147936b5a..f437bcd555 100644 --- a/ecrire/messagerie.php3 +++ b/ecrire/messagerie.php3 @@ -65,133 +65,6 @@ afficher_ical($connect_id_auteur); debut_droite("messagerie"); -function afficher_messages($titre_table, $query_message, $afficher_auteurs = true, $important = false, $boite_importante = true, $obligatoire = false) { - global $messages_vus; - global $connect_id_auteur; - global $couleur_claire; - global $spip_lang_rtl; - - // Interdire l'affichage de message en double - if ($messages_vus) { - $query_message .= ' AND messages.id_message NOT IN ('.join(',', $messages_vus).')'; - } - - - if ($afficher_auteurs) $cols = 3; - else $cols = 2; - $query_message .= ' ORDER BY date_heure DESC'; - $tranches = afficher_tranches_requete($query_message, $cols); - - if ($tranches OR $obligatoire) { - if ($important) debut_cadre_relief(); - - echo "<div> </div>"; - echo "<TABLE WIDTH=100% CELLPADDING=0 CELLSPACING=0 BORDER=0><TR><TD WIDTH=100% BACKGROUND=''>"; - echo "<TABLE WIDTH=100% CELLPADDING=3 CELLSPACING=0 BORDER=0>"; - - bandeau_titre_boite($titre_table, $afficher_auteurs, $boite_importante); - - echo $tranches; - - $result_message = spip_query($query_message); - $num_rows = spip_num_rows($result_message); - - while($row = spip_fetch_array($result_message)) { - $vals = ''; - - $id_message = $row['id_message']; - $date = $row["date_heure"]; - $titre = $row["titre"]; - $type = $row["type"]; - $statut = $row["statut"]; - $page = $row["page"]; - $rv = $row["rv"]; - $vu = $row["vu"]; - $messages_vus[$id_message] = $id_message; - - // - // Titre - // - - $s = "<A HREF='message.php3?id_message=$id_message'>"; - - switch ($type) { - case 'pb' : - $puce = "m_envoi_bleu$spip_lang_rtl.gif"; - break; - case 'memo' : - $puce = "m_envoi_jaune$spip_lang_rtl.gif"; - break; - case 'affich' : - $puce = "m_envoi_jaune$spip_lang_rtl.gif"; - break; - case 'normal': - default: - $puce = "m_envoi$spip_lang_rtl.gif"; - break; - } - - $s .= "<img src='img_pack/$puce' width='14' height='7' border='0'>"; - $s .= " ".typo($titre)."</A>"; - $vals[] = $s; - - // - // Auteurs - - if ($afficher_auteurs) { - $query_auteurs = "SELECT auteurs.nom FROM spip_auteurs AS auteurs, spip_auteurs_messages AS lien WHERE lien.id_message=$id_message AND lien.id_auteur!=$connect_id_auteur AND lien.id_auteur=auteurs.id_auteur"; - $result_auteurs = spip_query($query_auteurs); - $auteurs = ''; - while ($row_auteurs = spip_fetch_array($result_auteurs)) { - $auteurs[] = typo($row_auteurs['nom']); - } - - if ($auteurs AND $type == 'normal') { - $s = "<FONT FACE='Arial,Sans,sans-serif' SIZE=1>"; - $s .= join(', ', $auteurs); - $s .= "</FONT>"; - } - else $s = " "; - $vals[] = $s; - } - - // - // Date - // - - $s = affdate($date); - if ($rv == 'oui') { - $jour=journum($date); - $mois=mois($date); - $annee=annee($date); - - $s = "<a href='calendrier_jour.php3?jour=$jour&mois=$mois&annee=$annee'>$s</a>"; - } else { - $s = "<font color='#999999'>$s</font>"; - } - - $vals[] = $s; - - $table[] = $vals; - } - - if ($afficher_auteurs) { - $largeurs = array('', 130, 90); - $styles = array('arial2', 'arial1', 'arial1'); - } - else { - $largeurs = array('', 90); - $styles = array('arial2', 'arial1'); - } - afficher_liste($largeurs, $table, $styles); - - echo "</TABLE></TD></TR></TABLE>"; - spip_free_result($result_message); - if ($important) fin_cadre_relief(); - } -} - - $messages_vus = ''; @@ -219,12 +92,17 @@ afficher_messages(_T('info_message_en_redaction'), $query_message, true, false, $query = "SELECT auteurs.id_auteur, auteurs.nom, COUNT(*) AS total FROM spip_auteurs AS auteurs, spip_auteurs_messages AS lien2, spip_messages AS messages, spip_auteurs_messages AS lien ". "WHERE (lien.id_auteur = $connect_id_auteur AND lien.id_message = messages.id_message) ". - "AND (lien2.id_auteur = lien2.id_auteur AND lien2.id_message = messages.id_message AND lien2.id_auteur != $connect_id_auteur AND auteurs.id_auteur = lien2.id_auteur) GROUP BY auteurs.id_auteur ORDER BY total DESC LIMIT 0,20"; + "AND (lien2.id_auteur = lien2.id_auteur AND lien2.id_message = messages.id_message AND lien2.id_auteur != $connect_id_auteur AND auteurs.id_auteur = lien2.id_auteur) GROUP BY auteurs.id_auteur ORDER BY total DESC LIMIT 0,10"; $result = spip_query($query); if (spip_num_rows($result) > 0) { - echo "<div> </div>"; - echo "<div style='padding: 3px; background-color: $couleur_foncee; color: white;'><b class='verdana2'>"._T('info_principaux_correspondants')."</b></div>"; + + echo "<div style='height: 12px;'></div>"; + echo "<div class='liste'>"; + + bandeau_titre_boite2(_T('info_principaux_correspondants'), "redacteurs-24.gif", "#333333", "white"); + + //echo "<div style='padding: 3px; background-color: $couleur_foncee; color: white;'><b class='verdana2'>"._T('info_principaux_correspondants')."</b></div>"; echo "<table width='100%' cellpadding='0' cellspacing='0'>"; echo "<tr><td valign='top' width='50%'>"; while($row = spip_fetch_array($result)) { @@ -239,10 +117,11 @@ if (spip_num_rows($result) > 0) { $id_auteur = $row['id_auteur']; $nom = typo($row["nom"]); $total = $row["total"]; - echo "<div class='arial1' style=' padding: 2px; padding-left: 10px; background-color: $bgcolor;'>".bouton_imessage($id_auteur, $row)." $nom ($total)</div>"; - if ($count == 10) echo "</td><td valign='top' width='50%'>"; + echo "<div class='tr_liste' onMouseOver=\"changeclass(this,'tr_liste_over');\" onMouseOut=\"changeclass(this,'tr_liste');\" style=' padding: 2px; padding-left: 10px; border-bottom: 1px solid #cccccc;'><div class='verdana1'>".bouton_imessage($id_auteur, $row)." <a href='auteurs_edit.php3?id_auteur=$id_auteur'>$nom</a> ($total)</div></div>"; + if ($count == ceil(spip_num_rows($result)/2)) echo "</td><td valign='top' width='50%' style='background-color: #eeeeee;'>"; } echo "</td></tr></table>"; + echo "</div>"; } diff --git a/ecrire/mots_edit.php3 b/ecrire/mots_edit.php3 index dc90d41f91..3ac7ff168f 100644 --- a/ecrire/mots_edit.php3 +++ b/ecrire/mots_edit.php3 @@ -185,7 +185,7 @@ if ($id_mot) { afficher_articles(_T('info_articles_lies_mot'), ", spip_mots_articles AS lien WHERE lien.id_mot='$id_mot' - AND lien.id_article=articles.id_article AND articles.statut IN ($aff_articles) ORDER BY articles.date DESC"); + AND lien.id_article=articles.id_article AND articles.statut IN ($aff_articles) ORDER BY articles.date DESC", true); afficher_breves(_T('info_breves_liees_mot'), "SELECT breves.* FROM spip_breves AS breves, spip_mots_breves AS lien WHERE lien.id_mot='$id_mot' diff --git a/ecrire/mots_tous.php3 b/ecrire/mots_tous.php3 index 04ea61e967..86a6eac90b 100644 --- a/ecrire/mots_tous.php3 +++ b/ecrire/mots_tous.php3 @@ -190,15 +190,9 @@ while ($row_groupes = spip_fetch_array($result_groupes)) { $acces_forum = $row_groupes['6forum']; // Afficher le titre du groupe - debut_cadre_enfonce("groupe-mot-24.gif"); - echo "<p><table border=0 cellspacing=0 cellpadding=3 width=\"100%\">"; - echo "<tr><td bgcolor='$couleur_foncee' colspan=2><font face='Verdana,Arial,Sans,sans-serif' size=3 color='#ffffff'><b>$titre_groupe</b>"; - echo "</font></td>"; - echo "<td bgcolor='$couleur_foncee' align='right'><font face='Verdana,Arial,Sans,sans-serif' size=1>"; - echo "</font></td></tr>"; - + debut_cadre_enfonce("groupe-mot-24.gif", false, '', $titre_groupe); // Affichage des options du groupe (types d'éléments, permissions...) - echo "<tr><td colspan=3><font face='Verdana,Arial,Sans,sans-serif' size=1>"; + echo "<font face='Verdana,Arial,Sans,sans-serif' size=1>"; if ($articles == "oui") echo "> "._T('info_articles_2')." "; if ($breves == "oui") echo "> "._T('info_breves_02')." "; if ($rubriques == "oui") echo "> "._T('info_rubriques')." "; @@ -213,18 +207,23 @@ while ($row_groupes = spip_fetch_array($result_groupes)) { if ($acces_comite == "oui") echo "> "._T('info_redacteurs')." "; if ($acces_forum == "oui") echo "> "._T('info_visiteurs_02')." "; - echo "</font></td></tr></table>"; + echo "</font>"; // // Afficher les mots-cles du groupe // $query = "SELECT * FROM spip_mots WHERE id_groupe = '$id_groupe' ORDER BY titre"; $result = spip_query($query); - + $table = ''; + if (spip_num_rows($result) > 0) { - debut_cadre_relief("mot-cle-24.gif"); +// debut_cadre_relief("mot-cle-24.gif"); + echo "<div class='liste'>"; echo "<table border=0 cellspacing=0 cellpadding=3 width=\"100%\">"; while ($row = spip_fetch_array($result)) { + + $vals = ''; + $id_mot = $row['id_mot']; $titre_mot = $row['titre']; $type_mot = $row['type']; @@ -239,20 +238,12 @@ while ($row_groupes = spip_fetch_array($result_groupes)) { $couleur = $ifond ? "#FFFFFF" : $couleur_claire; $ifond = $ifond ^ 1; - echo "<TR BGCOLOR='$couleur'>"; - echo "<TD>"; if ($connect_statut == "0minirezo" OR $nb_articles[$id_mot] > 0) - echo "<A HREF='mots_edit.php3?id_mot=$id_mot&redirect=mots_tous.php3'><img src='img_pack/petite-cle.gif' alt='' width='23' height='12' border='0'></A>"; + $s = "<a href='mots_edit.php3?id_mot=$id_mot&redirect=mots_tous.php3' class='liste-mot'>".typo($titre_mot)."</a>"; else - echo "<img src='img_pack/petite-cle.gif' alt='' width='23' height='12' border='0'>"; - echo "</TD>"; - echo "<TD class='serif2'>"; - if ($connect_statut == "0minirezo" OR $nb_articles[$id_mot] > 0) - echo "<A HREF='mots_edit.php3?id_mot=$id_mot&redirect=mots_tous.php3'>".typo($titre_mot)."</A>"; - else - echo typo($titre_mot); - echo "</TD>"; - echo "<TD ALIGN='right' class='verdana2'>"; + $s = typo($titre_mot); + + $vals[] = $s; $texte_lie = array(); @@ -276,22 +267,34 @@ while ($row_groupes = spip_fetch_array($result_groupes)) { else if ($nb_rubriques[$id_mot] > 1) $texte_lie[] = $nb_rubriques[$id_mot]." "._T('info_rubriques_02'); - echo $texte_lie = join($texte_lie,", "); + $texte_lie = join($texte_lie,", "); + + $vals[] = $texte_lie; + if ($connect_statut=="0minirezo") { - echo " "; - echo "<FONT SIZE=1>[<A HREF='mots_tous.php3?conf_mot=$id_mot'>"._T('info_supprimer_mot')."</A>]</FONT>"; - } else - echo " "; + $vals[] = "<a href='mots_tous.php3?conf_mot=$id_mot'>"._T('info_supprimer_mot')." <img src='img_pack/croix-rouge.gif' alt='X' width='7' height='7' border='0' align='middle'></a>"; + } + + $table[] = $vals; - echo "</TD>"; - echo "</TR>\n"; + } + + } + if ($connect_statut=="0minirezo") { + $largeurs = array('', 100, 100); + $styles = array('arial11', 'arial1', 'arial1'); } + else { + $largeurs = array('', 100); + $styles = array('arial11', 'arial1'); + } + afficher_liste($largeurs, $table, $styles); echo "</table>"; - fin_cadre_relief(); - +// fin_cadre_relief(); + echo "</div>"; $supprimer_groupe = false; } else @@ -310,8 +313,10 @@ while ($row_groupes = spip_fetch_array($result_groupes)) { echo "</td>"; echo "<td> </td>"; // Histoire de forcer "supprimer" un peu plus vers la gauche } - echo "<td align='right'>"; + echo "<td>"; + echo "<div align='$spip_lang_right'>"; icone(_T('icone_creation_mots_cles'), "mots_edit.php3?new=oui&redirect=mots_tous.php3&id_groupe=$id_groupe", "mot-cle-24.gif", "creer.gif"); + echo "</div>"; echo "</td></tr></table>"; } diff --git a/ecrire/naviguer.php3 b/ecrire/naviguer.php3 index a074205d29..ae30e97f19 100644 --- a/ecrire/naviguer.php3 +++ b/ecrire/naviguer.php3 @@ -25,45 +25,46 @@ function enfant($collection){ changer_typo($row['lang']); $descriptif=propre($row['descriptif']); - $les_enfants.= "<P>"; + $les_enfants.= "<div class='enfants'>"; if ($id_parent == "0") $les_enfants .= debut_cadre_relief("secteur-24.gif", true); else $les_enfants .= debut_cadre_relief("rubrique-24.gif", true); if (strlen($les_sous_enfants) > 0){ $les_enfants .= $bouton_layer; } - $les_enfants .= "<FONT FACE=\"Verdana,Arial,Sans,sans-serif\">"; + //$les_enfants .= "<FONT FACE=\"Verdana,Arial,Sans,sans-serif\">"; if (acces_restreint_rubrique($id_rubrique)) $les_enfants .= "<img src='img_pack/admin-12.gif' alt='' width='12' height='12' title='"._T('image_administrer_rubrique')."'> "; $les_enfants.= "<span dir='$lang_dir'><B><A HREF='naviguer.php3?coll=$id_rubrique'><font color='$couleur_foncee'>".typo($titre)."</font></A></B></span>"; if (strlen($descriptif)>1) { - $les_enfants .= "<br><FONT SIZE=1><span dir='$lang_dir'>$descriptif</span></FONT>"; + $les_enfants .= "<div class='verdana1'>$descriptif</span></div>"; } - $les_enfants.= "</FONT>"; + //$les_enfants.= "</FONT>"; $les_enfants .= $les_sous_enfants; $les_enfants .= fin_cadre_relief(true); + $les_enfants .= "</div>"; } } function sous_enfant($collection2){ - global $lang_dir, $spip_lang_dir; + global $lang_dir, $spip_lang_dir, $spip_lang_left; $query3 = "SELECT * FROM spip_rubriques WHERE id_parent=\"$collection2\" ORDER BY titre"; $result3 = spip_query($query3); if (spip_num_rows($result3) > 0){ - $retour = debut_block_invisible("enfants$collection2")."\n<ul style='list-style-image: url(img_pack/rubrique-12.gif)'>\n<FONT SIZE=1 face='arial,helvetica,sans-serif'>"; + $retour = debut_block_invisible("enfants$collection2")."\n<ul style='margin: 0px; padding: 0px; padding-top: 3px;'>\n"; while($row=spip_fetch_array($result3)){ $id_rubrique2=$row['id_rubrique']; $id_parent2=$row['id_parent']; $titre2=$row['titre']; changer_typo($row['lang']); - $retour.="<LI><A HREF='naviguer.php3?coll=$id_rubrique2'><span dir='$lang_dir'>".typo($titre2)."</span></A>\n"; + $retour.="<div class='arial11' style='background: url(img_pack/rubrique-12.gif) left center no-repeat; padding: 2px; padding-$spip_lang_left: 18px; margin-$spip_lang_left: 3px;'><A HREF='naviguer.php3?coll=$id_rubrique2'><span dir='$lang_dir'>".typo($titre2)."</span></a></div>\n"; } - $retour .= "</FONT></ul>\n\n".fin_block()."\n\n"; + $retour .= "</ul>\n\n".fin_block()."\n\n"; } return $retour; @@ -435,8 +436,8 @@ enfant($coll); $les_enfants2=substr($les_enfants,round(strlen($les_enfants)/2),strlen($les_enfants)); -if (strpos($les_enfants2,"<P>")){ - $les_enfants2=substr($les_enfants2,strpos($les_enfants2,"<P>"),strlen($les_enfants2)); +if (strpos($les_enfants2,"<div class='enfants'>")){ + $les_enfants2=substr($les_enfants2,strpos($les_enfants2,"<div class='enfants'>"),strlen($les_enfants2)); $les_enfants1=substr($les_enfants,0,strlen($les_enfants)-strlen($les_enfants2)); }else{ $les_enfants1=$les_enfants; @@ -445,7 +446,7 @@ if (strpos($les_enfants2,"<P>")){ // Afficher les sous-rubriques -echo "<p><table cellpadding=0 cellspacing=0 border=0 width='100%'>"; +echo "<table cellpadding=0 cellspacing=0 border=0 width='100%'>"; echo "<tr><td valign='top' width=50% rowspan=2>$les_enfants1</td>"; echo "<td width=20 rowspan=2><img src='img_pack/rien.gif' width=20></td>"; echo "<td valign='top' width=50%>$les_enfants2 "; @@ -459,7 +460,7 @@ if ($flag_editable) { echo "<p>"; } echo "</div></td></tr>"; -echo "</table>"; +echo "</table><p />"; //echo "<div align='$spip_lang_left'>"; @@ -475,11 +476,83 @@ afficher_articles(_T('info_en_cours_validation'), "AND lien.id_auteur=\"$connect_id_auteur\" AND articles.statut=\"prepa\" ORDER BY articles.date DESC"); -////////// Les articles a valider -///////////////////////// -afficher_articles(_T('info_articles_a_valider'), - "WHERE statut=\"prop\" AND id_rubrique='$coll' ORDER BY date DESC"); +// +// Verifier les boucles a mettre en relief +// + +$relief = false; + +if (!$relief) { + $query = "SELECT id_article FROM spip_articles AS articles WHERE id_rubrique='$coll' AND statut='prop'$vos_articles LIMIT 0,1"; + $result = spip_query($query); + $relief = (spip_num_rows($result) > 0); +} + +if (!$relief) { + $query = "SELECT id_breve FROM spip_breves WHERE id_rubrique='$coll' AND (statut='prepa' OR statut='prop') LIMIT 0,1"; + $result = spip_query($query); + $relief = (spip_num_rows($result) > 0); +} + +if (!$relief AND lire_meta('activer_syndic') != 'non') { + $query = "SELECT id_syndic FROM spip_syndic WHERE id_rubrique='$coll' AND statut='prop' LIMIT 0,1"; + $result = spip_query($query); + $relief = (spip_num_rows($result) > 0); +} + +if (!$relief AND lire_meta('activer_syndic') != 'non' AND $connect_statut == '0minirezo' AND $connect_toutes_rubriques) { + $query = "SELECT id_syndic FROM spip_syndic WHERE id_rubrique='$coll' AND syndication='off' LIMIT 0,1"; + $result = spip_query($query); + $relief = (spip_num_rows($result) > 0); +} + + +if ($relief) { + echo "<p>"; + debut_cadre_couleur(); + echo "<div class='verdana2' style='color: black;'><b>"._T('texte_en_cours_validation')."</b></div><p>"; + + // + // Les articles a valider + // + afficher_articles(_T('info_articles_proposes'), + "WHERE id_rubrique='$coll' AND statut='prop'$vos_articles ORDER BY date DESC"); + + // + // Les breves a valider + // + $query = "SELECT * FROM spip_breves WHERE id_rubrique='$coll' AND (statut='prepa' OR statut='prop') ORDER BY date_heure DESC"; + afficher_breves(_T('info_breves_valider'), $query, true); + + // + // Les sites references a valider + // + if (lire_meta('activer_syndic') != 'non') { + include_ecrire("inc_sites.php3"); + afficher_sites(_T('info_site_valider'), "SELECT * FROM spip_syndic WHERE id_rubrique='$coll' AND statut='prop' ORDER BY nom_site"); + } + + // + // Les sites a probleme + // + if (lire_meta('activer_syndic') != 'non' AND $connect_statut == '0minirezo' AND $connect_toutes_rubriques) { + include_ecrire("inc_sites.php3"); + afficher_sites(_T('avis_sites_syndiques_probleme'), + "SELECT * FROM spip_syndic WHERE id_rubrique='$coll' AND syndication='off' AND statut='publie' ORDER BY nom_site"); + } + + // Les articles syndiques en attente de validation + if ($connect_statut == '0minirezo' AND $connect_toutes_rubriques) { + $result = spip_query ("SELECT COUNT(*) AS compte FROM spip_syndic_articles WHERE id_rubrique='$coll' AND statut='dispo'"); + if (($row = spip_fetch_array($result)) AND $row['compte']) + echo "<br><small><a href='sites_tous.php3'>".$row['compte']." "._T('info_liens_syndiques_1')."</a> "._T('info_liens_syndiques_2')."</small>"; + } + + fin_cadre_couleur(); +} + + ////////// Les articles en cours de redaction @@ -495,7 +568,7 @@ if ($connect_statut == "0minirezo" AND $options == 'avancees') { ///////////////////////// afficher_articles(_T('info_tous_articles_presents'), - "WHERE statut=\"publie\" AND id_rubrique='$coll' ORDER BY date DESC"); + "WHERE statut=\"publie\" AND id_rubrique='$coll' ORDER BY date DESC", true); if ($coll > 0){ echo "<div align='right'>"; @@ -505,7 +578,7 @@ if ($coll > 0){ //// Les breves -afficher_breves(_T('icone_ecrire_nouvel_article'), "SELECT * FROM spip_breves WHERE id_rubrique='$coll' ORDER BY date_heure DESC"); +afficher_breves(_T('icone_ecrire_nouvel_article'), "SELECT * FROM spip_breves WHERE id_rubrique='$coll' AND statut != 'prop' AND statut != 'prepa' ORDER BY date_heure DESC"); $activer_breves=lire_meta("activer_breves"); @@ -521,7 +594,7 @@ if ($id_parent == "0" AND $coll != "0" AND $activer_breves!="non"){ if (lire_meta("activer_sites") == 'oui') { include_ecrire("inc_sites.php3"); - afficher_sites(_T('titre_sites_references_rubrique'), "SELECT * FROM spip_syndic WHERE id_rubrique='$coll' AND statut!='refuse' ORDER BY nom_site"); + afficher_sites(_T('titre_sites_references_rubrique'), "SELECT * FROM spip_syndic WHERE id_rubrique='$coll' AND statut!='refuse' AND statut != 'prop' AND syndication != 'off' ORDER BY nom_site"); $proposer_sites=lire_meta("proposer_sites"); if ($coll > 0 AND ($flag_editable OR $proposer_sites > 0)) { diff --git a/ecrire/puce.gif b/ecrire/puce.gif index c156b51af5334f7eb91f22ddfb39894ab28ee007..c005a6c5a6de60bdc72928e0b09e54fd82faa656 100644 GIT binary patch literal 83 zcmZ?wbhEHb<Y3@tSj5g?Yis-T=~FK+uZ<fw78VvRS+c~<&5eP9LGdRGBLf3FgAS0* l08-1qEK#xR&c4TuHyU`)Fa=H%Ye^TJv8l8t(1?@48UQ958M^=g literal 145 zcmV;C0B-+BNk%w1VGsZg0J9GOnwggTnk@L!WaeoO*4Ea>#KB=<U;es8*1BPZf@aLN zi?6S*;Nalglu_B&%jD$bA^8LW000jFEC2ui01yBU000C&@X1N5y*Ojxn4ZC*5S})K zNI{tAA(Gf|hDW+uGA$rLQBt{sAYthJCM|@asJfhpi3RM^AogyU!a{nKL;wIgbq_-c diff --git a/ecrire/puce_rtl.gif b/ecrire/puce_rtl.gif index 19d3d25cc5462d951911f26fee28c155581f4c4c..ab5e910fa86d97823a44848d938a7daeae3ba736 100644 GIT binary patch literal 84 zcmZ?wbhEHb<Y3@tIK<9iYis-T=~FK+uZ<fw78VvRS+c~<&F%mH|B63Z7#SGY8FUzc m0Hl_IS+Zi+oqyRo7$X=eL>mt(Ic;Zgxh}%=fW?i8!5RR;pBs4q literal 143 zcmV;A0C4|DNk%w1VGsZg0J8u9nwggTnk@L!WaeoO*4Ea>#KB=<U;es8*1BPZf@aLN zi?6S*;Nalglu_B&%jD$bA^8LW000jFEC2ui01yBU000C$@X1N5y*TT~oY)MZ9Dzm@ x2svQksIJzTlEDB|OaUOm@me{6A<?VdC?}yIRbvqriD5I795z7DMWGS_06VllK5hU2 diff --git a/ecrire/recherche.php3 b/ecrire/recherche.php3 index 0312ea4488..d694a6dade 100644 --- a/ecrire/recherche.php3 +++ b/ecrire/recherche.php3 @@ -8,98 +8,108 @@ debut_page(_T('titre_page_recherche', array('recherche' => $recherche))); debut_gauche(); + global $recherche; + $recherche_aff = _T('info_rechercher'); + $onfocus = "onfocus=this.value='';"; + echo "<form method='get' style='margin: 0px;' action='recherche.php3'>"; + echo '<input type="text" size="10" value="'.$recherche_aff.'" name="recherche" class="spip_recherche" accesskey="r" '.$onfocus.'>'; + echo "</form>"; -debut_droite(); - -echo "<FONT FACE='Verdana,Arial,Sans,sans-serif'><B>"._T('info_resultat_recherche')."</B><BR>"; -echo "<FONT SIZE=5 COLOR='$couleur_foncee'><B>".typo($recherche)."</B></FONT><p>"; - -$recherche = addslashes($recherche); - -$query_articles = "SELECT * FROM spip_articles WHERE"; -$query_breves = "SELECT * FROM spip_breves WHERE "; -$query_rubriques = "SELECT * FROM spip_rubriques WHERE "; -$query_sites = "SELECT * FROM spip_syndic WHERE "; - -if (ereg("^[0-9]+$", $recherche)) { - $query_articles .= " (id_article = $recherche) OR "; - $query_breves .= " (id_breve = $recherche) OR "; - $query_rubriques .= " (id_rubrique = $recherche) OR "; - $query_sites .= " (id_syndic = $recherche) OR "; -} -// Eviter les symboles '%', caracteres SQL speciaux -$recherche = str_replace("%","\%",$recherche); -$rech2 = split("[[:space:]]+", $recherche); -if ($rech2) - $where = " (titre LIKE '%".join("%' AND titre LIKE '%", $rech2)."%') "; -else - $where = " 1=2"; - -$query_articles .= " $where ORDER BY date_modif DESC"; -$query_breves .= " $where ORDER BY maj DESC LIMIT 0,10"; -$query_rubriques .= " $where ORDER BY maj DESC LIMIT 0,10"; - -$query_sites .= " $where ORDER BY maj DESC LIMIT 0,10"; -$query_sites = ereg_replace("titre LIKE", "nom_site LIKE", $query_sites); - -$activer_moteur = (lire_meta('activer_moteur') == 'oui'); -if ($activer_moteur) { // texte integral - include_ecrire ('inc_index.php3'); - list($hash_recherche,) = requete_hash ($recherche); - $query_articles_int = requete_txt_integral('article', $hash_recherche); - $query_breves_int = requete_txt_integral('breve', $hash_recherche); - $query_rubriques_int = requete_txt_integral('rubrique', $hash_recherche); - $query_sites_int = requete_txt_integral('syndic', $hash_recherche); - $query_auteurs_int = requete_txt_integral('auteur', $hash_recherche); -} +debut_droite(); -if ($query_articles) - $nba = afficher_articles (_T('info_articles_trouves'), $query_articles); -if ($activer_moteur) { - if ($nba) { - $doublons = join($nba, ","); - $query_articles_int = ereg_replace ("WHERE", "WHERE objet.id_article NOT IN ($doublons) AND", $query_articles_int); +if (strlen($recherche) > 0) { + + echo "<FONT FACE='Verdana,Arial,Sans,sans-serif'><B>"._T('info_resultat_recherche')."</B><BR>"; + echo "<FONT SIZE=5 COLOR='$couleur_foncee'><B>".typo($recherche)."</B></FONT><p>"; + + $recherche = addslashes($recherche); + + $query_articles = "SELECT * FROM spip_articles WHERE"; + $query_breves = "SELECT * FROM spip_breves WHERE "; + $query_rubriques = "SELECT * FROM spip_rubriques WHERE "; + $query_sites = "SELECT * FROM spip_syndic WHERE "; + + if (ereg("^[0-9]+$", $recherche)) { + $query_articles .= " (id_article = $recherche) OR "; + $query_breves .= " (id_breve = $recherche) OR "; + $query_rubriques .= " (id_rubrique = $recherche) OR "; + $query_sites .= " (id_syndic = $recherche) OR "; } - $nba1 = afficher_articles (_T('info_articles_trouves_dans_texte'), $query_articles_int); -} - -if ($query_breves) - $nbb = afficher_breves (_T('info_breves_touvees'), $query_breves); -if ($activer_moteur) { - if ($nbb) { - $doublons = join($nbb, ","); - $query_breves_int = ereg_replace ("WHERE", "WHERE objet.id_breve NOT IN ($doublons) AND", $query_breves_int); + + // Eviter les symboles '%', caracteres SQL speciaux + $recherche = str_replace("%","\%",$recherche); + $rech2 = split("[[:space:]]+", $recherche); + if ($rech2) + $where = " (titre LIKE '%".join("%' AND titre LIKE '%", $rech2)."%') "; + else + $where = " 1=2"; + + $query_articles .= " $where ORDER BY date_modif DESC"; + $query_breves .= " $where ORDER BY maj DESC LIMIT 0,10"; + $query_rubriques .= " $where ORDER BY maj DESC LIMIT 0,10"; + + $query_sites .= " $where ORDER BY maj DESC LIMIT 0,10"; + $query_sites = ereg_replace("titre LIKE", "nom_site LIKE", $query_sites); + + $activer_moteur = (lire_meta('activer_moteur') == 'oui'); + if ($activer_moteur) { // texte integral + include_ecrire ('inc_index.php3'); + list($hash_recherche,) = requete_hash ($recherche); + $query_articles_int = requete_txt_integral('article', $hash_recherche); + $query_breves_int = requete_txt_integral('breve', $hash_recherche); + $query_rubriques_int = requete_txt_integral('rubrique', $hash_recherche); + $query_sites_int = requete_txt_integral('syndic', $hash_recherche); + $query_auteurs_int = requete_txt_integral('auteur', $hash_recherche); } - $nbb1 = afficher_breves (_T('info_breves_touvees_dans_texte'), $query_breves_int); -} - -if ($query_rubriques) - $nbr = afficher_rubriques (_T('info_rubriques_trouvees'), $query_rubriques); -if ($activer_moteur) { - if ($nbr) { - $doublons = join($nbr, ","); - $query_rubriques_int = ereg_replace ("WHERE", "WHERE objet.id_rubrique NOT IN ($doublons) AND", $query_rubriques_int); + + if ($query_articles) + $nba = afficher_articles (_T('info_articles_trouves'), $query_articles); + if ($activer_moteur) { + if ($nba) { + $doublons = join($nba, ","); + $query_articles_int = ereg_replace ("WHERE", "WHERE objet.id_article NOT IN ($doublons) AND", $query_articles_int); + } + $nba1 = afficher_articles (_T('info_articles_trouves_dans_texte'), $query_articles_int); } - $nbr1 = afficher_rubriques (_T('info_rubriques_trouvees_dans_texte'), $query_rubriques_int); -} - -if ($activer_moteur) - $nbt = afficher_auteurs (_T('info_auteurs_trouves'), $query_auteurs_int); - -if ($query_sites) - $nbs = afficher_sites (_T('info_sites_trouves'), $query_sites); -if ($activer_moteur) { - if ($nbs) { - $doublons = join($nbs, ","); - $query_sites_int = ereg_replace ("WHERE", "WHERE objet.id_syndic NOT IN ($doublons) AND", $query_sites_int); + + if ($query_breves) + $nbb = afficher_breves (_T('info_breves_touvees'), $query_breves, true); + if ($activer_moteur) { + if ($nbb) { + $doublons = join($nbb, ","); + $query_breves_int = ereg_replace ("WHERE", "WHERE objet.id_breve NOT IN ($doublons) AND", $query_breves_int); + } + $nbb1 = afficher_breves (_T('info_breves_touvees_dans_texte'), $query_breves_int, true); + } + + if ($query_rubriques) + $nbr = afficher_rubriques (_T('info_rubriques_trouvees'), $query_rubriques); + if ($activer_moteur) { + if ($nbr) { + $doublons = join($nbr, ","); + $query_rubriques_int = ereg_replace ("WHERE", "WHERE objet.id_rubrique NOT IN ($doublons) AND", $query_rubriques_int); + } + $nbr1 = afficher_rubriques (_T('info_rubriques_trouvees_dans_texte'), $query_rubriques_int); + } + + if ($activer_moteur) + $nbt = afficher_auteurs (_T('info_auteurs_trouves'), $query_auteurs_int); + + if ($query_sites) + $nbs = afficher_sites (_T('info_sites_trouves'), $query_sites); + if ($activer_moteur) { + if ($nbs) { + $doublons = join($nbs, ","); + $query_sites_int = ereg_replace ("WHERE", "WHERE objet.id_syndic NOT IN ($doublons) AND", $query_sites_int); + } + $nbs1 = afficher_sites (_T('info_sites_trouves_dans_texte'), $query_sites_int); + } + + if (!$nba AND !$nba1 AND !$nbb AND !$nbb1 AND !$nbr AND !$nbr1 AND !$nbt AND !$nbs AND !$nbs1) { + echo "<FONT FACE='Verdana,Arial,Sans,sans-serif'>"._T('avis_aucun_resultat')."</FONT><P>"; } - $nbs1 = afficher_sites (_T('info_sites_trouves_dans_texte'), $query_sites_int); -} - -if (!$nba AND !$nba1 AND !$nbb AND !$nbb1 AND !$nbr AND !$nbr1 AND !$nbt AND !$nbs AND !$nbs1) { - echo "<FONT FACE='Verdana,Arial,Sans,sans-serif'>"._T('avis_aucun_resultat')."</FONT><P>"; } echo "<p>"; diff --git a/ecrire/spip_style.php3 b/ecrire/spip_style.php3 index 1ad538ad63..19e6c5b306 100644 --- a/ecrire/spip_style.php3 +++ b/ecrire/spip_style.php3 @@ -6,7 +6,10 @@ list (,$couleur_claire,$couleur_foncee,$left,$right) = $regs; $ltr = ($left == 'left'); $rtl = ($right == 'left'); - + + if ($left == 'left') $_rtl = ""; + else $_rtl = "_rtl"; + // En-tetes $lastmodified = @filemtime("spip_style.php3"); $headers_only = http_last_modified($lastmodified, time() + 24 * 3600); @@ -26,6 +29,14 @@ */ body { font-family: Verdana,Arial,Sans,sans-serif; + border: 0px; + scrollbar-face-color: white; + scrollbar-shadow-color: white; + scrollbar-highlight-color: white; + scrollbar-3dlight-color: <?php echo $couleur_claire; ?>; + scrollbar-darkshadow-color: white; + scrollbar-track-color: <?php echo $couleur_foncee; ?>; + scrollbar-arrow-color: <?php echo $couleur_foncee; ?>; } td { text-align: <?php echo $left; ?>; @@ -33,8 +44,25 @@ td { /* * Formulaires */ -.forml { width: 100%; padding: 2px; background-color: #E4E4E4; background-position: center bottom; float: none; color: #000000; } -.formo { width: 100%; padding: 2px; background-color: <?php echo $couleur_claire; ?>; background-position: center bottom; float: none; } +.forml { + width: 100%; + display: block; + padding: 3px; + background-color: #e4e4e4; + border: 1px solid <?php echo $couleur_claire; ?>; + background-position: center bottom; + float: none; + behavior: url("win_width.htc"); + } +.formo { + width: 100%; + display: block; + padding: 3px; + background-color: white; + border: 1px solid <?php echo $couleur_claire; ?>; + background-position: center bottom; float: none; + behavior: url("win_width.htc"); +} .fondl { background-color: <?php echo $couleur_claire; ?>; background-position: center bottom; float: none; color: #000000; } .fondo { background-color: <?php echo $couleur_foncee; ?>; background-position: center bottom; float: none; color: #FFFFFF; } .fondf { background-color: #FFFFFF; border-style: solid ; border-width: 1; border-color: #E86519; color: #E86519; } @@ -45,38 +73,32 @@ td { */ .bandeau-principal { - display: block; margin: 0px; padding: 0px; - padding-top: 0px; - background: url(img_pack/rayures-fines.gif); - border-bottom: 1px solid #333333; + background-color: white; + border-bottom: 1px solid black; } -.bandeau-secondaire { - display: block; + +.bandeau-icones { margin: 0px; padding: 0px; - background-color: #f1f1f1; - border-bottom: 1px solid black; - border-top: 1px solid #aaaaaa; + padding-bottom: 2px; + padding-top: 4px; } -.bandeau-icones { - display: block; - margin: auto; + +.bandeau_sec .gauche { + margin-top: 0px; padding: 2px; + padding-top: 0px; + background-color: white; + border-bottom: 1px solid black; + border-left: 1px solid black; + border-right: 1px solid black; + -moz-border-radius-bottomleft: 5px; + -moz-border-radius-bottomright: 5px; + z-index: 100; } -.bandeau-icones .gauche { - float: <?php echo $left; ?>; -} -.bandeau-icones .droite { - float: <?php echo $right; ?>; -} -.bandeau-icones .milieu { - text-align: center; -} -.bandeau-icones .fin { - clear: both; -} + .bandeau-icones .separateur { vertical-align: center; height: 100%; @@ -86,10 +108,97 @@ td { background: url(img_pack/tirets-separation.gif); background-position: 5px 0px; } +.bandeau_couleur { + padding-right: 4px; + padding-left: 4px; + font-family: verdana, helvetica, arial, sans; + font-size: 11px; + color: black; + text-align: center; + font-weight: bold; +} + +.bandeau_couleur_sous { + position: absolute; + visibility: hidden; + top: 0px; + background-color: <?php echo $couleur_claire; ?>; + color: black; + padding: 5px; + padding-top: 2px; + font-family: verdana, helvetica, arial, sans; + font-size: 11px; + border-bottom: 1px solid white; + border-right; 1px solid white; + -moz-border-radius-bottomleft: 5px; + -moz-border-radius-bottomright: 5px; +} + + +div.bandeau_rubriques { + background-color: #eeeeee; + border: 1px solid #555555; +} +a.bandeau_rub { + display: block; + font-size: 10px; + padding: 2px; + padding-<?php echo $right; ?>: 13px; + padding-<?php echo $left; ?>: 16px; + color: #666666; + text-decoration: none; + border-bottom: 1px solid #cccccc; + background-repeat: no-repeat; + background-position: <?php echo $ltr ? "1%" : "99%"; ?>; +} +a.bandeau_rub:hover { + background-color: white; + text-decoration: none; + color: #333333; + background-repeat: no-repeat; + background-position: <?php echo $ltr ? "1%" : "99%"; ?>; +} +div.bandeau_rub { + position: absolute; + top: 4px; + <?php echo $left; ?>: 120px; + background-color: #eeeeee; + padding: 0px; + border: 1px solid #555555; + visibility: hidden; + width: 170px; +} + +div.messages { + padding: 5px; + border-bottom: 1px solid <? echo $couleur_foncee; ?>; + font-size: 10px; + font-weight: bold; +} /* Icones de fonctions */ +a.icone26 { + font-family: verdana, helvetica, arial, sans; + font-size: 11px; + font-weight: bold; + color: black; + text-decoration: none; +} +a.icone26:hover { + text-decoration: none; +} +a.icone26 img { + padding: 1px; + margin-right: 2px; + vertical-align: middle; +} +a.icone26:hover img { + background: url(img_pack/fond-gris-anim.gif); +} + + .icone36, icone36-danger { border: none; padding: 0px; @@ -105,19 +214,17 @@ td { .icone36 a img { margin: 0px; display: inline; - padding: 3px; + padding: 4px; background-color: #eeeeee; - border: 1px solid #cccccc; - filter: alpha(opacity=100); + border: 2px solid <?php echo $couleur_foncee; ?>; -moz-border-radius: 5px; } .icone36 a:hover img { margin: 0px; display: inline; - padding: 3px; + padding: 4px; background-color: white; - border: 1px solid #666666; - filter: alpha(opacity=100); + border: 2px solid #666666; -moz-border-radius: 5px; } .icone36-danger a img { @@ -126,7 +233,6 @@ td { padding: 3px; background-color: white; border: 2px solid #ff9999; - filter: alpha(opacity=100); -moz-border-radius: 5px; } .icone36-danger a:hover img { @@ -135,7 +241,6 @@ td { padding: 3px; background-color: white; border: 2px solid red; - filter: alpha(opacity=100); -moz-border-radius: 5px; } .icone36-danger a span { @@ -149,7 +254,9 @@ td { font-family: Verdana, Arial, Sans, sans-serif; font-weight: bold; font-size: 10px; - color: #666666; display: block; margin: 2px; + color: <?php echo $couleur_foncee; ?>; + display: block; + margin: 2px; width: 100% } .icone36 a:hover span { @@ -187,29 +294,54 @@ td { .cellule36 a, .cellule48 a { display: block; text-align: center; } -.cellule36 a img, .cellule48 a img { + + +.cellule48 a img { + behavior: url("win_png.htc"); + display: inline; + margin: 4px; + padding: 0px; + border: 0px; + background-color: <?php echo $couleur_claire; ?>; +} + +.cellule48 a.selection img { + display: inline; + margin: 4px; + padding: 0px; + border: 0px; + background-color: #999999; +} +.cellule48 a:hover img { + display: inline; + margin: 4px; + padding: 0px; + border: 0px; + background: url(img_pack/fond-gris-anim.gif); +} + + +.cellule36 a img { margin: 0px; display: inline; padding: 4px; border: 0px; - filter: alpha(opacity=70); } -.cellule36 a.selection img, .cellule48 a.selection img { +.cellule36 a.selection img{ margin: 0px; display: inline; padding: 3px; background-color: white; border: 1px solid #aaaaaa; - filter: alpha(opacity=100); -moz-border-radius: 5px; } -.cellule36 a:hover img, .cellule48 a:hover img { +.cellule36 a:hover img { margin: 0px; display: inline; padding: 3px; background-color: #dddddd; + background: url(img_pack/fond-gris-anim.gif); border: 1px solid #999999; - filter: alpha(opacity=100); -moz-border-radius: 5px; } .cellule36 a span, .cellule48 a span { @@ -306,7 +438,6 @@ a.cellule-h div.cell-i { border: 0px; margin: 0px; margin-<?php echo $right; ?>: 3px; - filter: alpha(opacity=50); } a.cellule-h:hover div.cell-i { padding: 0px; @@ -331,12 +462,6 @@ a.cellule-h img { background-repeat: no-repeat; background-position: center center; } -a.cellule-h img { - filter: alpha(opacity=40); -} -a.cellule-h:hover img { - filter: alpha(opacity=100); -} a.cellule-h a.aide img { width: 12px; height: 12px; @@ -409,6 +534,45 @@ a.cellule-h-texte:hover { height: 24px; } +div.onglet { + font-family: Arial, Sans, sans-serif; + font-size: 11px; + font-weight: bold; + border: 1px solid <?php echo $couleur_foncee; ?>; + margin-right: 3px; + padding: 5px; + background-color: white; +} +div.onglet a { + color: <?php echo $couleur_foncee; ?>; +} + +div.onglet_on { + font-family: Arial, Sans, sans-serif; + font-size: 11px; + font-weight: bold; + border: 1px solid <?php echo $couleur_foncee; ?>; + margin-right: 3px; + padding: 5px; + background-color: <?php echo $couleur_claire; ?>; +} +div.onglet_on a, div.onglet_on a:hover { + color: <?php echo $couleur_foncee; ?>; + text-decoration: none; +} + +div.onglet_off { + font-family: Arial, Sans, sans-serif; + font-size: 11px; + font-weight: bold; + border: 1px solid <?php echo $couleur_foncee; ?>; + margin-right: 3px; + padding: 5px; + background-color: <?php echo $couleur_foncee; ?>; + color: white; +} + + .reliefblanc { background-image: url(img_pack/barre-blanc.gif); } .reliefgris { background-image: url(img_pack/barre-noir.gif); } @@ -421,6 +585,7 @@ a.cellule-h-texte:hover { /* Raccourcis pour les polices (utile pour les tableaux) */ .arial0 { font-family: Arial, Sans, sans-serif; font-size: 9px; } .arial1 { font-family: Arial, Sans, sans-serif; font-size: 10px; } +.arial11 { font-family: Arial, Sans, sans-serif; font-size: 11px; } .arial2 { font-family: Arial, Sans, sans-serif; font-size: 12px; } .verdana1 { font-family: Verdana, Arial, Sans, sans-serif; font-size: 10px; } .verdana2 { font-family: Verdana, Arial, Sans, sans-serif; font-size: 11px; } @@ -430,7 +595,7 @@ a.cellule-h-texte:hover { /* Liens hypertexte */ a { text-decoration: none; } -a:hover { text-decoration: underline; } +a:hover { text-decoration: none; } a.icone { text-decoration: none; } a.icone:hover { text-decoration: none; } @@ -438,19 +603,24 @@ a.icone:hover { text-decoration: none; } * Barre de raccourcis */ +table.spip_barre { + border-<? echo $right; ?>: 1px solid <? echo $couleur_claire; ?>; +} + +table.spip_barre td { + text-align: <? echo $left; ?>; + border-top: 1px solid <? echo $couleur_claire; ?>; + border-<? echo $left; ?>: 1px solid <? echo $couleur_claire; ?>; +} + a.spip_barre img { - padding: 4px; - margin: 1px; - border: 1px solid #aaaaaa; - background-color: #e4e4e4; - -moz-border-radius: 5px; + padding: 3px; + margin: 0px; + background-color: #eeeeee; + border-<? echo $right; ?>: 1px solid <? echo $couleur_claire; ?>; } a.spip_barre:hover img { - padding: 4px; - margin: 1px; - border: 1px solid #999999; background-color: white; - -moz-border-radius: 5px; } td.icone table { @@ -485,86 +655,106 @@ td.icone a img { } - - /* - * Cadre blanc arrondi - */ +* Cadre couleur foncee +*/ -.cadre { - padding: 0px; - margin: 0px; - border: 0px; - width: 100%; -} -/* Haut-gauche, etc. */ -.r-hg { - width: 5px; height: 24px; background: url('img_pack/rond-hg-24.gif') no-repeat right bottom; -} -.r-h { - height: 24px; background: url('img_pack/rond-h-24.gif') repeat-x bottom; - text-align: <?php echo $left; ?>; +.cadre-padding { + font-family: verdana, arial, helvetica, sans; + font-size: 12px; + padding: 6px; } -.r-hd { - width: 5px; height: 24px; background: url('img_pack/rond-hd-24.gif') no-repeat left bottom; + +.cadre-titre { + font-family: verdana, arial, helvetica, sans; + font-weight: bold; + font-size: 12px; + padding: 3px; } -.r-g { - width: 5px; background: url('img_pack/rond-g.gif') repeat-y right; + +.cadre-fonce { + background-color: <?php echo $couleur_foncee; ?>; + -moz-border-radius: 8px; } -.r-d { - width: 5px; background: url('img_pack/rond-d.gif') repeat-y left; + +.cadre-gris-fonce { + background-color: #666666; + -moz-border-radius: 8px; } -.r-bg { - width: 5px; height: 5px; background: url('img_pack/rond-bg.gif') no-repeat right top; + +.cadre-gris-clair { + border: 1px solid #aaaaaa; + background-color: #cccccc; + -moz-border-radius: 8px; } -.r-b { - height: 5px; background: url('img_pack/rond-b.gif') repeat-x top; + +.cadre-couleur { + background-color: <? echo $couleur_claire; ?>; + -moz-border-radius: 8px; } -.r-bd { - width: 5px; height: 5px; background: url('img_pack/rond-bd.gif') no-repeat left top; + +.cadre-trait-couleur { + background-color: white; + border: 2px solid <? echo $couleur_foncee; ?>; + -moz-border-radius: 8px; } -.r-c { - background: white; padding: 2px; - text-align: <?php echo $left; ?>; +.cadre-trait-couleur div.cadre-titre { + background: <? echo $couleur_foncee; ?>; + border-bottom: 2px solid <? echo $couleur_foncee; ?>; + color: white; } +.cadre-r { + background-color: white; + border: 1px solid #666666; + -moz-border-radius: 8px; +} -/* - * Cadre gris enfonce - */ -/* Haut-gauche, etc. */ -.e-hg { - width: 5px; height: 24px; background: url('img_pack/cadre-hg.gif') no-repeat right bottom; +.cadre-r div.cadre-titre { + background: #aaaaaa; + border-bottom: 1px solid #666666; + color: black; } -.e-h { - height: 24px; background: url('img_pack/cadre-h.gif') repeat-x bottom; - text-align: <?php echo $left; ?>; -} -.e-hd { - width: 5px; height: 24px; background: url('img_pack/cadre-hd.gif') no-repeat left bottom; -} -.e-g { - width: 5px; background: url('img_pack/cadre-g.gif') repeat-y right; -} -.e-d { - width: 5px; background: url('img_pack/cadre-d.gif') repeat-y left; + +.cadre-e { + background-color: #dddddd; + border-top: 1px solid #aaaaaa; + border-left: 1px solid #aaaaaa; + border-bottom: 1px solid white; + border-right: 1px solid white; + -moz-border-radius: 8px; } -.e-bg { - width: 5px; height: 5px; background: url('img_pack/cadre-bg.gif') no-repeat right top; + +.cadre-e div.cadre-titre { + background: <? echo $couleur_claire; ?>; + border-bottom: 1px solid #666666; + color: black; } -.e-b { - height: 5px; background: url('img_pack/cadre-b.gif') repeat-x top; + +.cadre-e-noir { + border: 1px solid #666666; + -moz-border-radius: 8px; } -.e-bd { - width: 5px; height: 5px; background: url('img_pack/cadre-bd.gif') no-repeat left top; + +.cadre-info{ + background-color: white; + border: 2px solid <?php echo $couleur_foncee; ?>; + padding: 5px; + -moz-border-radius: 8px; } -.e-c { - background: #e0e0e0; padding: 2px; - text-align: <?php echo $left; ?>; + + +.cadre-formulaire { +/* border: 1px solid <?php echo $couleur_foncee; ?>; + background-color: #dddddd;*/ + color: #444444; + font-family: verdana, arial, helvetica, sans; + font-size: 11px; } + /* * Styles pour "Tout le site" */ @@ -580,43 +770,45 @@ td.icone a img { border-<?php echo $left; ?>: 1px dotted #404040; } +.plan-articles { + border-bottom: 1px solid #cccccc; + border-left: 1px solid #cccccc; + border-right: 1px solid #cccccc; +} .plan-articles a { display: block; padding: 2px; - margin-<?php echo $left; ?>: 2px; +/* margin-<?php echo $left; ?>: 2px; */ padding-<?php echo $left; ?>: 18px; - background: <?php echo $ltr ? "1%" : "99%"; ?> no-repeat; + border-top: 1px solid #cccccc; + background: <?php echo $ltr ? "1%" : "99%"; ?> no-repeat; background-color: #e0e0e0; - border-top: 1px solid white; + /* border-top: 1px solid white; border-left: 1px solid white; border-right: 1px solid #aaaaaa; - border-bottom: 1px solid #aaaaaa; + border-bottom: 1px solid #aaaaaa; */ font-family: Verdana, Arial, Sans, sans-serif; font-size: 11px; text-decoration: none; } .plan-articles a:hover { background-color: white; - border-bottom: 1px solid white; - border-right: 1px solid white; - border-left: 1px solid #aaaaaa; - border-top: 1px solid #aaaaaa; text-decoration: none; } .plan-articles .publie { - background-image: url(img_pack/puce-verte-breve.gif); + background-image: url(img_pack/puce-verte.gif); } .plan-articles .prepa { - background-image: url(img_pack/puce-blanche-breve.gif); + background-image: url(img_pack/puce-blanche.gif); } .plan-articles .prop { - background-image: url(img_pack/puce-orange-breve.gif); + background-image: url(img_pack/puce-orange.gif); } .plan-articles .refuse { - background-image: url(img_pack/puce-rouge-breve.gif); + background-image: url(img_pack/puce-rouge.gif); } .plan-articles .poubelle { - background-image: url(img_pack/puce-poubelle-breve.gif); + background-image: url(img_pack/puce-poubelle.gif); } a.foncee, a.foncee:hover, a.claire, a.claire:hover, span.creer, span.lang_base { @@ -659,23 +851,116 @@ span.creer { margin-top: 4px; } +div.liste { + border: 1px solid #444444; + margin-top: 3px; + margin-bottom: 3px; +} + +a.liste-mot { + background: url(img_pack/petite-cle.gif) <?php echo $left; ?> center no-repeat; + padding-<?php echo $left; ?>: 30px; +} + +.tr_liste { + background-color: #eeeeee; +} +.tr_liste_over { + background-color: white; +} + +.tr_liste td, .tr_liste_over td { + border-bottom: 1px solid #cccccc; +} + +.tr_liste td div.liste_clip { + height: 12px; + overflow: hidden; +} + + +div.brouteur_rubrique { + display: block; + padding: 3px; + padding-<?php echo $right; ?>: 10px; + border-top: 0px solid <?php echo $couleur_foncee; ?>; + border-bottom: 1px solid <?php echo $couleur_foncee; ?>; + border-left: 1px solid <?php echo $couleur_foncee; ?>; + border-right: 1px solid <?php echo $couleur_foncee; ?>; + background: url(img_pack/triangle-droite<?php echo $_rtl; ?>.gif) <?php echo $right; ?> center no-repeat; + background-color: white; +} + +div.brouteur_rubrique_on { + display: block; + padding: 3px; + padding-<?php echo $right; ?>: 10px; + border-top: 0px solid <?php echo $couleur_foncee; ?>; + border-bottom: 1px solid <?php echo $couleur_foncee; ?>; + border-left: 1px solid <?php echo $couleur_foncee; ?>; + border-right: 1px solid <?php echo $couleur_foncee; ?>; + background: url(img_pack/triangle-droite<?php echo $_rtl; ?>.gif) <?php echo $right; ?> center no-repeat; + background-color: #e0e0e0; +} + +xdiv.brouteur_rubrique:hover { + background-color: #e0e0e0; +} + +div.brouteur_rubrique div, div.brouteur_rubrique_on div { + padding-top: 5px; + padding-bottom: 5px; + padding-<?php echo $left; ?>: 28px; + background-repeat: no-repeat; + background-position: center <?php echo $left; ?>; + font-weight: bold; + font-family: Arial,Sans,sans-serif; + font-size: 12px; +} + +div.brouteur_rubrique div a { + color: <?php echo $couleur_foncee; ?>; +} + +div.brouteur_rubrique_on div a { + color: black; +} + +.iframe-bouteur { + background-color: #eeeeee; + border: 0px; + z-index: 1; +} /* * Styles generes par les raccourcis de mis en page */ +p.spip { + line-height: 140%; +} + a.spip_in {background-color:#eeeeee;} a.spip_note {background-color:#eeeeee;} a.spip_out {} a.spip_url {} a.spip_glossaire:hover {text-decoration: underline overline;} -.spip_recherche {padding: 2px; width : 100px; font-size: 10px;} +.spip_recherche { + padding: 3px; + width : 100%; + font-size: 10px; + border: 1px solid white; + background-color: <?php echo $couleur_foncee; ?>; + color: white; +} .spip_cadre { width : 100%; background-color: #eeeeee; padding: 5px; + border: 1px solid #666666; + behavior: url("win_width.htc"); } blockquote.spip { margin-<?php echo $left; ?>: 40px; diff --git a/ecrire/spip_style_invisible.css b/ecrire/spip_style_invisible.css new file mode 100644 index 0000000000..832041fb87 --- /dev/null +++ b/ecrire/spip_style_invisible.css @@ -0,0 +1,9 @@ +.invisible_au_chargement { + visibility: hidden; +} +.visible_au_chargement { + visibility: hidden; +} +.display_au_chargement { + display: none; +} \ No newline at end of file diff --git a/ecrire/spip_style_visible.css b/ecrire/spip_style_visible.css new file mode 100644 index 0000000000..7fccd48116 --- /dev/null +++ b/ecrire/spip_style_visible.css @@ -0,0 +1,9 @@ +.invisible_au_chargement { + visibility: hidden; +} +.visible_au_chargement { + visibility: visible; +} +.display_au_chargement { + display: block; +} \ No newline at end of file diff --git a/ecrire/statistiques.php3 b/ecrire/statistiques.php3 index cde9346c07..6ef15ff65f 100644 --- a/ecrire/statistiques.php3 +++ b/ecrire/statistiques.php3 @@ -6,27 +6,25 @@ include ("inc.php3"); debut_page(_T('titre_page_statistiques'), "suivi", "repartition"); echo "<br><br>"; -gros_titre(_T('titre_statistiques')); +gros_titre(_T('icone_repartition_visites')); if (lire_meta('multi_articles') == 'oui' OR lire_meta('multi_rubriques') == 'oui') barre_onglets("repartition", "rubriques"); if ($GLOBALS["critere"] == "debut") { $critere = "visites"; - gros_titre(_T('onglet_repartition_debut')); +// gros_titre(_T('onglet_repartition_debut')); } else { $critere = "popularite"; - gros_titre(_T('onglet_repartition_actuelle')); +// gros_titre(_T('onglet_repartition_actuelle')); } +if ($critere == "popularite") barre_onglets("stat_depuis", "popularite"); +else barre_onglets("stat_depuis", "debut"); -debut_gauche(); - -if ($critere == "popularite") icone_horizontale(_T('icone_repartition_debut'), "statistiques.php3?critere=debut", "rubrique-24.gif",""); -else icone_horizontale(_T('icone_repartition_actuelle'), "statistiques.php3", "rubrique-24.gif",""); - +debut_gauche(); debut_droite(); diff --git a/ecrire/statistiques_lang.php3 b/ecrire/statistiques_lang.php3 index a64407b987..a62cce4373 100644 --- a/ecrire/statistiques_lang.php3 +++ b/ecrire/statistiques_lang.php3 @@ -11,19 +11,19 @@ barre_onglets("repartition", "langues"); if ($GLOBALS["critere"] == "debut") { $critere = "visites"; - gros_titre(_T('onglet_repartition_debut')); +// gros_titre(_T('onglet_repartition_debut')); } else { $critere = "popularite"; - gros_titre(_T('onglet_repartition_actuelle')); +// gros_titre(_T('onglet_repartition_actuelle')); } +if ($critere == "popularite") barre_onglets("rep_depuis", "popularite"); +else barre_onglets("rep_depuis", "debut"); -debut_gauche(); -if ($critere == "popularite") icone_horizontale(_T('icone_repartition_debut'), "statistiques_lang.php3?critere=debut", "langues-24.gif",""); -else icone_horizontale(_T('icone_repartition_actuelle'), "statistiques_lang.php3", "langues-24.gif",""); +debut_gauche(); diff --git a/ecrire/statistiques_referers.php3 b/ecrire/statistiques_referers.php3 index 4ede42654b..37a58ad36a 100644 --- a/ecrire/statistiques_referers.php3 +++ b/ecrire/statistiques_referers.php3 @@ -30,9 +30,9 @@ if ($titre) $pourarticle = " "._T('info_pour')." « $titre »"; debut_page(_T('titre_page_statistiques_referers'), "suivi", "statistiques"); echo "<br><br><br>"; - //gros_titre(_T('titre_liens_entrants')); + gros_titre(_T('titre_liens_entrants')); -barre_onglets("statistiques", "referers"); +//barre_onglets("statistiques", "referers"); debut_gauche(); debut_boite_info(); diff --git a/ecrire/statistiques_visites.php3 b/ecrire/statistiques_visites.php3 index 0b9ca39116..43c9c98694 100644 --- a/ecrire/statistiques_visites.php3 +++ b/ecrire/statistiques_visites.php3 @@ -45,7 +45,7 @@ else { debut_page(_T('titre_page_statistiques_visites').$pourarticle, "suivi", "statistiques"); echo "<br><br>"; gros_titre(_T('titre_evolution_visite')."<html>".aide("confstat")."</html>"); - barre_onglets("statistiques", "evolution"); +// barre_onglets("statistiques", "evolution"); if ($titre) gros_titre($titre); debut_gauche(); diff --git a/ecrire/synchro.php3 b/ecrire/synchro.php3 index c9499341a9..18da325910 100644 --- a/ecrire/synchro.php3 +++ b/ecrire/synchro.php3 @@ -40,22 +40,14 @@ debut_droite(); /// if ($suivi_edito == "oui" AND strlen($adresse_suivi) > 3 AND strlen($adresse_suivi_inscription) > 3) { - echo debut_cadre_relief("racine-site-24.gif"); + debut_cadre_enfonce("racine-site-24.gif", false, "", _T('ical_titre_mailing')); $lien = propre("[->$adresse_suivi_inscription]"); - echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; - echo "<TR><TD BGCOLOR='$couleur_foncee' BACKGROUND='img_pack/rien.gif' class='verdana3' style='color:white;'><B>"; - echo _T('ical_titre_mailing')."</FONT></B></TD></TR>"; - echo "<TR><TD BACKGROUND='img_pack/rien.gif' class='serif'>"; echo _T('info_config_suivi_explication'); - echo "<p align='center'>$lien</p>\n"; - echo "</TD></TR>"; - echo "</TABLE>"; + echo "<p align='center'><b>$lien</b></p>\n"; - fin_cadre_relief(); - - echo "<p> <p>"; + fin_cadre_enfonce(); } @@ -63,13 +55,8 @@ if ($suivi_edito == "oui" AND strlen($adresse_suivi) > 3 AND strlen($adresse_sui /// Suivi par agenda iCal (taches + rendez-vous) /// -echo debut_cadre_relief("agenda-24.gif"); - -echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; -echo "<TR><TD BGCOLOR='$couleur_foncee' BACKGROUND='img_pack/rien.gif' class='verdana3' style='color:white;'><B>"; -echo _T('icone_calendrier')."</FONT></B></TD></TR>"; +debut_cadre_relief("agenda-24.gif", false, "", _T('icone_calendrier')); -echo "<TR><TD BACKGROUND='img_pack/rien.gif' class='serif'>"; echo _T('calendrier_synchro'); echo '<p>'._T('ical_info_calendrier').'</p>'; @@ -79,31 +66,24 @@ function afficher_liens_calendrier($lien, $icone, $texte) { global $adresse_site; echo debut_cadre_enfonce($icone); echo $texte; - echo "<div> </div>"; - echo "<div style='float: left; width: 200px;'>"; + echo "<table style='width: 100%;><tr'><td style='width: 200px;'>"; icone_horizontale (_T('ical_methode_http'), "$adresse_site/$lien", "calendrier-24.gif"); - echo "</div>"; - - echo "<div style='float: right; width: 200px;'>"; + echo "</td>"; + echo "<td> </td>"; + echo "<td style='width: 200px;'>"; $webcal = ereg_replace("https?://", "webcal://", $adresse_site); icone_horizontale (_T('ical_methode_webcal'), "$webcal/$lien", "calendrier-24.gif"); - echo "</div>"; - echo "<div style='clear:both;'></div>\n"; + echo "</td></tr></table>"; echo fin_cadre_enfonce(); } -afficher_liens_calendrier('ical.php3','site-24.gif', _T('ical_texte_public')); +afficher_liens_calendrier('ical.php3','', _T('ical_texte_public')); -echo '<br />'; afficher_liens_calendrier("spip_cal.php3?id=$connect_id_auteur&cle=".afficher_low_sec($connect_id_auteur,'ical'),'cadenas-24.gif', _T('ical_texte_prive')); -echo "</TD></TR>"; -echo "</TABLE>"; -echo fin_cadre_relief(); - -echo "<p> <p>"; +fin_cadre_relief(); @@ -111,18 +91,13 @@ echo "<p> <p>"; /// Suivi par RSS /// -echo debut_cadre_relief("site-24.gif"); - -echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; -echo "<TR><TD BGCOLOR='$couleur_foncee' BACKGROUND='img_pack/rien.gif' class='verdana3' style='color:white;'><B>"; -echo _T('ical_titre_rss')."</B></TD></TR>"; +debut_cadre_relief("site-24.gif", false, "", _T('ical_titre_rss')); -echo "<TR><TD BACKGROUND='img_pack/rien.gif' class='serif'>"; echo _T('ical_texte_rss'); echo "<p>"._T("ical_texte_rss_articles")."</p>"; -echo propre('<ul><cadre>'.$adresse_site.'/backend.php3</cadre></ul>'); +echo propre("<ul><cadre>".$adresse_site."/backend.php3</cadre></ul>"); echo "<p>"._T("ical_texte_rss_articles2")."</p>"; @@ -152,37 +127,21 @@ echo "<p>"._T("ical_texte_rss_articles2")."</p>"; } +fin_cadre_relief(); - -echo "</TD></TR>"; -echo "</TABLE>"; - -echo fin_cadre_relief(); - -echo "<p> <p>"; - - /// /// Suivi par Javascript /// -echo debut_cadre_relief("doc-24.gif"); - -echo "<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=3 WIDTH=\"100%\">"; -echo "<TR><TD BGCOLOR='$couleur_foncee' BACKGROUND='img_pack/rien.gif' class='verdana3' style='color:white;'><B>"; -echo _T('ical_titre_js')."</FONT></B></TD></TR>"; +debut_cadre_relief("doc-24.gif", false, "", _T('ical_titre_js')); -echo "<TR><TD BACKGROUND='img_pack/rien.gif' class='serif'>"; -echo _T('ical_texte_js').'<p>'; +echo _T('ical_texte_js').'<p />'; echo propre('<cadre><script type="text/javascript" src="'.$adresse_site.'/distrib.php3"></script></cadre>'); -echo "</TD></TR>"; -echo "</TABLE>"; - -echo fin_cadre_relief(); +fin_cadre_relief(); diff --git a/ecrire/win_png.htc b/ecrire/win_png.htc new file mode 100644 index 0000000000..cfe6d36e1e --- /dev/null +++ b/ecrire/win_png.htc @@ -0,0 +1,47 @@ +<public:component> +<public:attach event="onpropertychange" onevent="propertyChanged()" /> +<script> + +var supported = /MSIE (5\.5)|[6789]/.test(navigator.userAgent) && navigator.platform == "Win32"; +var realSrc; +var blankSrc = "img_pack/rien.gif"; + +if (supported) fixImage(); + +function propertyChanged() { + if (!supported) return; + + var pName = event.propertyName; + if (pName != "src") return; + // if not set to blank + if ( ! new RegExp(blankSrc).test(src)) + fixImage(); +}; + +function fixImage() { + // get src + var src = element.src; + + // check for real change + if (src == realSrc) { + element.src = blankSrc; + return; + } + + if ( ! new RegExp(blankSrc).test(src)) { + // backup old src + realSrc = src; + } + + // test for png + if ( /\.png$/.test( realSrc.toLowerCase() ) ) { + // set blank image + element.src = blankSrc; + // set filter + element.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + + src + "',sizingMethod='scale')"; + } +} + +</script> +</public:component> \ No newline at end of file diff --git a/ecrire/win_width.htc b/ecrire/win_width.htc new file mode 100644 index 0000000000..ef52df85e9 --- /dev/null +++ b/ecrire/win_width.htc @@ -0,0 +1,17 @@ +<public:component> +<PUBLIC:PROPERTY NAME="retrait"> +<script language="JScript"> + +function fixWidth(){ + if (element.className == "spip_cadre") retrait = 24; + else retrait = 16; + + style.width = element.offsetWidth - retrait; +} + +var supported = /MSIE (5\.5)|[6789]/.test(navigator.userAgent) && navigator.platform == "Win32"; +if (supported) fixWidth(); + +</script> +</public:component> + -- GitLab