Author: renatoformato@virgilio.it
Date: Thu Aug 17 21:22:40 2006
New Revision: 4637
Log:
less inline js in the popup div to change their state
Modified:
_plugins_/_ze_laboratoire_/spiip/img_pack/presentation.js
_plugins_/_ze_laboratoire_/spiip/inc/presentation.php
Modified: _plugins_/_ze_laboratoire_/spiip/img_pack/presentation.js
--- _plugins_/_ze_laboratoire_/spiip/img_pack/presentation.js (original)
+++ _plugins_/_ze_laboratoire_/spiip/img_pack/presentation.js Thu Aug 17 21:22:40 2006
@@ -2,21 +2,29 @@
//init document
var active_menu = $('empty');
+var puce_popup;
$(document).ready(function() {
//init submenus
+ //console.time("total");
$('#haut-page div.bandeau_sec').css({'display':'none','position':'absolute'});
//activate submenus
$('#haut-page div.bandeau-principal>div.h-list li[@id]').mouseover(showMenu);
$('#bandeau_couleur li.bandeau_couleur a[@id]').mouseover(showMenu);
- $('map').mouseover(
- function(){active_menu.hide();active_menu=$('empty');}
- );
+ $('map').mouseover(function(){active_menu.hide();active_menu=$('empty');});
//init couche images
- console.time("couche");
+ //console.time("couche");
$('img.swapCouche').click(jquerySwapCouche).css('display','inline');
- console.timeEnd("couche");
+ //console.timeEnd("couche");
//init ajax links
$('a.ajax').click(execAjaxLinks).not('[@href]').css({'cursor':'pointer','visibility':'visible'});
+ //init fast change of an article state
+ //console.time("faststatut");
+ puce_popup = $('div.puce_article_fixe,div.puce_breve_fixe').mouseover(function(){puce_popup.hide();$('+div',this).show();false;})
+ .find('+div').hover(function(){},function(){puce_popup.hide();return false;})
+ //compatibility with default style_prive (temporary)
+ .css({'visibility':'visible','display':'none'});
+ //console.timeEnd("faststatut");
+ //console.timeEnd("total");
}
);
@@ -74,10 +82,9 @@
}
if (accepter_change_statut) {
- changestyle ('statutdecal'+type+id, 'marginLeft', decal+'px');
- cacher ('statutdecal'+type+id);
+ $('#statutdecal'+type+id).css({'marginLeft':decal+'px','visibility':'hidden'})
+ $('#imgstatut'+type+id).set('src',puce);
- findObj('imgstatut'+type+id).src = puce;
frames['iframe_action'].location.href = script;
}
}
Modified: _plugins_/_ze_laboratoire_/spiip/inc/presentation.php
--- _plugins_/_ze_laboratoire_/spiip/inc/presentation.php (original)
+++ _plugins_/_ze_laboratoire_/spiip/inc/presentation.php Thu Aug 17 21:22:40 2006
@@ -600,16 +600,16 @@
"verte" => _T('texte_statut_publie'),
"rouge" => _T('texte_statut_refuse'),
"poubelle" => _T('texte_statut_poubelle'));
- $action = "onmouseover=\"montrer('statutdecalarticle$id');\"";
+
$inser_puce = "\n<div class='puce_article' id='statut$id'$dir_lang>"
- . "\n<div class='puce_article_fixe' $action>" .
+ . "\n<div class='puce_article_fixe'>" .
http_img_pack("$puce", "", "id='imgstatutarticle$id' style='margin: 1px;'") ."</div>"
- . "\n<div class='puce_article_popup' id='statutdecalarticle$id' onmouseout=\"cacher('statutdecalarticle$id');\" style=' margin-left: -".((11*$clip)+1)."px;'>\n"
- . afficher_script_statut($id, 'article', -1, 'puce-blanche.gif', 'prepa', $titles['blanche'], $action)
- . afficher_script_statut($id, 'article', -12, 'puce-orange.gif', 'prop', $titles['orange'], $action)
- . afficher_script_statut($id, 'article', -23, 'puce-verte.gif', 'publie', $titles['verte'], $action)
- . afficher_script_statut($id, 'article', -34, 'puce-rouge.gif', 'refuse', $titles['rouge'], $action)
- . afficher_script_statut($id, 'article', -45, 'puce-poubelle.gif', 'poubelle', $titles['poubelle'], $action)
+ . "\n<div class='puce_article_popup' id='statutdecalarticle$id' style=' margin-left: -".((11*$clip)+1)."px;'>\n"
+ . afficher_script_statut($id, 'article', -1, 'puce-blanche.gif', 'prepa', $titles['blanche'])
+ . afficher_script_statut($id, 'article', -12, 'puce-orange.gif', 'prop', $titles['orange'])
+ . afficher_script_statut($id, 'article', -23, 'puce-verte.gif', 'publie', $titles['verte'])
+ . afficher_script_statut($id, 'article', -34, 'puce-rouge.gif', 'refuse', $titles['rouge'])
+ . afficher_script_statut($id, 'article', -45, 'puce-poubelle.gif', 'poubelle', $titles['poubelle'])
. "</div></div>";
} else {
$inser_puce = http_img_pack("$puce", "", "id='imgstatutarticle$id' style='margin: 1px;'");
@@ -654,7 +654,6 @@
if (!$droit) return $inser_puce;
$type2 = "statutdecal$type$id";
- $action = "onmouseover=\"montrer('$type2');\"\n";
// les versions de MSIE ne font pas toutes pareil sur alt/title
// la combinaison suivante semble ok pour tout le monde.
@@ -663,14 +662,14 @@
. "<div class='puce_breve_fixe' $action>"
. $inser_puce
. "</div>"
- . "\n<div class='puce_breve_popup' id='$type2' onmouseout=\"cacher('$type2');\" style=' margin-left: -".((9*$clip)+1)."px;'>\n"
- . afficher_script_statut($id, $type, -1, $puces[0], 'prop',_T('texte_statut_propose_evaluation'), $action)
- . afficher_script_statut($id, $type, -10, $puces[1], 'publie',_T('texte_statut_publie'), $action)
- . afficher_script_statut($id, $type, -19, $puces[2], 'refuse',_T('texte_statut_refuse'), $action)
+ . "\n<div class='puce_breve_popup' id='$type2' style=' margin-left: -".((9*$clip)+1)."px;'>\n"
+ . afficher_script_statut($id, $type, -1, $puces[0], 'prop',_T('texte_statut_propose_evaluation'))
+ . afficher_script_statut($id, $type, -10, $puces[1], 'publie',_T('texte_statut_publie'))
+ . afficher_script_statut($id, $type, -19, $puces[2], 'refuse',_T('texte_statut_refuse'))
. "</div></div>";
}
-function afficher_script_statut($id, $type, $n, $img, $statut, $title, $act)
+function afficher_script_statut($id, $type, $n, $img, $statut, $title)
{
include_spip('inc/actions');
return http_href_img("javascript:selec_statut('$id', '$type', -1, '" .
@@ -679,9 +678,7 @@
generer_action_auteur("instituer_$type","$id-$statut") .
"');",
$img,
- "title=\"".$title."\"",
- '','','',
- $act);
+ "title=\"".$title."\"");
}
//
@@ -2179,7 +2176,7 @@
http_img_pack("cal-rv.png", "", "width='26' height='20'") ."</a>";
echo "<a href='" . generer_url_ecrire("messagerie") . "' class='icone26' id='bouton_messagerie'>" .
http_img_pack("cal-messagerie.png", "", "width='26' height='20'") ."</a>";
- echo "<a href='" . generer_url_ecrire("synchro") . "' class='icone26' id='bouton_synchro'" .
+ echo "<a href='" . generer_url_ecrire("synchro") . "' class='icone26' id='bouton_synchro'>" .
http_img_pack("cal-suivi.png", "", "width='26' height='20'") . "</a>";