Author: renatoformato@virgilio.it
Date: Wed Aug 16 20:05:23 2006
New Revision: 4586
Log:
passes only head content to pipeline header_prive; submenus in jquery; onload on body in jquery; other fixes; incompatible with jquery plugin because of script injected in body(last version of jquery should not need this hack). Added jquery script to this plugin. I don't know how to override presentation.js.
Added:
_plugins_/_ze_laboratoire_/spiip/presentation.js
Modified:
_plugins_/_ze_laboratoire_/spiip/inc/presentation.php
_plugins_/_ze_laboratoire_/spiip/spiip_pipelines.php
_plugins_/_ze_laboratoire_/spiip/style_spiip_prive.html
Modified: _plugins_/_ze_laboratoire_/spiip/inc/presentation.php
--- _plugins_/_ze_laboratoire_/spiip/inc/presentation.php (original)
+++ _plugins_/_ze_laboratoire_/spiip/inc/presentation.php Wed Aug 16 20:05:23 2006
@@ -21,8 +21,8 @@
global $couleurs_spip;
if ($couleurs_spip) {
foreach ($couleurs_spip as $key => $val) {
- echo "<a href=\"".parametre_url(self(), 'set_couleur', $key)."\">" .
- http_img_pack("rien.gif", " ", "width='8' height='8' style='margin: 1px; background-color: ".$val['couleur_claire'].";' onmouseover=\"changestyle('bandeauinterface','visibility', 'visible');\""). "</a>";
+ echo "<a href=\"".parametre_url(self(), 'set_couleur', $key)."\" id='bouton{$key}_interface'>" .
+ http_img_pack("rien.gif", " ", "width='8' height='8' style='margin: 1px; background-color: ".$val['couleur_claire'].";'"). "</a>";
}
}
}
@@ -1604,6 +1604,7 @@
. '<link rel="shortcut icon" href="'
. url_absolue(find_in_path('favicon.ico'))
. "\" >\n";
+
$js = debut_javascript($connect_statut == "0minirezo"
AND $connect_toutes_rubriques,
($GLOBALS['meta']["activer_statistiques"] != 'non'));
@@ -1745,35 +1746,10 @@
fin_onglet();
}
-function largeur_icone_bandeau_principal($texte) {
- global $spip_display, $spip_ecran ;
- global $connect_statut, $connect_toutes_rubriques;
-
- if ($spip_display == 1){
- $largeur = 80;
- }
- else if ($spip_display == 3){
- $largeur = 60;
- }
- else {
- if (count(explode(" ", $texte)) > 1) $largeur = 84;
- else $largeur = 80;
- }
- if ($spip_ecran == "large") $largeur = $largeur + 30;
-
- if (!($connect_statut == "0minirezo" AND $connect_toutes_rubriques)) {
- $largeur = $largeur + 30;
- }
-
-
- return $largeur;
-}
-
-function icone_bandeau_principal($texte, $lien, $fond, $rubrique_icone = "vide", $rubrique = "", $lien_noscript = "", $sous_rubrique_icone = "", $sous_rubrique = "",$cell_width){
+function icone_bandeau_principal($texte, $lien, $fond, $rubrique_icone = "vide", $rubrique = "", $lien_noscript = "", $sous_rubrique_icone = "", $sous_rubrique = ""){
global $spip_display, $spip_ecran;
global $menu_accesskey, $compteur_survol;
- //$largeur = largeur_icone_bandeau_principal($texte);
if ($spip_display != 1 AND $spip_display != 4) {$largeur = $cell_width;}
else {$largeur = $cell_width-8;}
@@ -1799,28 +1775,30 @@
$menu_accesskey++;
}
- $class_select = " class='menu-item";
+ $class_select = " class='menu-item boutons_admin";
$class_select .= ($sous_rubrique_icone == $sous_rubrique) ? " selection'" : "'";
if (eregi("^javascript:",$lien)) {
- $a_href = "<a$accesskey onClick=\"$lien; return false;\" href='$lien_noscript' target='spip_aide'$class_select style='width:{$largeur}px'>";
+ $a_href = "<a$accesskey onClick=\"$lien; return false;\" href='$lien_noscript' target='spip_aide'$class_select>";
}
else {
- $a_href = "<a$accesskey href=\"$lien\"$class_select style='width:{$largeur}px'>";
+ $a_href = "<a$accesskey href=\"$lien\"$class_select>";
}
$compteur_survol ++;
+ $id_bouton = $rubrique_icone == "vide" ? "": " id='bouton_$rubrique_icone'";
+
if ($spip_display != 1 AND $spip_display != 4) {
$a_href .= "<div class='icon_fond'><div style='background-image:url(\""._DIR_IMG_PACK.$fond."\")'></div></div>";
- echo "<li class='cellule48' style='width:{$largeur}px' onmouseover=\"changestyle('bandeau$rubrique_icone', 'visibility', 'visible');\"'>$a_href";
+ echo "<li class='cellule48 boutons_admin'$id_bouton>$a_href";
if ($spip_display != 3) {
echo "<span>$texte</span>";
}
}
- else echo "<li class='cellule-texte' onmouseover=\"changestyle('bandeau$rubrique_icone', 'visibility', 'visible');\"'>$a_href".$texte;
+ else echo "<li class='cellule-texte'$id_bouton>$a_href".$texte;
echo "</a></li>\n";
}
@@ -1874,7 +1852,6 @@
$a_href = "<a$accesskey href=\"$lien\"$class_select style='width:{$largeur}px'>";
if ($spip_display != 1) {
- //echo "<td class='cellule36' style='width: ".$largeur."px;'>";
echo "<li class='cellule36' style='width: ".$largeur."px;'>";
echo "$a_href" .
http_img_pack("$fond", $alt, "$title");
@@ -1883,7 +1860,6 @@
echo "<span>$texte</span>";
}
}
- //else echo "<td class='cellule-texte' width='$largeur'>$a_href".$texte;
else echo "<li class='cellule-texte' width='$largeur'>$a_href".$texte;
echo "</a>";
echo "</li>\n";
@@ -1995,14 +1971,14 @@
//
function debut_page($titre = "", $rubrique = "accueil", $sous_rubrique = "accueil", $onLoad = "", $css="", $id_rubrique = "") {
-
- init_entete($titre, $rubrique, $css);
definir_barre_boutons();
- init_body($rubrique, $sous_rubrique, $onLoad, $id_rubrique);
+ init_entete($titre, $rubrique, $css, $onLoad);
+ init_body($rubrique, $sous_rubrique, '', $id_rubrique);
debut_corps_page($rubrique);
}
-function init_entete($titre, $rubrique, $css='') {
+function init_entete($titre, $rubrique, $css='',$onLoad = '') {
+ global $browser_verifForm,$spip_ecran;
if (!$nom_site_spip = textebrut(typo($GLOBALS['meta']["nom_site"])))
$nom_site_spip= _T('info_mon_site_spip');
@@ -2010,18 +1986,26 @@
// envoi des en-tetes, du doctype et du <head><title...
include_spip('inc/headers');
http_no_cache();
- $head = _DOCTYPE_ECRIRE
+ echo _DOCTYPE_ECRIRE
. "<html lang='".$GLOBALS['spip_lang']."' dir='"
. ($GLOBALS['spip_lang_rtl'] ? 'rtl' : 'ltr')
- . "'>\n<head>\n<title>["
+ . "'>\n<head>\n";
+
+ //calculate a variable to inject in styles and script
+ if ($spip_ecran == "large") $largeur = 974;
+ else $largeur = 750;
+ $largeur_icone_bandeau_principal = intval(($largeur)/count($GLOBALS['boutons_admin']));
+
+ $head = "<title>["
. $nom_site_spip
. "] " . textebrut(typo($titre)) . "</title>\n"
. envoi_link($nom_site_spip, $rubrique)
. (!$css ? "" : (
'<link rel="stylesheet" href="' . entites_html($css)
. '" type="text/css" />'. "\n"
- ) ) ."\n";
-
+ ) ) ."\n"
+ ."<script type='text/javascript'>$(document).ready(function(){ $browser_verifForm$onLoad });var largeur_icone = $largeur_icone_bandeau_principal; </script>\n"
+ ."<style type='text/css'>.boutons_admin {width:{$largeur_icone_bandeau_principal}px}</style>\n";
echo pipeline('header_prive', $head)
. "</head>\n";
}
@@ -2035,20 +2019,17 @@
global $auth_can_disconnect, $connect_login;
global $options, $spip_display, $spip_ecran;
global $spip_lang, $spip_lang_rtl, $spip_lang_left, $spip_lang_right;
- global $browser_verifForm;
+ //global $browser_verifForm;
- echo pipeline('body_prive',"<body ". _ATTRIBUTES_BODY
- . ' onLoad="'
- . "$browser_verifForm$onLoad"
- . '">');
+ echo pipeline('body_prive',"<body ". _ATTRIBUTES_BODY.'>');
if ($spip_ecran == "large") $largeur = 974;
else $largeur = 750;
echo "\n<map name='map_layout'>";
- echo lien_change_var (self(), 'set_disp', 1, '1,0,18,15', _T('lien_afficher_texte_seul'), "onmouseover=\"changestyle('bandeauvide','visibility', 'visible');\"");
- echo lien_change_var (self(), 'set_disp', 2, '19,0,40,15', _T('lien_afficher_texte_icones'), "onmouseover=\"changestyle('bandeauvide','visibility', 'visible');\"");
- echo lien_change_var (self(), 'set_disp', 3, '41,0,59,15', _T('lien_afficher_icones_seuls'), "onmouseover=\"changestyle('bandeauvide','visibility', 'visible');\"");
+ echo lien_change_var (self(), 'set_disp', 1, '1,0,18,15', _T('lien_afficher_texte_seul'), "");
+ echo lien_change_var (self(), 'set_disp', 2, '19,0,40,15', _T('lien_afficher_texte_icones'), "");
+ echo lien_change_var (self(), 'set_disp', 3, '41,0,59,15', _T('lien_afficher_icones_seuls'), "");
echo "\n</map>";
@@ -2076,19 +2057,15 @@
// Icones principales
echo "<div class='bandeau-principal'>\n";
- echo "<div class='h-list centered' style='width:{$largeur}px'><ul>\n";
- $num_boutons = count($GLOBALS['boutons_admin']);
- $espacement = isset($GLOBALS['boutons_admin']['espacement']);
- $largeur_icone_bandeau_principal = intval(($largeur)/$num_boutons);
- //echo "larghezza: $largeur cella: $cell_width totale ".$cell_width*$num_boutons;
- echo "<script type='text/javascript'>var largeur_icone = " .
- $largeur_icone_bandeau_principal."</script>";
+ //$espacement = isset($GLOBALS['boutons_admin']['espacement']);
+ $largeur_icone_bandeau_principal = intval(($largeur)/count($GLOBALS['boutons_admin']));
+ echo "<div class='h-list centered' style='width:{$largeur}px'><ul>\n";
foreach($GLOBALS['boutons_admin'] as $page => $detail) {
if($page=='espacement') {
- echo "<style>.boutons_admin {width:".($largeur_icone_bandeau_principal-20)."px}</style>";
- echo "<li class='cellule48 boutons_admin' ><span class='menu-item boutons_admin'> </span></li>";
+
+ echo "<li class='cellule48' style='width:".($largeur_icone_bandeau_principal-20)."px'><span class='menu-item' style='width:".($largeur_icone_bandeau_principal-20)."px'> </span></li>";
} else {
if ($detail->url)
$lien_noscript = $detail->url;
@@ -2108,8 +2085,7 @@
$rubrique,
$lien_noscript,
$page,
- $sous_rubrique,
- $largeur_icone_bandeau_principal);
[... 485 lines stripped ...]