Changeset 61135 in spip-zone

Timestamp:

May 8, 2012, 11:23:16 PM (9 years ago)

Author:

piero.wbmstr@…

Message:

On passé par "insert_head_css" (SPIP3) et une petite harmonisation des styles avec la nouvelle dist

Location:

_plugins_/adx_menu/spip_3

Files:

• adxmenu_css.css.html (modified) (2 diffs)
• adxmenu_css_styles_spip3.css.html (added)
• adxmenu_pipelines.php (modified) (2 diffs)
• paquet.xml (modified) (2 diffs)

_plugins_/adx_menu/spip_3/adxmenu_css.css.html

@@ -2 +2 @@
         Les commentaires sont ceux de l'auteur
         
-        Les styles du menu sont editables en fin de ce fichier
+        Les styles du menu sont editables le fichier "adxmenu_css_styles.css.html"
 
 ]#CACHE{3600*100,cache-client}
@@ -18 +18 @@
 #nav .adxmenu .menu-liste .menu-entree {margin:0;padding:0;border:0;}
 #nav .adxmenu li li.menu-entree {width: inherit;}
+
 /* - - - ADxMenu: BASIC styles [ MANDATORY ] - - - */
 /*<![CDATA[*/

_plugins_/adx_menu/spip_3/adxmenu_pipelines.php

@@ -15 +15 @@
         $conf = function_exists('lire_config') ? lire_config('adxmenu') : false;
         $adx = (!$conf OR !strlen($conf['adx'])) ? ADXMENU_OUVERTURE_DEFAUT : $conf['adx'];
+        include_spip('plugins/installer'); // spip_version_compare dans SPIP 3.x
+        include_spip('inc/plugin'); // spip_version_compare dans SPIP 2.x
+        if (spip_version_compare($GLOBALS['spip_version_branche'], '3.0.0alpha', '>=')) {
+    $css_styles = generer_url_public("adxmenu_css_styles_spip3.css",'type_menu='.$adx);
+        } else {
+    $css_styles = generer_url_public("adxmenu_css_styles.css",'type_menu='.$adx);
+        }
         $flux .= "<!-- ADX Menu insert head -->"
                 ."\n<link rel='stylesheet' href='".generer_url_public("adxmenu_css.css",'type_menu='.$adx)."' type='text/css' media='projection, screen, tv' />"
@@ -21 +28 @@
                 ."\n<script src='".url_absolue(find_in_path('javascript/ADxMenu.js'))."' type='text/javascript'></script>"
                 ."\n<![endif]-->"
-                ."\n<link rel='stylesheet' href='".generer_url_public("adxmenu_css_styles.css",'type_menu='.$adx)."' type='text/css' media='projection, screen, tv' />"
+                ."\n<link rel='stylesheet' href='".$css_styles."' type='text/css' media='projection, screen, tv' />"
                 ."<!-- END ADX Menu insert head -->\n";
         return $flux;
 }
 
+/** 
+ * Insertion des CSS par INSERT_HEAD_CSS (pour SPIP3)
+ */
+function adxmenu_insert_head_css($flux){
+        return adxmenu_insert_head($flux);
+}
+
 ?>

_plugins_/adx_menu/spip_3/paquet.xml

@@ -2 +2 @@
         prefix="adxmenu"
         categorie="navigation"
-        version="1.23.0"
+        version="1.23.1"
         etat="stable"
         compatibilite="[2.0;["
@@ -17 +17 @@
         <licence lien="http://creativecommons.org/licenses/by/3.0/">Creative Commons BY 3.0 Attribution</licence>
 
-        <pipeline nom="insert_head" inclure="adxmenu_pipelines.php" />
+        <pipeline nom="insert_head_css" inclure="adxmenu_pipelines.php" />
 
         <utilise nom="cfg" compatibilite="[1.0;[" />