diff --git a/ecrire/articles_versions.php3 b/ecrire/articles_versions.php3 index d0b86295d9c077821c66e70e18c81d5c6b4202d7..511f3e805ac96c5007194836f85d343c553234b1 100644 --- a/ecrire/articles_versions.php3 +++ b/ecrire/articles_versions.php3 @@ -107,6 +107,11 @@ fin_grand_cadre(); debut_gauche(); +debut_raccourcis(); +icone_horizontale(_T('icone_retour_article'), "articles.php3?id_article=$id_article", "article-24.gif","rien.gif"); +icone_horizontale(_T('icone_suivi_revisions'), "suivi_revisions.php3", "historique-24.gif","rien.gif"); +fin_raccourcis(); + ////////////////////////////////////////////////////// // Affichage de la colonne de droite @@ -170,7 +175,7 @@ if ($descriptif OR $url_site OR $nom_site) { echo "</td>"; echo "<td align='center'>"; -icone(_T('icone_retour_article'), "articles.php3?id_article=$id_article", "", "article-24.gif"); +icone(_T('icone_modifier_article'), "articles_edit.php3?id_article=$id_article", "article-24.gif", "edit.gif"); echo "</td>"; echo "</tr></table>"; diff --git a/ecrire/inc_suivi_revisions.php b/ecrire/inc_suivi_revisions.php index cf718b97cee3bc09878043263b1dd2b4a284d322..8d9975db450825897d631882a6ad641b0553561b 100644 --- a/ecrire/inc_suivi_revisions.php +++ b/ecrire/inc_suivi_revisions.php @@ -18,9 +18,6 @@ define("_ECRIRE_INC_SUIVI_REVISIONS", "1"); include_ecrire("inc_lab.php"); include_spip("ecrire.php"); -include_spip("revisions.php"); -include_spip("diff.php"); - function afficher_para_modifies ($texte, $court = false) { // Limiter la taille de l'affichage @@ -29,7 +26,7 @@ function afficher_para_modifies ($texte, $court = false) { $paras = explode ("\n",$texte); for ($i = 0; $i < count($paras) AND strlen($texte_ret) < $max; $i++) { - if (ereg("diff-", $paras[$i])) $texte_ret .= $paras[$i]."\n\n"; + if (strpos($paras[$i], '"diff-')) $texte_ret .= $paras[$i]."\n\n"; } $texte = $texte_ret; return $texte; @@ -160,18 +157,18 @@ function afficher_suivi_versions ($debut = 0, $id_secteur = 0, $uniq_auteur = fa } $textes = array(); foreach ($champs as $champ) { - if (!$new[$champ] && !$old[$champ]) continue; + if (!$new[$champ] && !$old[$champ]) continue; $diff = new Diff(new DiffTexte); $textes[$champ] = afficher_para_modifies(afficher_diff($diff->comparer(preparer_diff($new[$champ]), preparer_diff($old[$champ]))), $court); } - } + } echo debut_block_invisible("$id_version-$id_article-$id_auteur"); if (is_array($textes)) foreach ($textes as $var => $t) { if (strlen($t) > 0) { - echo "<blockquote class='spip serif1'>"; - echo propre($t).""; + echo "<blockquote class='serif1'>"; + echo propre($t); echo "</blockquote>"; } } diff --git a/ecrire/suivi_revisions.php3 b/ecrire/suivi_revisions.php3 index df9638a0a648f04ac68cfe4a29bae50650f49ec3..db852b21d00485a2d0d382f1a0ded1fc5b5857e2 100644 --- a/ecrire/suivi_revisions.php3 +++ b/ecrire/suivi_revisions.php3 @@ -40,6 +40,9 @@ else $req_where = " AND articles.statut IN ('prop','publie')"; echo "<p>"; + +debut_cadre_relief(); + echo "<div class='arial11'><ul>"; echo "<p>"; @@ -91,7 +94,10 @@ WHERE versions.id_article = articles.id_article AND versions.id_version > 1 AND } -echo "</ul></div>"; +echo "</ul></div>\n"; + +fin_cadre_relief(); + //////////////////////////////////////////////////////