From 97898b36858d5f187e9659d723c71eb04b2f0593 Mon Sep 17 00:00:00 2001 From: rvelices Date: Tue, 28 Feb 2006 04:28:06 +0000 Subject: calendar improvements: week on weekly list starts on Monday, ability to show grayed months/weeks/days (without any picture in it), added icons for created/posted fields language uniformization calendar fixes: correct number of pictures in calendar view, code simplification (I hope so) git-svn-id: http://piwigo.org/svn/trunk@1059 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_category.inc.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'include/functions_category.inc.php') diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php index f7c5b926b..23a50b354 100644 --- a/include/functions_category.inc.php +++ b/include/functions_category.inc.php @@ -28,7 +28,7 @@ /** * Provides functions to handle categories. * - * + * */ /** @@ -67,9 +67,9 @@ function check_restrictions($category_id) function get_categories_menu() { global $page,$user; - + $infos = array(''); - + $query = ' SELECT name,id,date_last,nb_images,global_rank FROM '.CATEGORIES_TABLE.' @@ -119,7 +119,7 @@ SELECT COUNT(DISTINCT(image_id)) as total WHERE category_id NOT IN ('.$user['forbidden_categories'].') ;'; list($total) = mysql_fetch_array(pwg_query($query)); - + return $total; } @@ -135,7 +135,7 @@ SELECT COUNT(DISTINCT(image_id)) as total * - nb_images * - id_uppercat * - site_id - * - + * - * * @param int category id * @return array @@ -145,7 +145,7 @@ function get_cat_info( $id ) $infos = array('nb_images','id_uppercat','comment','site_id' ,'dir','date_last','uploadable','status','visible' ,'representative_picture_id','uppercats','commentable'); - + $query = ' SELECT '.implode(',', $infos).' FROM '.CATEGORIES_TABLE.' @@ -196,7 +196,7 @@ SELECT name,id { $cat['name'][$cat_id] = $names[$cat_id]; } - + return $cat; } @@ -274,11 +274,11 @@ function get_category_preferred_image_orders() { global $conf; return array( - array('Default', '', true), + array(l10n('default_sort'), '', true), array(l10n('Average rate'), 'average_rate DESC', $conf['rate']), array(l10n('most_visited_cat'), 'hit DESC', true), array(l10n('Creation date'), 'date_creation DESC', true), - array(l10n('Availability date'), 'date_available DESC', true), + array(l10n('Post date'), 'date_available DESC', true), array(l10n('File name'), 'file ASC', true) ); } @@ -310,7 +310,7 @@ function display_select_categories($categories, (3 * substr_count($category['global_rank'], '.'))); $option.= '- '.$category['name']; } - + $template->assign_block_vars( $blockname, array('SELECTED'=>$selected, -- cgit v1.2.3