From e663f01279d590d84b0d9fb1f8e4eb5df0bf6060 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <pitrou@free.fr>
Date: Mon, 24 Nov 2003 22:12:51 +0000
Subject: [PATCH] simplifier raccourcis + nouvelle icone suivi
---
.gitattributes | 1 +
ecrire/img_pack/suivi-48.gif | Bin 0 -> 1521 bytes
ecrire/inc_presentation.php3 | 2 +-
ecrire/index.php3 | 48 +++++++++++------------------------
4 files changed, 17 insertions(+), 34 deletions(-)
create mode 100644 ecrire/img_pack/suivi-48.gif
diff --git a/.gitattributes b/.gitattributes
index 6aee316950..4f595640ed 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -198,6 +198,7 @@ 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/suivi-forum-24.gif -text
ecrire/img_pack/supprimer.gif -text
ecrire/img_pack/tirets-separation.gif -text
diff --git a/ecrire/img_pack/suivi-48.gif b/ecrire/img_pack/suivi-48.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1bed4b985cf631e53b8f7e6217cda4dda69fab09
GIT binary patch
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
literal 0
HcmV?d00001
diff --git a/ecrire/inc_presentation.php3 b/ecrire/inc_presentation.php3
index b7cd3786da..2b2742063a 100644
--- a/ecrire/inc_presentation.php3
+++ b/ecrire/inc_presentation.php3
@@ -1382,7 +1382,7 @@ function debut_page($titre = "", $rubrique = "asuivre", $sous_rubrique = "asuivr
if ($connect_statut == "0minirezo") {
bandeau_barre_verticale();
if ($connect_toutes_rubriques)
- icone_bandeau_principal (_T('icone_suivi_actualite'), "controle_forum.php3", "statistiques-48.gif", "suivi", $rubrique);
+ 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);
}
diff --git a/ecrire/index.php3 b/ecrire/index.php3
index cdbb617e74..bc743ae931 100644
--- a/ecrire/index.php3
+++ b/ecrire/index.php3
@@ -112,9 +112,15 @@ fin_cadre_relief();
//
-// Afficher le calendrier du mois s'il y a des rendez-vous
+// Annonces
//
include_ecrire("inc_agenda.php3");
+afficher_taches();
+
+
+//
+// Afficher le calendrier du mois s'il y a des rendez-vous
+//
if (lire_meta('activer_messagerie') != 'non' AND $connect_activer_messagerie != "non" AND $options == "avancees") {
$today = getdate(time());
@@ -155,10 +161,14 @@ if ($options != 'avancees') {
fin_boite_info();
}
-debut_raccourcis();
+
+
//
-// Afficher les boutons de creation d'article et de breve
+// Afficher les raccourcis : boutons de creation d'article et de breve, etc.
//
+
+debut_raccourcis();
+
$query = "SELECT id_rubrique FROM spip_rubriques LIMIT 0,1";
$result = spip_query($query);
@@ -179,41 +189,13 @@ if ($connect_statut == '0minirezo' and $connect_toutes_rubriques) {
icone_horizontale(_T('icone_creer_rubrique_2'), "rubriques_edit.php3?new=oui", "rubrique-24.gif","creer.gif");
}
-
-
-if ($options == "avancees") {
- echo "<p>";
- if (lire_meta("activer_messagerie") == 'oui' AND $connect_activer_messagerie != 'non') {
- icone_horizontale(_T('icone_messagerie_personnelle'), "messagerie.php3", "messagerie-24.gif");
- }
-
- icone_horizontale(_T('titre_forum'), "forum.php3", "forum-interne-24.gif","rien.gif");
-
- if ($connect_statut == "0minirezo") {
- if (lire_meta('forum_prive_admin') == 'oui') {
- icone_horizontale(_T('titre_page_forum'), "forum_admin.php3", "forum-admin-24.gif");
- }
- echo "<p>";
- if (lire_meta("activer_statistiques") == 'oui')
- icone_horizontale(_T('icone_statistiques'), "statistiques_visites.php3", "statistiques-24.gif");
- icone_horizontale(_T('titre_page_forum_suivi'), "controle_forum.php3", "suivi-forum-24.gif");
- if ($connect_toutes_rubriques)
- icone_horizontale(_T('texte_vider_cache'), "admin_vider.php3", "cache-24.gif");
- }
-}
-else if ($connect_statut == '0minirezo' and $connect_toutes_rubriques) {
+if ($connect_statut == '0minirezo' && $connect_toutes_rubriques && $options == "avancees") {
echo "<p>";
- icone_horizontale(_T('icone_configurer_site'), "configuration.php3", "administration-24.gif");
+ icone_horizontale(_T('texte_vider_cache'), "admin_vider.php3", "cache-24.gif");
}
fin_raccourcis();
-//
-// Annonces
-//
-afficher_taches();
-
-
debut_droite();
--
GitLab