Changeset 18165 for trunk

Timestamp:

Sep 23, 2012, 1:19:26 PM (12 years ago)

Author:

mistic100

Message:

feature 2614: pagination on albums

Location:

trunk

Files:

• admin/configuration.php (modified) (2 diffs)
• admin/themes/default/template/configuration.tpl (modified) (1 diff)
• include/category_cats.inc.php (modified) (2 diffs)
• include/functions.inc.php (modified) (2 diffs)
• include/functions_url.inc.php (modified) (2 diffs)
• include/section_init.inc.php (modified) (3 diffs)
• index.php (modified) (5 diffs)
• install/config.sql (modified) (1 diff)
• install/db/131-database.php (added)
• language/en_UK/admin.lang.php (modified) (1 diff)
• language/fr_FR/admin.lang.php (modified) (1 diff)
• themes/default/template/index.tpl (modified) (2 diffs)

trunk/admin/configuration.php

@@ -223 +223 @@
     case 'display' :
     {
+      if (!preg_match($int_pattern, $_POST['nb_categories_page'])
+            or $_POST['nb_categories_page'] < 4)
+      {
+        array_push($page['errors'], l10n('The number of albums a page must be above 4.'));
+      }
       foreach( $display_checkboxes as $checkbox)
       {
@@ -423 +428 @@
         'display',
         array(
-          'picture_informations' => unserialize($conf['picture_informations'])
+          'picture_informations' => unserialize($conf['picture_informations']),
+          'NB_CATEGORIES_PAGE' => $conf['nb_categories_page'],
           ),
         true

trunk/admin/themes/default/template/configuration.tpl

@@ -646 +646 @@
       </label>
     </li>
+    
+    <li>
+      <label>
+        {'Number of albums per page'|@translate}
+        <input type="text" size="3" maxlength="4" name="nb_categories_page" id="nb_categories_page" value="{$display.NB_CATEGORIES_PAGE}">
+      </label>
+    </li>
   </ul>
 </fieldset>

trunk/include/category_cats.inc.php

@@ -23 +23 @@
 
 /**
- * This file is included by the main page to show thumbnails for a category
- * that have only subcategories or to show recent categories
+ * This file is included by the main page to show subcategories of a category
+ * or to show recent categories or main page categories list
  *
  */
+
+$selection = array_slice(
+  $page['categories'],
+  $page['starta'],
+  $conf['nb_categories_page']
+  );
+
+$selection = trigger_event('loc_index_categories_selection', $selection);
 
 // $user['forbidden_categories'] including with USER_CACHE_CATEGORIES_TABLE
@@ -39 +47 @@
     count_categories
   FROM '.CATEGORIES_TABLE.' c
-    INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.' ucc ON id = cat_id AND user_id = '.$user['id'];
-
-if ('recent_cats' == $page['section'])
-{
-  $query.= '
-  WHERE date_last >= '.pwg_db_get_recent_period_expression($user['recent_period']);
-}
-else
-{
-  $query.= '
-  WHERE id_uppercat '.(!isset($page['category']) ? 'is NULL' : '= '.$page['category']['id']);
-}
-
-$query.= '
-    '.get_sql_condition_FandF(
-  array(
-    'visible_categories' => 'id',
-    ),
-  'AND'
-  );
-
+    INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.' ucc 
+    ON id = cat_id 
+    AND user_id = '.$user['id'].'
+  WHERE c.id IN('.implode(',', $selection).')';
+  
 if ('recent_cats' != $page['section'])
 {

trunk/include/functions.inc.php

@@ -1430 +1430 @@
  * return an array which will be sent to template to display navigation bar
  */
-function create_navigation_bar($url, $nb_element, $start, $nb_element_page, $clean_url = false)
+function create_navigation_bar($url, $nb_element, $start, $nb_element_page, $clean_url = false, $param_name='start')
 {
   global $conf;
@@ -1436 +1436 @@
   $navbar = array();
   $pages_around = $conf['paginate_pages_around'];
-  $start_str = $clean_url ? '/start-' : (strpos($url, '?')===false ? '?':'&').'start=';
+  $start_str = $clean_url ? '/'.$param_name.'-' : (strpos($url, '?')===false ? '?':'&').$param_name.'=';
 
   if (!isset($start) or !is_numeric($start) or (is_numeric($start) and $start < 0))

trunk/include/functions_url.inc.php

@@ -459 +459 @@
             and strpos($tokens[$current_token], 'posted-')!==0
             and strpos($tokens[$next_token], 'start-')!==0
+            and strpos($tokens[$next_token], 'starta-')!==0
             and $tokens[$current_token] != 'flat')
         {
@@ -652 +653 @@
       $page['start'] = $matches[1];
     }
+    elseif (preg_match('/^starta-(\d+)/', $tokens[$i], $matches))
+    {
+      $page['starta'] = $matches[1];
+    }
     $i++;
   }

trunk/include/section_init.inc.php

@@ -42 +42 @@
 //   );
 
-$page['items'] = array();
+// exemple of dynamic nb_categories_page (%2 for nice display)
+// $conf['nb_categories_page'] = 2*round($user['nb_image_page']/4);
+
+$page['items'] = $page['categories'] = array();
+$page['start'] = $page['starta'] = 0;
 
 // some ISPs set PATH_INFO to empty string or to SCRIPT_FILENAME while in the
@@ -247 +251 @@
     $page['title'] = ''; // will be set later
 
+    
+  // GET IMAGES LIST
   if
     (
+      $page['starta'] == 0 and
       (!isset($page['chronology_field'])) and
       (
@@ -311 +318 @@
     $page['items'] = array_from_query($query, 'image_id');
   } //otherwise the calendar will requery all subitems
+  
+  // GET CATEGORIES LIST
+  if ( 0==$page['start']
+    and !isset($page['flat'])
+    and !isset($page['chronology_field'])
+    and ('recent_cats'==$page['section'] or 'categories'==$page['section'])
+    and (!isset($page['category']['count_categories']) or $page['category']['count_categories']>0 )
+  )
+  {
+    $query = '
+SELECT c.id
+  FROM '.CATEGORIES_TABLE.' c
+    INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.' ucc 
+    ON id = cat_id 
+    AND user_id = '.$user['id'];
+
+    if ('recent_cats' == $page['section'])
+    {
+      $query.= '
+      WHERE date_last >= '.pwg_db_get_recent_period_expression($user['recent_period']);
+    }
+    else
+    {
+      $query.= '
+      WHERE id_uppercat '.(!isset($page['category']) ? 'is NULL' : '= '.$page['category']['id']);
+    }
+
+    $query.= '
+        '.get_sql_condition_FandF(
+          array('visible_categories' => 'id'),
+          'AND'
+          );
+
+    $query.= '
+    ;';
+
+    $page['categories'] = array_from_query($query, 'id');
+  }
 }
 // special sections

trunk/index.php

@@ -30 +30 @@
 check_status(ACCESS_GUEST);
 
-if (!isset($page['start']))
-{
-  $page['start'] = 0;
-}
 
 // access authorization check
@@ -75 +71 @@
 //-------------------------------------------------------------- initialization
 
+// navigation bar
 $page['navigation_bar'] = array();
 if (count($page['items']) > $page['nb_image_page'])
@@ -83 +80 @@
     $page['start'],
     $page['nb_image_page'],
-    true
-    );
-}
+    true, 'start'
+    );
+}
+
+$page['cats_navigation_bar'] = array();
+if (count($page['categories']) > $conf['nb_categories_page'])
+{
+  $page['cats_navigation_bar'] = create_navigation_bar(
+    duplicate_index_url(array(), array('starta')),
+    count($page['categories']),
+    $page['starta'],
+    $conf['nb_categories_page'],
+    true, 'starta'
+    );
+}
+
+$template->assign( 'thumb_navbar', $page['navigation_bar'] );
+$template->assign( 'cats_navbar', $page['cats_navigation_bar'] );
 
 // caddie filling :-)
@@ -243 +255 @@
 }
 
-// navigation bar
-$template->assign( 'navbar', $page['navigation_bar'] );
 
 if ( $conf['index_sort_order_input']
@@ -289 +299 @@
 
 //------------------------------------------------------ main part : thumbnails
-if ( 0==$page['start']
-    and !isset($page['flat'])
-    and !isset($page['chronology_field'])
-    and ('recent_cats'==$page['section'] or 'categories'==$page['section'])
-    and (!isset($page['category']['count_categories']) or $page['category']['count_categories']>0 )
-  )
+if ( !empty($page['categories']) )
 {
   include(PHPWG_ROOT_PATH.'include/category_cats.inc.php');

trunk/install/config.sql

@@ -22 +22 @@
 INSERT INTO piwigo_config (param,value,comment) VALUES ('allow_user_registration','true','allow visitors to register?');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('allow_user_customization','true','allow users to customize their gallery?');
+INSERT INTO piwigo_config (param,value,comment) VALUES ('nb_categories_page','12');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_html_mail','true','Send mail on HTML format for notification by mail');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_mail_as','','Send mail as param value for notification by mail');

trunk/language/en_UK/admin.lang.php

@@ -539 +539 @@
 $lang['Notify administrators when a comment is'] = 'Notify administrators when a comment is';
 $lang['Number of comments per page'] = "Number of comments per page";
+$lang['Number of albums per page'] = 'Number of albums per page';
 $lang['Number of downloads'] = "Number of downloads";
 $lang['number of miniaturized photos'] = "number of thumbnails created";

trunk/language/fr_FR/admin.lang.php

@@ -937 +937 @@
 $lang['Manage photos'] = 'Gérer les photos';
 $lang['View in gallery'] = 'Voir dans la galerie';
+$lang['Number of albums per page'] = 'Nombre d\'albums par page';
 ?>

trunk/themes/default/template/index.tpl

@@ -164 +164 @@
 
 {if !empty($CATEGORIES)}{$CATEGORIES}{/if}
+{if !empty($cats_navbar)}
+  {assign var=navbar value=$cats_navbar}
+  {include file='navigation_bar.tpl'|@get_extent:'navbar'}
+{/if}
+
 {if !empty($THUMBNAILS)}
 <ul class="thumbnails" id="thumbnails">
@@ -169 +174 @@
 </ul>
 {/if}
-
-{if !empty($navbar)}{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
+{if !empty($thumb_navbar)}
+  {assign var=navbar value=$thumb_navbar}
+  {include file='navigation_bar.tpl'|@get_extent:'navbar'}
+{/if}
 
 {if !empty($PLUGIN_INDEX_CONTENT_END)}{$PLUGIN_INDEX_CONTENT_END}{/if}