Author: renatoformato@virgilio.it
Date: Fri Aug 18 21:53:38 2006
New Revision: 4682
Log:
vertical alignment on toolbar, fixes some safari bugs
Modified:
_plugins_/_ze_laboratoire_/spiip/img_pack/presentation.js
_plugins_/_ze_laboratoire_/spiip/inc/presentation.php
_plugins_/_ze_laboratoire_/spiip/style_spiip_prive.html
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 Fri Aug 18 21:53:38 2006
@@ -6,7 +6,7 @@
$(document).ready(function() {
//init submenus
//console.time("total");
- $('#bandeau-principal div.bandeau_sec').css({'display':'none','position':'absolute'});
+ //$('#bandeau-principal div.bandeau_sec').css({'display':'none','position':'absolute'});
//activate submenus
$('#bandeau-principal>div.h-list li[@id]').mouseover(showMenu);
$('#bandeau_couleur li.bandeau_couleur a[@id]').mouseover(showMenu);
@@ -16,13 +16,13 @@
$('img.swapCouche').click(jquerySwapCouche).css({display:'inline',cursor:'pointer'});
//console.timeEnd("couche");
//init ajax links
- $('a.ajax').click(execAjaxLinks).not('[@href]').css({'cursor':'pointer','visibility':'visible'});
+ $('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;})
+ puce_popup = $('div.puce_article_fixe,div.puce_breve_fixe').mouseover(function(){puce_popup.hide();$('+div',this).show();return false;})
.find('+div').hover(function(){},function(){puce_popup.hide();return false;})
//compatibility with default style_prive (temporary)
- .css({'visibility':'visible','display':'none'});
+ .css({visibility:'visible',display:'none'});
//console.timeEnd("faststatut");
//console.timeEnd("total");
}
@@ -30,15 +30,17 @@
function showMenu() {
if(init_gauche) {
- $('#haut-page div.bandeau_sec').
+ $('#bandeau-principal div.bandeau_sec').
//before adjusting offset let the submenu have a layout
- css({'visible':'hidden','display':'block'}).each(decalerCouche).
+ css({visibility:'hidden',display:'block'}).each(decalerCouche).
//reset visibility
- css({'visible':'visible','display':'none'});
+ css({visibility:'visible',display:'none'});
init_gauche = false;
}
active_menu.hide();
active_menu=$('#'+this.id.replace(/^bouton\d?_/,'bandeau')).show();
+ //bug safari..runtime style returns null
+ active_menu.get(0).style.display='block';
}
function decalerCouche() {
@@ -82,8 +84,8 @@
}
if (accepter_change_statut) {
- $('#statutdecal'+type+id).css({'marginLeft':decal+'px','visibility':'hidden'})
- $('#imgstatut'+type+id).set('src',puce);
+ $('#statutdecal'+type+id).css({marginLeft:decal+'px',display:'none'})
+ $('#imgstatut'+type+id).attr('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 Fri Aug 18 21:53:38 2006
@@ -672,7 +672,7 @@
function afficher_script_statut($id, $type, $n, $img, $statut, $title)
{
include_spip('inc/actions');
- return http_href_img("javascript:selec_statut('$id', '$type', -1, '" .
+ return http_href_img("javascript:selec_statut('$id', '$type', $n, '" .
http_wrapper($img) .
"', '" .
generer_action_auteur("instituer_$type","$id-$statut") .
@@ -2140,7 +2140,7 @@
echo "</div>";
echo "</div>\n"; // referme: <div class='bandeau-principal' align='center'>"
- //echo "<script type='text/javascript'>$('#bandeau-principal div.bandeau_sec').css({'display':'none','position':'absolute'});</script>";
+ echo "<script type='text/javascript'>$('#bandeau-principal div.bandeau_sec').css({'display':'none','position':'absolute'});</script>";
//
// Bandeau colore
@@ -2156,7 +2156,7 @@
}
echo "\n<div id='bandeau_couleur' style=\"max-height: 40px; width: 100%; border-bottom: solid 1px white;$style\">";
- echo "<div class='h-list centered' style='width:{$largeur}px'><ul>";
+ echo "<div class='h-list centered vcentered' style='width:{$largeur}px'><ul>";
echo "<li id='bandeau_couleur1' class='bandeau_couleur'><div class='menu-item'>";
Modified: _plugins_/_ze_laboratoire_/spiip/style_spiip_prive.html
--- _plugins_/_ze_laboratoire_/spiip/style_spiip_prive.html (original)
+++ _plugins_/_ze_laboratoire_/spiip/style_spiip_prive.html Fri Aug 18 21:53:38 2006
@@ -209,7 +209,7 @@
* html #bandeau_couleur .menu-item {height:22px}
-#bandeau_couleur .menu-item {min-height:20px}
+#bandeau_couleur {min-height:20px;padding:2px 0}
#bandeau_couleur1 .menu-item {width:230px}
#bandeau_couleur3 .menu-item {width:150px}
#bandeau_couleur4 .menu-item {width:70px}
@@ -230,9 +230,9 @@
}
* html .bandeau_sec ul {display:inline}
/*style for gadgets*/
-#bandeau-gadgets {margin:0 auto;position: relative; z-index: 1000}
+#bandeau-gadgets {margin:0 auto;position: relative; z-index: 1000;top:2px}
* html #bandeau-gadgets {text-align:center;height:1%}
-.bandeau_couleur_sous {display:none;visibility:visible }
+#bandeau-gadgets .bandeau_couleur_sous {visibility:visible;display:none}
/*
* Icones horizontales