Changeset 84020 in spip-zone

Timestamp:

Aug 4, 2014, 9:07:15 PM (5 years ago)

Author:

prigent.yohann@…

Message:

On utilise insert_head_css

Location:

_plugins_/switcher/trunk

Files:

• head.php (modified) (2 diffs)
• paquet.xml (modified) (2 diffs)
• plugin.xml (modified) (2 diffs)
• switcher_fonctions.php (modified) (1 diff)

_plugins_/switcher/trunk/head.php

@@ -3 +3 @@
 if (!defined('_ECRIRE_INC_VERSION')) return;
 
-function switcher_insert_head($flux){
-
-        $flux .='
+function switcher_insert_head_css($flux){
+        static $done = false;
+        if (!$done) { 
+                $done = true; 
+                $flux .='
         <style type="text/css" media="print">
 /* <![CDATA[ */
@@ -12 +14 @@
         </style>
 ';
-
-                return $flux;
         }
-
-?>
+        return $flux;
+}
+function switcher_insert_head($flux){ 
+        $flux .= switcher_insert_head_css($flux); // au cas ou il n'est pas implemente 
+        return $flux;
+}

_plugins_/switcher/trunk/paquet.xml

@@ -2 +2 @@
         prefix="switcher"
         categorie="maintenance"
-        version="0.2.3"
+        version="0.2.4"
         etat="test"
         compatibilite="[1.9.0;3.0.*]"
@@ -14 +14 @@
 
         <licence lien="http://www.gnu.org/licenses/gpl-3.0.html">GNU/GPL</licence>
-        <copyright>2006-2013</copyright>
+        <copyright>2006-2014</copyright>
  
         <pipeline nom="affichage_final" inclure="switcher_fonctions.php" />
         <pipeline nom="insert_head" inclure="head.php" />
+        <pipeline nom="insert_head_css" inclure="head.php" />
   
         <necessite nom="saisies" />

_plugins_/switcher/trunk/plugin.xml

@@ -4 +4 @@
         <auteur>Philippe Drouot, adaptation en plugin de la contrib switcher de Fil</auteur>
         <licence>&#169; 2006, GNU/GPL</licence>
-        <version>0.2.3</version>
+        <version>0.2.4</version>
         <etat>test</etat>
         <icon>prive/themes/spip/images/switcher-64.png</icon>
@@ -35 +35 @@
                 <inclure>head.php</inclure>
         </pipeline>
+        <pipeline>
+                <nom>insert_head_css</nom>
+                <inclure>head.php</inclure>
+        </pipeline>
         <necessite id="SPIP" version="[1.9.0;3.0.99]" />
         <necessite id="saisies" />

_plugins_/switcher/trunk/switcher_fonctions.php

@@ -34 +34 @@
                         // Insertion du selecteur de squelettes 
                         $code.='<div id="plugin_switcher" style="top: 0;left: 20px; position: absolute; background-color: transparent;z-index: 100;">';
-                        $code.='<form action="" method="post">';
+                        $code.='<form action="#" method="post">';
                         $code.='<fieldset style="margin:0;padding:0;border:0">';
                         $code.='<select name="selecteurSkel" style="'.$styleListeSwitcher.'" onchange="gotof(this.options[this.selectedIndex].value)">';
-                        $code.='<option selected="selected" value="">Squelettes</option>';
+                        $code.='<option value="">Squelettes</option>';
             if (is_array($squelettes_alternatifs))
                         foreach( $squelettes_alternatifs as $key => $value)     {
                             $selected = ($key == $_COOKIE['spip_skel']) ? " selected='selected' " : "";
-                            $code.='<option value="'.parametre_url(self(),'var_skel',$key).'"'.$selected.'>&nbsp;-> '.$key.'</option>';
+                            $code.='<option value="'.parametre_url(self(),'var_skel',$key).'"'.$selected.'>&nbsp;-&gt; '.$key.'</option>';
                         }
                         $code.='</select>';