diff options
author | rub <rub@piwigo.org> | 2007-03-09 22:52:22 +0000 |
---|---|---|
committer | rub <rub@piwigo.org> | 2007-03-09 22:52:22 +0000 |
commit | 3495d30775a3d9c104fc46ea24f5fd6ee7d69600 (patch) | |
tree | 55d82154ea9da424ed02f98ef146da7187e28253 /include | |
parent | b0478ef330b8f729554aec55baa81d9e3d02a063 (diff) |
Add DateTime on administration introduction page (Useful to help user on the forum, ...)
Move history configuration in a other tab.
Use translation on picture hint (Kb).
Show hint oh the menu text (not only on counter)
git-svn-id: http://piwigo.org/svn/trunk@1884 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r-- | include/category_cats.inc.php | 2 | ||||
-rw-r--r-- | include/functions.inc.php | 2 | ||||
-rw-r--r-- | include/functions_html.inc.php | 21 |
3 files changed, 13 insertions, 12 deletions
diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php index 8e967bdc9..f50f9ff77 100644 --- a/include/category_cats.inc.php +++ b/include/category_cats.inc.php @@ -256,7 +256,7 @@ if (count($categories) > 0) $category['count_images'], $category['count_categories'], true, - '; ' + ' / ' ), 'U_IMG_LINK' => make_index_url( diff --git a/include/functions.inc.php b/include/functions.inc.php index 5540c87c8..00a915d90 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -840,7 +840,7 @@ function get_thumbnail_title($element_info) if (!empty($element_info['filesize'])) { - $thumbnail_title .= ' : '.$element_info['filesize'].' KB'; + $thumbnail_title .= ' : '.l10n_dec('%d Kb', '%d Kb', $element_info['filesize']); } return $thumbnail_title; diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index 43cf5d9e6..db6d12710 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -428,13 +428,22 @@ function get_html_menu_category($categories, $selected_category) ) ); + $title = get_display_images_count + ( + $category['nb_images'], + $category['count_images'], + $category['count_categories'], + false, + ' / ' + ); + $menu.= "\n".'<a href="'.$url.'"'; if ($selected_category!=null and $category['id'] == $selected_category['id_uppercat']) { $menu.= ' rel="up"'; } - $menu.= '>'.$category['name'].'</a>'; + $menu.= ' title=" '.$title.'">'.$category['name'].'</a>'; if ( $category['count_images']>0 ) {// at least one direct or indirect image @@ -442,15 +451,7 @@ function get_html_menu_category($categories, $selected_category) // at least one image in this category -> class menuInfoCat $menu.= ($category['nb_images'] > 0 ? "menuInfoCat" : "menuInfoCatByChild").'"'; - $menu.= ' title="'; - $menu.= ' '.get_display_images_count - ( - $category['nb_images'], - $category['count_images'], - $category['count_categories'], - false, - ' / ' - ).'">'; + $menu.= ' title=" '.$title.'">'; // show total number of images $menu.= '['.$category['count_images'].']'; $menu.= '</span>'; |