Changeset 2581:d0699826aef9

Timestamp:

11/23/13 12:38:25 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Adapt Ductile to cope with nb of entries on home pages, addresses #1269

Location:

themes/ductile

Files:

• _config.php (modified) (3 diffs)
• _define.php (modified) (1 diff)
• _public.php (modified) (1 diff)

themes/ductile/_config.php

@@ -273 +273 @@
 $ductile_counts_base = array(
      'default' => null,
+     'default-page' => null,
      'category' => null,
      'tag' => null,
@@ -290 +291 @@
      $ductile_lists = $ductile_lists_base;
 }
+$ductile_lists = array_merge($ductile_lists_base,$ductile_lists);
 
 $ductile_counts = $core->blog->settings->themes->get($core->blog->settings->system->theme.'_entries_counts');
@@ -296 +298 @@
      $ductile_counts = $ductile_counts_base;
 }
+$ductile_counts = array_merge($ductile_counts_base,$ductile_counts);
 
 $ductile_stickers = $core->blog->settings->themes->get($core->blog->settings->system->theme.'_stickers');

themes/ductile/_define.php

@@ -15 +15 @@
      /* Description*/         "Mediaqueries compliant elegant theme",
      /* Author */             "Dotclear Team",
-     /* Version */            '1.3.1',
+     /* Version */            '1.4',
      /* Properties */         array(
                                         'standalone_config' => true,

themes/ductile/_public.php

@@ -36 +36 @@
           global $_ctx;
 
-          $nb = 0;
+          $nb_other = $nb_first = 0;
+
           $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[$GLOBALS['core']->url->type])) {
-                         // Nb de billets par page défini par la config du thème
-                         $nb = (integer) $s[$GLOBALS['core']->url->type];
-                    } else {
-                         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'];
-                         }
-                    }
-               }
-          }
-
-          if ($nb == 0) {
+                    switch ($GLOBALS['core']->url->type) {
+                         case 'default':
+                         case 'default-page':
+                              if (isset($s['default'])) {
+                                   $nb_first = $nb_other = (integer) $s['default'];
+                              }
+                              if (isset($s['default-page'])) {
+                                   $nb_other = (integer) $s['default-page'];
+                              }
+                              break;
+                         default:
+                              if (isset($s[$GLOBALS['core']->url->type])) {
+                                   // Nb de billets par page défini par la config du thème
+                                   $nb_first = $nb_other = (integer) $s[$GLOBALS['core']->url->type];
+                              }
+                              break;
+                    }
+               }
+          }
+
+          if ($nb_other == 0) {
                if (!empty($attr['nb'])) {
                     // Nb de billets par page défini par défaut dans le template
-                    $nb = (integer) $attr['nb'];
-               }
-          }
-
-          if ($nb > 0)
-               $_ctx->nb_entry_per_page = $nb;
+                    $nb_other = $nb_first = (integer) $attr['nb'];
+               }
+          }
+
+          if ($nb_other > 0) {
+               $_ctx->nb_entry_per_page = $nb_other;
+          }
+          if ($nb_first > 0) {
+               $_ctx->nb_entry_first_page = $nb_first;
+          }
      }