Changeset 828:56898bb91d9d for themes

Timestamp:

05/21/12 14:03:53 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Now Ductile configuration is blog independent

File:

• themes/ductile/_public.php (modified) (5 diffs)

themes/ductile/_public.php

@@ -28 +28 @@
      public static function ductileNbEntryPerPage($attr)
      {
-          global $core;
-
+          return '<?php tplDuctileTheme::ductileNbEntryPerPageHelper(); ?>';
+     }
+     
+     public static function ductileNbEntryPerPageHelper()
+     {
+          global $_ctx;
+          
           $nb = 0;
-          $s = $core->blog->settings->themes->get($core->blog->settings->system->theme.'_entries_counts');
+          $s = $GLOBALS['core']->blog->settings->themes->get($GLOBALS['core']->blog->settings->system->theme.'_entries_counts');
           if ($s !== null) {
                $s = @unserialize($s);
                if (is_array($s)) {
-                    if (isset($s[$core->url->type])) {
+                    if (isset($s[$GLOBALS['core']->url->type])) {
                          // Nb de billets par page défini par la config du thème
-                         $nb = (integer) $s[$core->url->type];
+                         $nb = (integer) $s[$GLOBALS['core']->url->type];
                     } else {
-                         if (($core->url->type == 'default-page') && (isset($s['default']))) {
+                         if (($GLOBALS['core']->url->type == 'default-page') && (isset($s['default']))) {
                               // Les pages 2 et suivantes de la home ont le même nombre de billet que la première page
                               $nb = (integer) $s['default'];
@@ -55 +60 @@
 
           if ($nb > 0)
-               return '<?php $_ctx->nb_entry_per_page = '.$nb.' ; ?>';
+               $_ctx->nb_entry_per_page = $nb;
      }
      
@@ -86 +91 @@
      {
           global $core;
+          
           $default = isset($attr['default']) ? trim($attr['default']) : 'short';
-
-          $model = '';
-          $s = $core->blog->settings->themes->get($core->blog->settings->system->theme.'_entries_lists');
+          return '<?php '."\n".
+               'switch (tplDuctileTheme::ductileEntriesListHelper(\''.$default.'\')) {'."\n".
+               '    case \'title\':'."\n".
+               ' ?>'."\n".
+                         $core->tpl->includeFile(array('src' => '_entry-title.html'))."\n".
+               '<?php '."\n".
+               '         break;'."\n".
+               '    case \'short\':'."\n".
+               ' ?>'."\n".
+                         $core->tpl->includeFile(array('src' => '_entry-short.html'))."\n".
+               '<?php '."\n".
+               '         break;'."\n".
+               '    case \'full\':'."\n".
+               ' ?>'."\n".
+                         $core->tpl->includeFile(array('src' => '_entry-full.html'))."\n".
+               '<?php '."\n".
+               '         break;'."\n".
+               '}'."\n".
+               ' ?>';
+     }
+     
+     public static function ductileEntriesListHelper($default)
+     {
+          $s = $GLOBALS['core']->blog->settings->themes->get($GLOBALS['core']->blog->settings->system->theme.'_entries_lists');
           if ($s !== null) {
                $s = @unserialize($s);
                if (is_array($s)) {
-                    if (isset($s[$core->url->type])) {
-                         $model = $s[$core->url->type];
-                    }
-               }
-          }
-
-          $local_attr = array('src' => '_entry-'.($model ? $model : $default).'.html');
-          return $core->tpl->includeFile($local_attr);
+                    if (isset($s[$GLOBALS['core']->url->type])) {
+                         $model = $s[$GLOBALS['core']->url->type];
+                         return $model;
+                    }
+               }
+          }
+          return $default;
      }
 
      public static function ductileLogoSrc($attr)
      {
-          global $core;
-
+          return '<?php echo tplDuctileTheme::ductileLogoSrcHelper(); ?>';
+     }
+
+     public static function ductileLogoSrcHelper()
+     {
           $s = $GLOBALS['core']->blog->settings->themes->get($GLOBALS['core']->blog->settings->system->theme.'_style');
           if ($s === null) {
@@ -116 +145 @@
           }
           
-          $img_url = $core->blog->settings->system->themes_url.'/'.$core->blog->settings->system->theme.'/img/logo.png';
+          $img_url = $GLOBALS['core']->blog->settings->system->themes_url.'/'.$GLOBALS['core']->blog->settings->system->theme.'/img/logo.png';
           if (isset($s['logo_src'])) {
                if ($s['logo_src'] !== null) {
@@ -125 +154 @@
                          } else {
                               // relative URL (base = img folder of ductile theme)
-                              $img_url = $core->blog->settings->system->themes_url.'/'.$core->blog->settings->system->theme.'/img/'.$s['logo_src'];
+                              $img_url = $GLOBALS['core']->blog->settings->system->themes_url.'/'.$GLOBALS['core']->blog->settings->system->theme.'/img/'.$s['logo_src'];
                          }
                     }