Changeset 2577:9a2b43a68e3d

Timestamp:

11/21/13 15:11:09 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Number of entries on first home page may be set (does not modify number of entries on other pages), fixes #1269

Files:

• admin/blog_pref.php (modified) (3 diffs)
• inc/core/class.dc.core.php (modified) (1 diff)
• inc/public/class.dc.template.php (modified) (1 diff)
• inc/public/lib.tpl.context.php (modified) (1 diff)
• inc/public/lib.urlhandlers.php (modified) (3 diffs)
• locales/fr/main.po (modified) (1 diff)

admin/blog_pref.php

@@ -166 +166 @@
      $media_img_m_size = abs((integer) $_POST['media_img_m_size']);
      if ($media_img_m_size < 0) { $media_img_m_size = 448; }
+
+     $nb_post_for_home = abs((integer) $_POST['nb_post_for_home']);
+     if ($nb_post_for_home <= 1) { $nb_post_for_home = 1; }
 
      $nb_post_per_page = abs((integer) $_POST['nb_post_per_page']);
@@ -231 +234 @@
           $blog_settings->system->put('note_title_tag',$_POST['note_title_tag']);
 
+          $blog_settings->system->put('nb_post_for_home',$nb_post_for_home);
           $blog_settings->system->put('nb_post_per_page',$nb_post_per_page);
           $blog_settings->system->put('use_smilies',!empty($_POST['use_smilies']));
@@ -512 +516 @@
 
      '<div class="col">'.
+     '<p><label for="nb_post_for_home" class="classic">'.sprintf(__('Display %s entries on home page'),
+     form::field('nb_post_for_home',2,3,$blog_settings->system->nb_post_for_home)).
+     '</label></p>'.
+
      '<p><label for="nb_post_per_page" class="classic">'.sprintf(__('Display %s entries per page'),
      form::field('nb_post_per_page',2,3,$blog_settings->system->nb_post_per_page)).

inc/core/class.dc.core.php

@@ -1306 +1306 @@
                     array('media_img_title_pattern','string','Title ;; Date(%b %Y) ;; separator(, )',
                     'Pattern to set image title when you insert it in a post'),
+                    array('nb_post_for_home','integer',20,
+                    'Number of entries on first home page'),
                     array('nb_post_per_page','integer',20,
-                    'Number of entries on home page and category pages'),
+                    'Number of entries on home pages and category pages'),
                     array('nb_post_per_feed','integer',20,
                     'Number of entries on feeds'),

inc/public/class.dc.template.php

@@ -1042 +1042 @@
 
           if ($lastn != 0) {
+               // Set limit (aka nb of entries needed)
                if ($lastn > 0) {
+                    // nb of entries per page specified in template -> regular pagination
                     $p .= "\$params['limit'] = ".$lastn.";\n";
                } else {
-                    $p .= "\$params['limit'] = \$_ctx->nb_entry_per_page;\n";
+                    // nb of entries per page not specified -> use ctx settings
+                    $p .= "\$params['limit'] = (\$_page_number == 1 ? \$_ctx->nb_entry_first_page : \$_ctx->nb_entry_per_page);\n";
                }
-
+               // Set offset (aka index of first entry)
                if (!isset($attr['ignore_pagination']) || $attr['ignore_pagination'] == "0") {
-                    $p .= "\$params['limit'] = array(((\$_page_number-1)*\$params['limit']),\$params['limit']);\n";
+                    // standard pagination, set offset
+                    $p .= "\$params['limit'] = array((\$_page_number == 1 ? 0 : (\$_page_number - 2) * \$_ctx->nb_entry_per_page + \$_ctx->nb_entry_first_page),\$params['limit']);\n";
                } else {
+                    // no pagination, get all posts from 0 to limit
                     $p .= "\$params['limit'] = array(0, \$params['limit']);\n";
                }

inc/public/lib.tpl.context.php

@@ -206 +206 @@
 
           $nb_posts = $_ctx->pagination->f(0);
-          $nb_per_page = $_ctx->post_params['limit'][1];
-
-          $nb_pages = ceil($nb_posts/$nb_per_page);
+          $nb_pages = ceil(($nb_posts - $_ctx->nb_entry_first_page) / $_ctx->nb_entry_per_page + 1);
 
           return $nb_pages;

inc/public/lib.urlhandlers.php

@@ -86 +86 @@
                $_ctx->nb_entry_per_page = $core->blog->settings->system->nb_post_per_page;
           }
+          if ($_ctx->nb_entry_first_page === null) {
+               $_ctx->nb_entry_first_page = $_ctx->nb_entry_per_page;
+          }
 
           $tpl_file = $core->tpl->getFilePath($tpl);
@@ -188 +191 @@
           else
           {
+               $_ctx =& $GLOBALS['_ctx'];
                $core =& $GLOBALS['core'];
 
@@ -196 +200 @@
 
                if (empty($_GET['q'])) {
+                    if ($core->blog->settings->system->nb_post_for_home !== null) {
+                         $_ctx->nb_entry_first_page = $core->blog->settings->system->nb_post_for_home;
+                    }
                     self::serveDocument('home.html');
                     $core->blog->publishScheduledEntries();

locales/fr/main.po

@@ -399 +399 @@
 
 #, php-format
+msgid "Display %s entries on home page"
+msgstr "Afficher %s billets sur la page d'accueil"
+
+#, php-format
 msgid "Display %s entries per page"
 msgstr "Afficher %s billets par page"