From 37fddec732c4de896f3ad9a462fd210df4d40935 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Thu, 4 Jan 2007 23:22:41 +0000
Subject: [PATCH] =?UTF-8?q?P=C3=A9touilles=20XHTML.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc/presentation.php | 7 +++----
ecrire/public/debug.php | 9 +++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index 9f05f61a5b..5d900d4d30 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -910,22 +910,21 @@ function afficher_breves_boucle($row, &$tous_id, $voir_logo, $own)
$s = "\n<div>";
$s .= "<a href='" . generer_url_ecrire("breves_voir","id_breve=$id_breve") . "' style=\"display:block;\">";
-
if ($voir_logo) {
$chercher_logo = charger_fonction('chercher_logo', 'inc');
if ($logo = $chercher_logo($id_breve, 'id_breve', 'on')) {
list($fid, $dir, $nom, $format) = $logo;
$logo = ratio_image($fid, $nom, $format, 26, 20, "alt=''");
if ($logo)
- $s .= "\n<div style='float: $spip_lang_right; margin-top: -2px; margin-bottom: -2px;'>$logo</div>";
+ $s .= "\n<span style='float: $spip_lang_right; margin-top: -2px; margin-bottom: -2px;'>$logo</span>";
}
}
-
$s .= typo($titre);
if ($afficher_langue AND $lang != $langue_defaut)
$s .= " <span style='font-size: 10px; color: #666666'$dir_lang>(".traduire_nom_langue($lang).")</span>";
$s .= "</a>";
+
$s .= "</div>";
$vals[] = $s;
@@ -1824,7 +1823,7 @@ function meme_rubrique($id_rubrique, $id, $type, $order='date', $limit=30, $ajax
$retour = bandeau_titre_boite2($icone, 'article-24.gif','','',false)
. "\n<table style='font-size: 11px; background-color: #e0e0e0;border: 0px; padding-left:4px;'>"
. $retour
- . (($limit >= 0) ? ''
+ . (($limit <= 0) ? ''
: "<tr><td colspan='3' style='text-align: center'>+ $limit</td></tr>")
. "</table>";
diff --git a/ecrire/public/debug.php b/ecrire/public/debug.php
index 444a7e64ca..cd13f94391 100644
--- a/ecrire/public/debug.php
+++ b/ecrire/public/debug.php
@@ -322,7 +322,7 @@ function ancre_texte($texte, $fautifs=array())
$ancre = md5($texte);
$n = strlen(count($tableau));
- $format = "<a href='#T%s'><span id='L%d' style='text-align: right;color: black;%s'>%0"
+ $format = "<a href='#T%s' title=\"%s\"><span id='L%d' style='text-align: right;color: black;%s'>%0"
. strval($n)
. "d </span></a>\n";
@@ -343,15 +343,16 @@ function ancre_texte($texte, $fautifs=array())
if (isset($flignes[$i])) {
$ligne = str_replace(' ',' ', $ligne);
$indexmesg = $flignes[$i][1];
+ $err = textebrut($flignes[$i][2]);
// tentative de pointer sur la colonne fautive;
// marche pas car highlight_string rajoute des entites. A revoir.
// $m = $flignes[$i][0];
// $ligne = substr($ligne, 0, $m-1) .
// sprintf($formaterr, substr($ligne,$m));
$bg = $formaterr;
- } else {$indexmesg = $ancre; $bg='';}
+ } else {$indexmesg = $ancre; $err= $bg='';}
$res .= "<br />\n"
- . sprintf((($i%10) ? $format :$format10), $indexmesg, $i, $bg, $i)
+ . sprintf((($i%10) ? $format :$format10), $indexmesg, $err, $i, $bg, $i)
. $ligne;
$i++;
}
@@ -603,7 +604,7 @@ function emboite_texte($texte, $fonc='',$self='')
. "</a></td><td style='text-align: right'>"
. $fin
. "</td><td>$msg</td></tr>\n";
- $fautifs[]= array($ligne, $col, $i);
+ $fautifs[]= array($ligne, $col, $i, $msg);
}
$err = "<h2 style='text-align: center'>"
. $i
--
GitLab