From c85763d68df547ec535dff0bb01705fe82aa3231 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sun, 21 Oct 2007 07:27:04 +0000
Subject: [PATCH] =?UTF-8?q?P=C3=A9touilles=20XHTML=20strict.=20En=20partic?=
=?UTF-8?q?ulier,=20remplacement=20dans=20les=20CSS=20des=20#menu=5Flangue?=
=?UTF-8?q?=20par=20.menu=5Flangue=20car=20dans=20les=20sites=20multi-ling?=
=?UTF-8?q?ue=20il=20y=20a=202=20menu=20de=20langues,=20on=20ne=20peut=20p?=
=?UTF-8?q?as=20avoir=20le=20me=20ID.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
dist/habillage.css | 2 +-
dist/prive/article_infos.html | 2 +-
dist/style_prive.html | 2 +-
ecrire/inc/editer_mot.php | 14 +++++++-------
ecrire/inc/lang.php | 5 +++--
ecrire/inc/presentation.php | 4 ++--
6 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/dist/habillage.css b/dist/habillage.css
index fee588fd9f..a3b111c013 100755
--- a/dist/habillage.css
+++ b/dist/habillage.css
@@ -152,7 +152,7 @@ ul.choix_mots label { display: inline; }
.formulaire_recherche .forml {}
/* Menu langues */
-#menu_langues { background: none; margin: 0; padding: 1em 0; vertical-align: top; }
+.menu_langues { background: none; margin: 0; padding: 1em 0; vertical-align: top; }
.formulaire_menu_lang { background: none; margin: 0; padding: 1em 0; }
diff --git a/dist/prive/article_infos.html b/dist/prive/article_infos.html
index 36ad403c24..670ee4db2f 100644
--- a/dist/prive/article_infos.html
+++ b/dist/prive/article_infos.html
@@ -43,7 +43,7 @@
|?{[(#AUTORISER{voirrevisions,article,#ID_ARTICLE})]}
|?{
[(#VAL{info_historique_lien}|_T
- |icone_horizontale{?exec=articles_versions&id_article=#ID_ARTICLE,
+ |icone_horizontale{?exec=articles_versions&id_article=#ID_ARTICLE,
historique-24.gif,rien.gif,0}
)]
})]
diff --git a/dist/style_prive.html b/dist/style_prive.html
index d31a07f758..51cf85bbac 100644
--- a/dist/style_prive.html
+++ b/dist/style_prive.html
@@ -566,7 +566,7 @@ div.navigation-calendrier { background-color: #GET{foncee}; }
.option_separateur_statut_auteur { background: #GET{claire}; }
/* menu langues */
-#menu_langues.lang_ecrire { max-height: 24px; border: 1px solid #FFF; color: white; width: 100px; background: #GET{foncee}; }
+.lang_ecrire { max-height: 24px; border: 1px solid #FFF; color: white; width: 100px; background: #GET{foncee}; }
/* selecteur ajax */
#choix_parent_principal { background: #FFF; border: 1px solid #GET{foncee}; position: relative; height: 170px; overflow: auto; }
diff --git a/ecrire/inc/editer_mot.php b/ecrire/inc/editer_mot.php
index 22ba3e5fef..77b56d1352 100644
--- a/ecrire/inc/editer_mot.php
+++ b/ecrire/inc/editer_mot.php
@@ -253,7 +253,7 @@ function formulaire_mot_remplace($id_groupe, $id_mot, $url_base, $table, $table_
// forcer le recalcul du noeud car on est en Ajax
$jscript1 = "findObj_forcer('$ancre').style.visibility='visible';";
- $corps = "\n<select name='nouv_mot' id='nouv_mot' onchange=\"$jscript1\""
+ $corps = "\n<select name='nouv_mot' id='nouv_mot$id_groupe' onchange=\"$jscript1\""
. " class='fondl spip_xx-small' style='width:90px;'>"
. $s
. "</select>\n " ;
@@ -360,11 +360,11 @@ function menu_mots($row, $id_groupes_vus, $les_mots)
$jscript = "onfocus=\"$jscript1 $jscript2\"";
if ($obligatoire)
- $res .= "<input type='text' name='cherche_mot' id='cherche_mot' class='fondl' style='width: 180px; background-color:#E86519;' value=\"$titre_groupe\" size='20' $jscript />";
+ $res .= "<input type='text' name='cherche_mot' id='cherche_mot$id_groupe' class='fondl' style='width: 180px; background-color:#E86519;' value=\"$titre_groupe\" size='20' $jscript />";
else if ($unseul)
- $res .= "<input type='text' name='cherche_mot' id='cherche_mot' class='fondl' style='width: 180px; background-color:#cccccc;' value=\"$titre_groupe\" size='20' $jscript />";
+ $res .= "<input type='text' name='cherche_mot' id='cherche_mot$id_groupe' class='fondl' style='width: 180px; background-color:#cccccc;' value=\"$titre_groupe\" size='20' $jscript />";
else
- $res .= "<input type='text' name='cherche_mot' id='cherche_mot' class='fondl' style='width: 180px; ' value=\"$titre_groupe\" size='20' $jscript />";
+ $res .= "<input type='text' name='cherche_mot' id='cherche_mot$id_groupe' class='fondl' style='width: 180px; ' value=\"$titre_groupe\" size='20' $jscript />";
$res .= "<input type='hidden' name='select_groupe' value='$id_groupe' /> ";
return array($res, _T('bouton_chercher'));
@@ -373,11 +373,11 @@ function menu_mots($row, $id_groupes_vus, $les_mots)
$jscript = "onchange=\"$jscript1\"";
if ($obligatoire)
- $res .= "<select name='nouv_mot' id='nouv_mot' size='1' style='width: 180px; background-color:#E86519;' class='fondl' $jscript>";
+ $res .= "<select name='nouv_mot' id='nouv_mot$id_groupe' size='1' style='width: 180px; background-color:#E86519;' class='fondl' $jscript>";
else if ($unseul)
- $res .= "<select name='nouv_mot' id='nouv_mot' size='1' style='width: 180px; background-color:#cccccc;' class='fondl' $jscript>";
+ $res .= "<select name='nouv_mot' id='nouv_mot$id_groupe' size='1' style='width: 180px; background-color:#cccccc;' class='fondl' $jscript>";
else
- $res .= "<select name='nouv_mot' id='nouv_mot' size='1' style='width: 180px; ' class='fondl' $jscript>";
+ $res .= "<select name='nouv_mot' id='nouv_mot$id_groupe' size='1' style='width: 180px; ' class='fondl' $jscript>";
$res .= "\n<option value='x' style='font-variant: small-caps;'>$titre</option>";
diff --git a/ecrire/inc/lang.php b/ecrire/inc/lang.php
index 3af1eed641..e43bc2d4e7 100644
--- a/ecrire/inc/lang.php
+++ b/ecrire/inc/lang.php
@@ -130,9 +130,10 @@ function menu_langues($nom_select) {
// http://doc.spip.org/@select_langues
function select_langues($nom_select, $change, $options)
{
- return "<select name='$nom_select' id='menu_langues' "
+ static $cpt = 0;
+ return "<select name='$nom_select' id='menu_langues" . $cpt++ . "' "
. ((!test_espace_prive()) ?
- ("class='forml'") :
+ ("class='forml menu_langues'") :
(($nom_select == 'var_lang_ecrire') ?
("class='lang_ecrire'") :
"class='fondl'"))
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index 2c16c6f8de..28b7550e98 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -1049,7 +1049,7 @@ function icone_horizontale($texte, $lien, $fond = "", $fonction = "", $af = true
if ($fonction == "supprimer.gif")
$retour = "\n<div class='danger'>$retour</div>";
} else {
- $retour = "\n<li><a$lien>$texte</a></li>";
+ $retour = "\n<a$lien>$texte</a>";
}
if ($af) echo_log('icone_horizontale',$retour); else return $retour;
@@ -1127,7 +1127,7 @@ function formulaire_recherche($page, $complement=""){
} else $onfocus = '';
$form = '<input type="text" size="10" value="'.$recherche_aff.'" name="recherche" class="recherche" accesskey="r"' . $onfocus . ' />';
- $form .= "<input type='image' width='26' height='20' src='"._DIR_IMG_PACK."loupe.png' name='submit' class='submit' alt='"._T('info_rechercher')."' />";
+ $form .= "<input type='image' src='"._DIR_IMG_PACK."loupe.png' name='submit' class='submit' alt='"._T('info_rechercher')."' />";
return "<div class='spip_recherche'>".generer_form_ecrire($page, $form . $complement, " method='get'")."</div>";
}
--
GitLab