Changeset 1840 for trunk/include/functions_html.inc.php

Timestamp:

Feb 20, 2007, 2:40:40 AM (17 years ago)

Author:

rvelices

Message:

• 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')

File:

• trunk/include/functions_html.inc.php (modified) (2 diffs)

trunk/include/functions_html.inc.php

@@ -459 +459 @@
     $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="';
@@ -474 +473 @@
                     false
                   ).'">';
-      $menu.= '['.($category['nb_images'] > 0 ? $category['nb_images']
-                                              : $category['count_images']).']';
+      // show total number of images
+      $menu.= '['.$category['count_images'].']';
       $menu.= '</span>';
     }