From efeb994d0deccfc5f2f741483637aefeedaee3b8 Mon Sep 17 00:00:00 2001
From: ARNO* <arno@rezo.net>
Date: Thu, 23 Sep 2004 10:29:13 +0000
Subject: [PATCH] Cosmetique: graphisme des suivis de forums
---
.gitattributes | 1 +
ecrire/controle_forum.php3 | 40 +++++++++++++++++-----------
ecrire/forum.php3 | 4 ++-
ecrire/img_pack/forum-admin-24.gif | Bin 457 -> 281 bytes
ecrire/img_pack/forum-public-24.gif | Bin 0 -> 256 bytes
ecrire/img_pack/suivi-forum-24.gif | Bin 300 -> 301 bytes
ecrire/inc_forum.php3 | 2 +-
ecrire/inc_presentation.php3 | 33 ++++++++++++++---------
8 files changed, 49 insertions(+), 31 deletions(-)
create mode 100644 ecrire/img_pack/forum-public-24.gif
diff --git a/.gitattributes b/.gitattributes
index 1ecbb96f1a..ca044ad2a5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -125,6 +125,7 @@ ecrire/img_pack/forum-admin-24.gif -text
ecrire/img_pack/forum-droite.gif -text
ecrire/img_pack/forum-droite_rtl.gif -text
ecrire/img_pack/forum-interne-24.gif -text
+ecrire/img_pack/forum-public-24.gif -text
ecrire/img_pack/forum-vert.gif -text
ecrire/img_pack/groupe-mot-24.gif -text
ecrire/img_pack/heures-am.png -text
diff --git a/ecrire/controle_forum.php3 b/ecrire/controle_forum.php3
index 031609795a..8e70efb947 100644
--- a/ecrire/controle_forum.php3
+++ b/ecrire/controle_forum.php3
@@ -123,21 +123,30 @@ function controle_forum($row, $rappel) {
$type = $r['type'];
$valeur = $r['valeur'];
$pref = $r['pref'];
-
+
+ $cadre = "";
+
$controle = "\n<br /><br /><a id='$id_forum'></a>";
+
+// $controle.= "[$forum_stat]";
+ if ($forum_stat == "prive") $logo = "forum-interne-24.gif";
+ else if ($forum_stat == "privadm") $logo = "forum-admin-24.gif";
+ else if ($forum_stat == "privrac") $logo = "forum-admin-24.gif";
+ else $logo = "forum-public-24.gif";
+
+ $controle .= debut_cadre_thread_forum("", true, "", typo($forum_titre));
- if ($forum_stat=="off" OR $forum_stat == "privoff")
- $controle .= "<div style='border: 2px #ff0000 dashed; background-color: white;'>";
- else if ($forum_stat=="prop")
+ if ($forum_stat=="off" OR $forum_stat == "privoff") {
+ $controle .= "<div style='border: 2px #ff0000 dashed;'>";
+ }
+ else if ($forum_stat=="prop") {
$controle .= "<div style='border: 2px yellow solid; background-color: white;'>";
+ }
else {
- $controle .= "<div style='border-right: 1px solid #cccccc; border-bottom: 1px solid #cccccc;'>" .
- "<div style='border: 1px #999999 dashed; background-color: white;'>";
+ $controle .= "<div>";
}
-
- $controle .= "<table width=100% cellpadding=0 cellspacing=0 border=0><tr><td width=100% valign='top'><table width=100% cellpadding=5 cellspacing=0><tr><td bgcolor='$couleur_foncee'><font face='verdana,arial,sans,sans-serif' size=2 color='#ffffff'><b>" .
- typo($forum_titre).
- "</b></font></td></tr><tr><td class='serif'><span class='arial2'>" .
+
+ $controle .= "<table width=100% cellpadding=0 cellspacing=0 border=0><tr><td width=100% valign='top'><table width=100% cellpadding=5 cellspacing=0><tr><td class='serif'><span class='arial2'>" .
affdate_heure($forum_date_heure) .
"</span>";
if ($forum_auteur) {
@@ -153,7 +162,7 @@ function controle_forum($row, $rappel) {
$id_forum,
_T('icone_supprimer_message'),
"controle_forum.php3?$rappel#$id_forum",
- "forum-interne-24.gif",
+ $logo,
"supprimer.gif");
else if ($forum_stat == "prive" OR $forum_stat == "privrac" OR $forum_stat == "privadm")
$controle .=
@@ -161,7 +170,7 @@ function controle_forum($row, $rappel) {
$id_forum,
_T('icone_supprimer_message'),
"controle_forum.php3?$rappel#$id_forum",
- "forum-interne-24.gif",
+ $logo,
"supprimer.gif");
}
else {
@@ -178,7 +187,7 @@ function controle_forum($row, $rappel) {
$id_forum,
_T('icone_valider_message'),
"controle_forum.php3?$rappel&#$id_forum",
- "forum-interne-24.gif",
+ $logo,
"creer.gif") .
controle_cache_forum('valid_forum',
$id_forum,
@@ -210,9 +219,8 @@ function controle_forum($row, $rappel) {
$controle .= "</TD></TR></TABLE>";
$controle .= "</TD></TR></TABLE>\n";
- if (!($forum_stat == 'off' OR $forum_stat == 'privoff' OR $forum_stat=='prop'))
- $controle .= "</div>";
- $controle .= "</div>";
+
+ $controle .= "</div>".fin_cadre_thread_forum(true);
return $controle;
}
diff --git a/ecrire/forum.php3 b/ecrire/forum.php3
index a0f06317bf..90f3fff6af 100644
--- a/ecrire/forum.php3
+++ b/ecrire/forum.php3
@@ -6,10 +6,12 @@ include ("inc.php3");
if ($admin=='oui') {
debut_page(_T('titre_page_forum'), "redacteurs", "forum-admin");
$statutforum = 'privadm';
+ $logo = "forum-admin-24.gif";
$urlforum = 'forum_admin.php3';
} else {
debut_page(_T('titre_forum'), "redacteurs", "forum-interne");
$statutforum = 'privrac';
+ $logo = "forum-interne-24.gif";
$urlforum = 'forum.php3';
}
@@ -61,7 +63,7 @@ if ($total > 10) {
echo "<p><div align='center'>";
-icone (_T('icone_poster_message'), "forum_envoi.php3?statut=$statutforum&adresse_retour=$urlforum&titre_message=".urlencode(filtrer_entites(_T('texte_nouveau_message'))), "forum-interne-24.gif", "creer.gif");
+icone (_T('icone_poster_message'), "forum_envoi.php3?statut=$statutforum&adresse_retour=$urlforum&titre_message=".urlencode(filtrer_entites(_T('texte_nouveau_message'))), $logo, "creer.gif");
echo "</div>";
diff --git a/ecrire/img_pack/forum-admin-24.gif b/ecrire/img_pack/forum-admin-24.gif
index 5d43a58a530102a797ec416500ae140c0b9a4903..e459824348a28ccb21e7320d39f9e775b7228626 100644
GIT binary patch
literal 281
zcmV+!0p|WkNk%w1VHf}y0J9GOva+&<hKAGA(`RRAg@uLu{QRDtp78MSjg5_hf`V37
zR)>d&Gcz-0W@i8Y|L*SYA^8LW000jFEC2ui02lxm000EW@X1N5rJ|`ey8oZn2#=r$
zj&rPR+oooQ3dmyLIF8JU;s^-_BM=Z0jm2Rif!a6>!PJ5wr8=h4gu&5hI1q$|RD31d
zqyz-l3(mQ7>GhW&wAH5!cf32dVy}KUdu(B2hGjQ{b8n0biePt*iE4ZRQHYWW09-x?
z2ni`mqNAe-2M!7Yn+E^}uCK7L0H**04+;PUDFwO?yuZIGtO^qipeZUn%FD_L6bPHU
fxEIv7y#);h)zkyh+S?auCg0!|%H`<k6cGSBjzf3o
literal 457
zcmV;)0XF_eNk%w1VHf}y0K^{v4Gas|*Vfm@vF_#BnU<8{;NQBYigjmFk%oB1vYE-r
z$?4k1r;~Std22{OH_yAHz`wn*or7CaMd8o5esEp9w5!z5$?)pqXJA$_Eh(s|r}y#d
zk$_;etDp1l>hA9DA^8LW0018VEC2ui02lxm000I5;3tk`X`Up6IRKDBXVprYNMIR&
z91;~}1d>JqAV3hg3^1UeI1rZwqxjJ{G89N*yRcXamyV=S*enE#P78pk47QVjd~+cj
z$^$_nl9=cl5CZ{%0uu`h0~Z(<c?Jdy91)HJj|mG94-bWi7Y!B*4-pbd2M7$35ex|l
z9hru59Ss9}PZ>QN45ty29SIMwc^Cl|q6h>IJqV_|y9U0m6Brf=5(f+w0>~5%xD1aJ
z2)j=U2pH828g3oP+#EziYz`M57^}X&4h94b4jk?}8Wa!!;9*cKACd$-$e_%D!y+&~
zKmY)tLIV#TC|JvIszEgh8J?6F=paG|4;l_elybnMnnNQd1}Zxsrw0Ze99%R&@nIkU
z4hRMyVEGRNfeJjUgycYB0m~K*f+Q88K?$xF7&JtjN|glw8e6%F9ZR+>&kz7Rf>xnw
diff --git a/ecrire/img_pack/forum-public-24.gif b/ecrire/img_pack/forum-public-24.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cce445faa8e8cb76f7b3a11a9a40897f6fa1d0df
GIT binary patch
literal 256
zcmV+b0ssC-Nk%w1VHf}y0J9GOySuyA*4E?W<Fc}{>FMdCqoaa?g8u&g{QUfGZf@}K
z@MmXdR#sMKW@i8Y|L*SYA^8LW000jFEC2ui02lxm000E7@X1N5rJ=F5y8oZn1W&*O
zj-#w>+oooQ7ENv6_)<6~;}iu!YDg>!fR2qLAuKwHf`p?sJv^_DLu0yaSg}qmw+aq-
zyWjFqO!caXZ1j75CeO2V1K{oe7^Xe}3jhR#hKGj$BS{GZ4gv-Vl9QB_1}Fmw4-5kc
zDF~hpprfNH3Ihxi4Sz!l46m@UuLcwbj-Q+tx|^X04F$WpQlbpN!54of#>W=0%+Jsi
G5db>`jcpJB
literal 0
HcmV?d00001
diff --git a/ecrire/img_pack/suivi-forum-24.gif b/ecrire/img_pack/suivi-forum-24.gif
index 8ade7cdb48fcfeba00396d5710a4483f008ff89c..31b7614bf86f0b1ce35f0f994287385cdfceacef 100644
GIT binary patch
literal 301
zcmV+|0n+|QNk%w1VHf}y0J9GO+S=H#u&R}nj)8%F%gMDpJveS|Zv6cGXJ=>r{{Har
z@Bsk<R#sMKW@i8Y|L*SYA^8LW000jFEC2ui02lxm000Eq@X1N5rJ%8fy8oZn01v<b
zj-#w>+oooQ22E|>I1)G};{*XzYDgq11iOvHAS4zR3ttgnaMY{`VxkZr5C(-}qG2UB
zvWiqe08kJD18Hhp#;Q^aLgF0|EVO23SwndMKmr4QLv&YXPDp(M267IJf<*-b0+LXG
zb&f?0P*0t6fer&ZMMY4Ga8^D5Ixe)W1S1X%20H))1_-~wz`zErGX@U~0S74u%nr`c
z(NGEj3=<6lMhx8D-rNHeNJ9t87w5^(2Mq$~=T*=Q?d}%>Jo5DC-TD0e6cGSB$7gcZ
literal 300
zcmV+{0n`3RNk%w1VHf}y0K^{vySuyV>+7wml$V!{t*olmw`aqzfyBhbo}QRaPDr$q
zM*#r={{H@jg?HrS<loV;;NZ~G($blXOLTN>F)=NLYcRI9qs`5?!ojUZMnUlK@b>oa
zkB@=Y)4<QeqvYh|A^8LW0018VEC2ui02lxm000H4;3tk`X`X1Ru58OLaGb$OyD&IT
zAsxn1FNS8A89)LUOQWW`X#j^shmjO;7AvP_v$#Mkg26Q_Bn&bfFoH8-rnEy!V?BY9
zH3I+uk$`2QSZ@pggoPS}fPo@0jEo5g2Lu5CjEe&u9tE144_pfb5e}3eF{A_(9tH}l
ytPTWzqJee`92f!>xVaJ%Fa!><CXK=q0KdRZ2YSlO2tZlFl`hiL)YaA^Apko+Uw%;l
diff --git a/ecrire/inc_forum.php3 b/ecrire/inc_forum.php3
index bad51a523b..8f44be32d3 100644
--- a/ecrire/inc_forum.php3
+++ b/ecrire/inc_forum.php3
@@ -45,7 +45,7 @@ function changer_statut_forum($id_forum, $statut) {
}
// Installer un bouton de moderation (securise) dans l'espace prive
-function controle_cache_forum($action, $id, $texte, $lien, $fond, $fonc) {
+function controle_cache_forum($action, $id, $texte, $lien, $fond, $fonction) {
$link = $GLOBALS['clean_link'];
$link->addvar('controle_forum', $action);
$link->addvar('id_controle_forum', $id);
diff --git a/ecrire/inc_presentation.php3 b/ecrire/inc_presentation.php3
index c84b91ef7c..2a0018fe2c 100644
--- a/ecrire/inc_presentation.php3
+++ b/ecrire/inc_presentation.php3
@@ -1142,6 +1142,12 @@ function afficher_forum($request, $adresse_retour, $controle_id_article = 0) {
$statut=$row['statut'];
$ip=$row["ip"];
$id_auteur=$row["id_auteur"];
+
+ $forum_stat = $statut;
+ if ($forum_stat == "prive") $logo = "forum-interne-24.gif";
+ else if ($forum_stat == "privadm") $logo = "forum-admin-24.gif";
+ else if ($forum_stat == "privrac") $logo = "forum-admin-24.gif";
+ else $logo = "forum-public-24.gif";
if ($compteur_forum==1) echo "\n<br /><br />";
$afficher = ($controle_id_article) ? ($statut!="perso") :
@@ -1165,19 +1171,20 @@ function afficher_forum($request, $adresse_retour, $controle_id_article = 0) {
echo "\n<td width=100% valign='top'>";
+
+ if ($compteur_forum == 1) echo debut_cadre_forum($logo, false, "", typo($titre));
+ else echo debut_cadre_thread_forum("", false, "", typo($titre));
+
// Si refuse, cadre rouge
if ($statut=="off") {
- echo "<table width=100% cellpadding=2 cellspacing=0 border=0><tr><td>";
+ echo "<div style='border: 2px dashed red; padding: 5px;'>";
}
// Si propose, cadre jaune
else if ($statut=="prop") {
- echo "<table width=100% cellpadding=2 cellspacing=0 border=0><tr><td>";
+ echo "<div style='border: 1px solid yellow; padding: 5px;'>";
}
-
- if ($compteur_forum == 1) echo debut_cadre_forum("forum-interne-24.gif", false, "", typo($titre));
- else echo debut_cadre_thread_forum("", false, "", typo($titre));
-
- echo "<span class='arial2'>";
+
+ echo "<span class='arial2'>";
echo affdate_court($date_heure);
echo ", ";
echo heures($date_heure).":".minutes($date_heure);
@@ -1201,7 +1208,7 @@ function afficher_forum($request, $adresse_retour, $controle_id_article = 0) {
$id_forum,
_T('icone_supprimer_message'),
"articles_forum.php3?id_article=$controle_id_article&debut=$debut#$id_forum",
- "forum-interne-24.gif",
+ $logo,
"supprimer.gif");
}
else {
@@ -1216,7 +1223,7 @@ function afficher_forum($request, $adresse_retour, $controle_id_article = 0) {
$id_forum,
_T('icone_valider_message'),
"articles_forum.php3?id_article=$id_article&debut=$debut#$id_forum",
- "forum-interne-24.gif",
+ $logo,
"creer.gif");
}
}
@@ -1246,13 +1253,13 @@ function afficher_forum($request, $adresse_retour, $controle_id_article = 0) {
}
}
+
+ if ($statut == "off" OR $statut == "prop") echo "</div>";
if ($compteur_forum == 1) echo fin_cadre_forum();
else echo fin_cadre_thread_forum();
- if ($statut == "off" OR $statut == "prop") {
- echo "</td></tr></table>";
- }
+
echo "</td></tr></table>\n";
afficher_thread_forum($id_forum,$adresse_retour,$controle_id_article);
@@ -1728,7 +1735,7 @@ function barre_onglets($rubrique, $onglet){
}
if ($rubrique == "suivi_forum"){
- onglet(_T('onglet_messages_publics'), "controle_forum.php3?page=public", "public", $onglet, "racine-site-24.gif");
+ onglet(_T('onglet_messages_publics'), "controle_forum.php3?page=public", "public", $onglet, "forum-public-24.gif");
onglet(_T('onglet_messages_internes'), "controle_forum.php3?page=interne", "interne", $onglet, "forum-interne-24.gif");
$query_forum = "SELECT * FROM spip_forum WHERE statut='publie' AND texte='' LIMIT 0,1";
--
GitLab