aboutsummaryrefslogtreecommitdiffstats
path: root/include/functions_html.inc.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2007-02-20 01:40:40 +0000
committerrvelices <rv-github@modusoptimus.com>2007-02-20 01:40:40 +0000
commitf39bf0bb26d4cf0cf02fec5dc8c06ced0de5846b (patch)
treee8372e512beb1aa19a67203d98373e487b8edef2 /include/functions_html.inc.php
parented4b51f1f140be4f83bdf68a17600f92940ab6f7 (diff)
- 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
Diffstat (limited to '')
-rw-r--r--include/functions_html.inc.php13
1 files changed, 6 insertions, 7 deletions
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'].'</a>';
- // 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".'<span class="';
- $menu.= ($category['nb_images'] > 0 ? "menuInfoCat"
+ // at least one image in this category -> 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.= '</span>';
}
$child_date_last = @$category['max_date_last']> @$category['date_last'];