mirror of
https://github.com/Piwigo/Piwigo.git
synced 2025-04-29 12:49:57 +03:00
- 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
This commit is contained in:
parent
ed4b51f1f1
commit
f39bf0bb26
5 changed files with 19 additions and 20 deletions
|
@ -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'];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue