Changeset 583:c7f81168aa22 for themes/ductile

Timestamp:

07/13/11 07:28:49 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

themes

Message:

Configuration du nb de billets par page pour les contextes home (toute page), catégorie, tag, recherche.

Location:

themes/ductile

Files:

• _config.php (modified) (6 diffs)
• _public.php (modified) (1 diff)
• tpl/category.html (modified) (2 diffs)
• tpl/home.html (modified) (2 diffs)
• tpl/search.html (modified) (2 diffs)

themes/ductile/_config.php

@@ -143 +143 @@
 }
 
+$ductile_counts_base = array(
+     'default' => null,
+     'category' => null,
+     'tag' => null,
+     'search' => null
+);
+
+$ductile_counts = $core->blog->settings->themes->get($core->blog->settings->system->theme.'_entries_counts');
+$ductile_counts = @unserialize($ductile_counts);
+if (!is_array($ductile_counts)) {
+     $ductile_counts = $ductile_counts_base;
+}
+
+
 $conf_tab = isset($_POST['conf_tab']) ? $_POST['conf_tab'] : 'html';
 
@@ -182 +196 @@
                }
                
+               for ($i = 0; $i < count($_POST['count_nb']); $i++) {
+                    $ductile_counts[$_POST['count_ctx'][$i]] = $_POST['count_nb'][$i];
+               }
+               
           }
           
@@ -216 +234 @@
           $core->blog->settings->themes->put($core->blog->settings->system->theme.'_stickers',serialize($ductile_stickers));
           $core->blog->settings->themes->put($core->blog->settings->system->theme.'_entries_lists',serialize($ductile_lists));
+          $core->blog->settings->themes->put($core->blog->settings->system->theme.'_entries_counts',serialize($ductile_counts));
 
           // Blog refresh
@@ -283 +302 @@
 echo '</fieldset>';
 
-echo '<fieldset><legend>'.__('Entries list types').'</legend>';
+echo '<fieldset><legend>'.__('Entries list types and limits').'</legend>';
 
 echo '<table id="entrieslist">'.'<caption>'.__('Entries lists').'</caption>'.
@@ -290 +309 @@
 '<th scope="col">'.__('Context').'</th>'.
 '<th scope="col">'.__('Entries list type').'</th>'.
+'<th scope="col">'.__('Number of entries').'</th>'.
 '</tr>'.
 '</thead>'.
@@ -297 +317 @@
           '<tr>'.
           '<td scope="raw">'.$contexts[$k].'</td>'.
-          '<td>'.form::hidden(array('list_ctx[]'),$k).form::combo(array('list_type[]'),$list_types,$v).'</td>'.
+          '<td>'.form::hidden(array('list_ctx[]'),$k).form::combo(array('list_type[]'),$list_types,$v).'</td>';
+     if (array_key_exists($k,$ductile_counts)) {
+          echo '<td>'.form::hidden(array('count_ctx[]'),$k).form::field(array('count_nb[]'),2,3,$ductile_counts[$k]).'</td>';
+     } else {
+          echo '<td></td>';
+     }
+     echo
           '</tr>';
 }

themes/ductile/_public.php

@@ -20 +20 @@
 $core->tpl->addValue('ductileEntriesList',array('tplDuctileTheme','ductileEntriesList'));
 $core->tpl->addBlock('EntryIfContentIsCut',array('tplDuctileTheme','EntryIfContentIsCut'));
+$core->tpl->addValue('ductileNbEntryPerPage',array('tplDuctileTheme','ductileNbEntryPerPage'));
 
 class tplDuctileTheme
 {
+     public static function ductileNbEntryPerPage($attr)
+     {
+          global $core;
+
+          $nb = 0;
+          $s = $core->blog->settings->themes->get($core->blog->settings->system->theme.'_entries_counts');
+          if ($s !== null) {
+               $s = @unserialize($s);
+               if (is_array($s)) {
+                    if (isset($s[$core->url->type])) {
+                         // Nb de billets par page défini par la config du thème
+                         $nb = (integer) $s[$core->url->type];
+                    } else {
+                         if (($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) {
+               if (!empty($attr['nb'])) {
+                    // Nb de billets par page défini par défaut dans le template
+                    $nb = (integer) $attr['nb'];
+               }
+          }
+
+          if ($nb > 0)
+               return '<?php $_ctx->nb_entry_per_page = '.$nb.' ; ?>';
+     }
+     
      public static function EntryIfContentIsCut($attr,$content)
      {
           global $core;
           
-          if (empty($attr['cut_string']) || empty($attr['cut_string'])) {
+          if (empty($attr['cut_string']) || empty($attr['full'])) {
                return '';
           }

themes/ductile/tpl/category.html

@@ -25 +25 @@
   <link rel="contents" href="{{tpl:BlogArchiveURL}}" title="{{tpl:lang Archives}}" />
   
+ {{tpl:ductileNbEntryPerPage}}
   <tpl:Entries no_content="1">
     <tpl:EntriesHeader>
@@ -85 +86 @@
 </div>
   
+  {{tpl:ductileNbEntryPerPage}}
   <tpl:Entries>
-
      {{tpl:ductileEntriesList default="short"}}
    

themes/ductile/tpl/home.html

@@ -27 +27 @@
   </tpl:Categories>
   
+  {{tpl:ductileNbEntryPerPage nb="8"}}
   <tpl:Entries no_content="1">
     <tpl:EntriesHeader>
@@ -59 +60 @@
   <div id="content">
 
+  {{tpl:ductileNbEntryPerPage nb="8"}}
   <tpl:Entries>
 

themes/ductile/tpl/search.html

@@ -23 +23 @@
   <link rel="contents" href="{{tpl:BlogArchiveURL}}" title="{{tpl:lang Archives}}" />
   
+  {{tpl:ductileNbEntryPerPage}}
   <tpl:Entries no_content="1">
     <tpl:EntriesHeader>
@@ -66 +67 @@
   </div>
   
+  {{tpl:ductileNbEntryPerPage}}
   <tpl:Entries>