Changeset 51634 in spip-zone

Timestamp:

Sep 20, 2011, 2:18:02 PM (9 years ago)

Author:

cedric@…

Message:

Modification de la gestion des chemins des themes :
on reference le theme avec son chemin complet depuis la racine,
_DIR_THEMES n'est plus utilise que pour la decouverte initiale des themes.

Location:

_plugins_/zen-garden/trunk

Files:

• action/zengarden_activer_theme.php (modified) (3 diffs)
• inc/zengarden.php (modified) (2 diffs)
• paquet.xml (modified) (1 diff)
• prive/squelettes/inclure/zengarden_theme.html (modified) (1 diff)
• prive/squelettes/inclure/zengarden_theme_actif.html (modified) (1 diff)
• zengarden_options.php (modified) (3 diffs)

_plugins_/zen-garden/trunk/action/zengarden_activer_theme.php

@@ -11 +11 @@
 
         if (strncmp('defaut:',$arg,7) == 0){
-                $dir_theme = _DIR_THEMES . substr($arg,7);
+                $dir_theme = _DIR_RACINE . substr($arg,7);
                 $flux = pipeline('zengarden_activer_theme', array('args' => array('dir' =>$dir_theme, 'action'=>'effacer'), 'data' => true));
                 if ($flux) {
@@ -20 +20 @@
         elseif (strncmp('apercu:',$arg,7) == 0){
                 $theme = substr($arg,7);
-                $dir_theme = _DIR_THEMES . $theme;
+                $dir_theme = _DIR_RACINE . $theme;
                 if (is_dir($dir_theme)) {
                         $flux = pipeline('zengarden_activer_theme', array('args' => array('dir' =>$dir_theme, 'action'=>'apercevoir'), 'data' => true));
@@ -31 +31 @@
         elseif (strncmp('activation:',$arg,11) == 0) {
                 $theme = substr($arg,11);
-                $dir_theme = _DIR_THEMES . $theme;
+                $dir_theme = _DIR_RACINE . $theme;
                 if (is_dir($dir_theme)) {
                         $flux = pipeline('zengarden_activer_theme', array('args' => array('dir' => $dir_theme, 'action'=>'activer'), 'data' => true));

_plugins_/zen-garden/trunk/inc/zengarden.php

@@ -7 +7 @@
 
 if (!defined("_ECRIRE_INC_VERSION")) return;
+if (!defined('_DIR_THEMES'))
+        define('_DIR_THEMES',_DIR_RACINE."themes/");
 
 function zengarden_charge_themes($dir = _DIR_THEMES, $tous = false){
@@ -16 +18 @@
                 $get_infos = charger_fonction('get_infos','plugins');
                 foreach($files as $k=>$file){
-                        $files[$k] = substr(dirname($file),strlen($dir));
+                        $files[$k] = substr(dirname($file),strlen(_DIR_RACINE));
                 }
 
-                $themes = $get_infos($files,false,$dir);
+                $themes = $get_infos($files,false,_DIR_RACINE);
 
-                foreach($themes as $dir=>$info){
+                foreach($themes as $d=>$info){
                         if ($info['categorie']!='theme'
                           OR (!$tous AND $info['etat']!=='stable'))
-                                unset($themes[$dir]);
+                                unset($themes[$d]);
                         else
-                                $themes[$dir]['tri'] = strtolower($dir);
+                                $themes[$d]['tri'] = strtolower($dir);
                 }
         }
+
         return $themes;
 }

_plugins_/zen-garden/trunk/paquet.xml

@@ -2 +2 @@
         prefix="zengarden"
         categorie="maintenance"
-        version="2.0.2"
+        version="2.1.0"
         etat="test"
         compatibilite="[3.0.0-alpha2;["

_plugins_/zen-garden/trunk/prive/squelettes/inclure/zengarden_theme.html

@@ -7 +7 @@
         <li class='theme'>
                 <div class="qTip target_leftMiddle tooltip_rightMiddle">
-                [(#EVAL{_DIR_THEMES}|concat{#CLE,'/',#VALEUR{logo}}
+                [(#EVAL{_DIR_RACINE}|concat{#CLE,'/',#VALEUR{logo}}
                 |image_reduire{#ENV{largeur_previsu,100},#ENV{hauteur_previsu,75}}
                 |inserer_attribut{class,''}

_plugins_/zen-garden/trunk/prive/squelettes/inclure/zengarden_theme_actif.html

@@ -3 +3 @@
 <BOUCLE_sel(POUR){tableau #ENV{themes}}{cle=#ENV{selection}}>
 <li class='item on'>
-[(#EVAL{_DIR_THEMES}|concat{#CLE,'/',#VALEUR{logo}}|image_reduire{200,150}|inserer_attribut{class,spip_documents_left}|inserer_attribut{alt,#VALEUR{nom}|typo|extraire_multi})]
+[(#EVAL{_DIR_RACINE}|concat{#CLE,'/',#VALEUR{logo}}|image_reduire{200,150}|inserer_attribut{class,spip_documents_left}|inserer_attribut{alt,#VALEUR{nom}|typo|extraire_multi})]
 <h2><:zengarden:theme_actif:></h2>
 <h3>[(#VALEUR{nom}|typo|extraire_multi)]</h3>

_plugins_/zen-garden/trunk/zengarden_options.php

@@ -7 +7 @@
 
 if (!defined('_DIR_PLUGIN_THEME')){
-        if (!defined('_DIR_THEMES'))
-                define('_DIR_THEMES',_DIR_RACINE."themes/");
-        
         // si on est en mode apercu, il suffit de repasser dans l'espace prive pour desactiver l'apercu
         if (test_espace_prive()){
@@ -17 +14 @@
                 }
         }
+        // si le switcher est actif ou la globale var_theme
         elseif(isset($GLOBALS['meta']['zengarden_switcher']) OR defined('_ZEN_VAR_THEME')){
                 if (!is_null($arg = _request('var_theme'))){
@@ -37 +35 @@
                 (isset($GLOBALS['meta']['zengarden_theme']) AND $t = $GLOBALS['meta']['zengarden_theme'])
         )
-        AND is_dir(_DIR_THEMES . $t)){
-                _chemin(_DIR_THEMES.$t);
-                $GLOBALS['marqueur'] = (isset($GLOBALS['marqueur'])?$GLOBALS['marqueur']:"").":$t";
+        AND is_dir(_DIR_RACINE . $t)){
+                _chemin(_DIR_RACINE . $t);
+                $GLOBALS['marqueur'] = (isset($GLOBALS['marqueur'])?$GLOBALS['marqueur']:"").":theme-$t";
                 // @experimental : sauver le nom du repertoire theme utilise
                 // a defaut de connaitre le vrai prefixe