From dbde3d80f9838a4c5675a7672f18c53f81ef9d46 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Thu, 10 Feb 2005 11:38:02 +0000
Subject: [PATCH] =?UTF-8?q?deport=20du=20JavaScript=20pour=20faciliter=20l?=
=?UTF-8?q?a=20r=C3=A9f=C3=A9rence=20=C3=A0=20d'autres=20r=C3=A9pertoires?=
=?UTF-8?q?=20que=20ecrire/img=5Fpack?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc_layer.php3 | 39 +++++++++++++++++++++++----------------
ecrire/layer.js | 13 +++++++++++++
2 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/ecrire/inc_layer.php3 b/ecrire/inc_layer.php3
index d283a4e7a5..c46e904d86 100644
--- a/ecrire/inc_layer.php3
+++ b/ecrire/inc_layer.php3
@@ -25,8 +25,7 @@ function debut_block_invisible($nom_block){
$numero_block["$nom_block"] = $compteur_block;
}
- return http_script("
-vis['".$numero_block["$nom_block"]."'] = 'hide';
+ return http_script("vis['".$numero_block["$nom_block"]."'] = 'hide';
document.write('<div id=\"Layer".$numero_block["$nom_block"]."\" style=\"display: none; margin-top: 1;\">');",
'',
"<div id='Layer".$numero_block["$nom_block"]."' style='display: block;'>");
@@ -40,11 +39,9 @@ function fin_block() {
function bouton_block_invisible($nom_block, $icone='') {
global $numero_block, $compteur_block, $browser_layer, $spip_lang_rtl;
- $num_triangle = $compteur_block + 1;
-
if (!$browser_layer) return '';
$blocks = explode(",", $nom_block);
-
+ $javasc = array();
for ($index=0; $index < count($blocks); $index ++){
$nom_block = $blocks[$index];
@@ -55,24 +52,21 @@ function bouton_block_invisible($nom_block, $icone='') {
if (!$icone) {
$icone = "deplierhaut$spip_lang_rtl.gif";
- $javasc .= "swap_couche(\\'".$numero_block[$nom_block]."\\', \\'$spip_lang_rtl\\',\\'" . _DIR_IMG_PACK . "\\', 0);";
+ $javasc[] = '[' . $numero_block[$nom_block] . ',0]';
}
else
- $javasc .= "swap_couche(\\'".$numero_block[$nom_block]."\\', \\'$spip_lang_rtl\\',\\'" . _DIR_IMG_PACK . "\\', 1);";
+ $javasc[] = '[' . $numero_block[$nom_block] . ',1]';
}
- return http_script("
-document.write('<a class=\"triangle_block\" href=\"javascript:$javasc\"><img name=\"triangle".$numero_block["$nom_block"]."\" src=\"". _DIR_IMG_PACK . "$icone\" alt=\"\" title=\"".addslashes(_T('info_deplier'))."\" width=\"10\" height=\"10\" border=\"0\"></a>');\n");
+ return produire_acceder_couche($javasc, $numero_block[$nom_block], $icone);
}
function bouton_block_visible($nom_block){
global $numero_block, $compteur_block, $browser_layer, $spip_lang_rtl;
- $num_triangle = $compteur_block + 1;
-
if (!$browser_layer) return '';
$blocks = explode(",", $nom_block);
-
+ $javasc = array();
for ($index=0; $index < count($blocks); $index ++){
$nom_block = $blocks[$index];
@@ -81,11 +75,24 @@ function bouton_block_visible($nom_block){
$numero_block["$nom_block"] = $compteur_block;
}
- $javasc .= "swap_couche(\\'".$numero_block[$nom_block]."\\', \\'$spip_lang_rtl\\',\\'" . _DIR_IMG_PACK . "\\', 0);";
- }
+ $javasc[] = '[' . $numero_block[$nom_block] . ',0]';
+
+ }
+
+ return produire_acceder_couche($javasc, $numero_block[$nom_block], "deplierbas.gif");
+}
- return http_script("
-document.write('<a class=\"triangle_block\" href=\"javascript:$javasc\"><img name=\"triangle".$numero_block["$nom_block"]."\" src=\"". _DIR_IMG_PACK . "deplierbas.gif\" alt=\"\" title=\"".addslashes(_T('info_deplier'))."\" width=\"10\" height=\"10\" border=\"0\"></a>');\n");
+function produire_acceder_couche($couches, $nom, $icone) {
+ global $spip_lang_rtl;
+ return http_script("acceder_couche([" . join(',',$couches) . '], ' .
+ $nom .
+ ", '" .
+ _DIR_IMG_PACK .
+ "', '" .
+ $icone .
+ "', '" .
+ addslashes(_T('info_deplier')) .
+ "','$spip_lang_rtl')");
}
//
diff --git a/ecrire/layer.js b/ecrire/layer.js
index 59e7179def..38b2482ad8 100644
--- a/ecrire/layer.js
+++ b/ecrire/layer.js
@@ -76,3 +76,16 @@ function manipuler_couches(action,rtl,first,last, dir) {
}
}
}
+
+function acceder_couche(couches, n, dir, icone, texte, sens) {
+ javasc = ''
+ for (j=0; j<couches.length; j+=1)
+ javasc += 'swap_couche(' + couches[j][0] + ", '" + sens + "','" + dir + "', " + couches[j][1] + ");";
+
+ document.write('<a class="triangle_block" href="javascript:' +
+ javasc +
+ '"><img name="triangle' + n + '" src="' +
+ dir + icone + '" alt="" title="' +
+ texte +
+ '" width="10" height="10" border="0"></a>');
+}
--
GitLab