diff --git a/ecrire/articles.php3 b/ecrire/articles.php3 index 208a7b8ec2f5bba8b4bc786e15c8388e5495311d..25f54ece956892949d2bc7beedd75def52390064 100644 --- a/ecrire/articles.php3 +++ b/ecrire/articles.php3 @@ -297,17 +297,6 @@ if ($statut_article == "publie") { echo "<font face='Verdana,Arial,Helvetica,sans-serif' size='1'><b>ARTICLE NUMÉRO :</b></font>\n"; echo "<br><font face='Verdana,Arial,Helvetica,sans-serif' size='6'><b>$id_article</b></font>\n"; -if ($statut_article == 'publie' AND $connect_statut=='0minirezo' AND acces_rubrique($id_rubrique)) { - $req = "SELECT count(*) FROM spip_forum WHERE id_article=$id_article AND FIND_IN_SET(statut,'publie,off,prop')"; - if ($row = mysql_fetch_row(spip_query($req))) { - $nb_forums = $row[0]; - if ($nb_forums) { - echo "<br><a ".newLinkHref("articles_forum.php3?id_article=$id_article").">\n"; - echo "<b>Forum public : $nb_forums contribution(s)</b></a>\n"; - } - } -} - @@ -437,6 +426,18 @@ if ($connect_statut == '0minirezo' AND acces_rubrique($rubrique_article) AND $op echo "</form>"; echo fin_block(); + + if ($statut_article == 'publie' AND $connect_statut=='0minirezo' AND acces_rubrique($id_rubrique)) { + $req = "SELECT count(*) FROM spip_forum WHERE id_article=$id_article AND FIND_IN_SET(statut,'publie,off,prop')"; + if ($row = mysql_fetch_row(spip_query($req))) { + $nb_forums = $row[0]; + if ($nb_forums) { + icone_horizontale("Suivi du forum public : $nb_forums contribution(s)", "articles_forum.php3?id_article=$id_article", "suivi-forum-24.gif", ""); + } + } + } + + echo "<br>\n"; @@ -565,6 +566,11 @@ if ($connect_statut == '0minirezo' AND acces_rubrique($rubrique_article) AND $op if ($connect_statut=="0minirezo" AND $options=="avancees"){ + + if (substr($chapo, 0, 1) == '=') { + $virtuel = substr($chapo, 1, strlen($chapo)); + } + echo "<center><table width='100%' cellpadding='2' border='1' class='hauteur'>\n"; echo "<tr><td width='100%' align='left' bgcolor='#FFCC66'>\n"; echo "<font face='Verdana,Arial,Helvetica,sans-serif' size='2' color='#333333'><b>\n"; @@ -576,9 +582,15 @@ if ($connect_statut == '0minirezo' AND acces_rubrique($rubrique_article) AND $op echo "\n<INPUT TYPE='hidden' NAME='id_article' VALUE='$id_article'>"; echo "\n<INPUT TYPE='hidden' NAME='changer_virtuel' VALUE='oui'>"; + if (strlen($virtuel) != 0) { + echo "<INPUT TYPE='text' NAME='virtuel' CLASS='forml' style='font-size:9px;' VALUE=\"$virtuel\" SIZE='40'><br>"; + } + echo debut_block_invisible("virtuel"); - if (strlen($virtuel) == 0) $virtuel = "http://"; - echo "<INPUT TYPE='text' NAME='virtuel' CLASS='forml' style='font-size:9px;' VALUE=\"$virtuel\" SIZE='40'><P>"; + if (strlen($virtuel) == 0) { + $virtuel = "http://"; + echo "<INPUT TYPE='text' NAME='virtuel' CLASS='forml' style='font-size:9px;' VALUE=\"$virtuel\" SIZE='40'><br>"; + } echo "<font face='Verdana,Arial,Helvetica,sans-serif' size=2>"; echo "(<b>Article virtuel :</b> article référencé dans votre site SPIP, mais redirigé vers une autre URL.)"; echo "</font>"; diff --git a/ecrire/articles_edit.php3 b/ecrire/articles_edit.php3 index 93fb4675059b5b92c62fbe4da2fcbf79e568ff25..3b200fa7f6737dc4b158d4c22e012d2227a19b50 100644 --- a/ecrire/articles_edit.php3 +++ b/ecrire/articles_edit.php3 @@ -376,26 +376,30 @@ echo "<P><HR><P>"; echo "<td width=10> </td>"; echo "<td valign='top' width='50%'>"; if (strlen($virtuel) == 0) $virtuel = "http://"; - echo "<INPUT TYPE='text' NAME='virtuel' CLASS='forml' style='font-size:9px;' VALUE=\"$virtuel\" SIZE='40'><P>"; + echo "<INPUT TYPE='text' NAME='virtuel' CLASS='forml' style='font-size:9px;' VALUE=\"$virtuel\" SIZE='40'>"; echo "</td></tr></table>\n"; echo "<font face='Verdana,Arial,Helvetica,sans-serif' size=2>"; echo "<b>Article virtuel :</b> article référencé dans votre site SPIP, mais redirigé vers une autre URL. Pour supprimer la redirection, effacez l'URL ci-dessus."; echo "</font>"; echo "</div><p>\n"; } - - echo "<HR>"; - - if (($articles_chapeau != "non") OR strlen($chapo) > 0) { - echo "<B>Chapeau</B>"; - echo aide ("artchap"); - echo "<BR>(Texte introductif de l'article.)<BR>"; - echo "<TEXTAREA NAME='chapo' CLASS='forml' ROWS='5' COLS='40' wrap=soft>"; - echo $chapo; - echo "</TEXTAREA><P>\n"; - } + else { - echo "<INPUT TYPE='hidden' NAME='chapo' VALUE=\"$chapo\">"; + + echo "<HR>"; + + if (($articles_chapeau != "non") OR strlen($chapo) > 0) { + echo "<B>Chapeau</B>"; + echo aide ("artchap"); + echo "<BR>(Texte introductif de l'article.)<BR>"; + echo "<TEXTAREA NAME='chapo' CLASS='forml' ROWS='5' COLS='40' wrap=soft>"; + echo $chapo; + echo "</TEXTAREA><P>\n"; + } + else { + echo "<INPUT TYPE='hidden' NAME='chapo' VALUE=\"$chapo\">"; + } + }