From f39bf0bb26d4cf0cf02fec5dc8c06ced0de5846b Mon Sep 17 00:00:00 2001 From: rvelices Date: Tue, 20 Feb 2007 01:40:40 +0000 Subject: - without subcatify, category thumbnail alt text is 'x images in y sub-categories' - improved display of 'x images in y sub-categories' or 'x images in this category' for cases when categories contain both images and sub-categories - small lang improvement (plural 'Images within the' instead 'Image within the') git-svn-id: http://piwigo.org/svn/trunk@1840 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_html.inc.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'include/functions_html.inc.php') diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index b995ed7cf..751749490 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -458,12 +458,11 @@ function get_html_menu_category($categories) } $menu.= '>'.$category['name'].''; - // Count of category is main - // if not picture on categorie, test on sub-categories - if (($category['nb_images'] > 0) or ($category['count_images'] > 0)) - { + if ( $category['count_images']>0 ) + {// at least one direct or indirect image $menu.= "\n".' class menuInfoCat + $menu.= ($category['nb_images'] > 0 ? "menuInfoCat" : "menuInfoCatByChild").'"'; $menu.= ' title="'; $menu.= ' '.get_display_images_count @@ -473,8 +472,8 @@ function get_html_menu_category($categories) $category['count_categories'], false ).'">'; - $menu.= '['.($category['nb_images'] > 0 ? $category['nb_images'] - : $category['count_images']).']'; + // show total number of images + $menu.= '['.$category['count_images'].']'; $menu.= ''; } $child_date_last = @$category['max_date_last']> @$category['date_last']; -- cgit v1.2.3