Changeset 11996

Timestamp:

08/26/11 13:02:11 (22 months ago)

Author:

plg

Message:

feature 1729: rewrite function get_thumbnail_title to provide a complete tooltip
to the template file. It include the name of the photo, details such as number
of visits, number of comments, rating score, and the description.

Location:

trunk/include

Files:

• category_default.inc.php (modified) (2 diffs)
• functions.inc.php (modified) (2 diffs)

trunk/include/category_default.inc.php

@@ -105 +105 @@
       );
 
+  if (isset($nb_comments_of) )
+  {
+    $row['nb_comments'] = (int)@$nb_comments_of[$row['id']];
+  }
+
   $tpl_var =
     array(
@@ -167 +172 @@
   $tpl_var['NAME'] = $name;
 
-  if ( isset($nb_comments_of) )
+  if (isset($row['nb_comments']))
   {
-    $tpl_var['NB_COMMENTS'] = (int)@$nb_comments_of[$row['id']];
+    $tpl_var['NB_COMMENTS'] = $row['nb_comments'];
   }
 

trunk/include/functions.inc.php

@@ -783 +783 @@
 }
 
-/* returns the title of the thumnail */
-function get_thumbnail_title($element_info)
-{
-  // message in title for the thumbnail
-  if (isset($element_info['file']))
-  {
-    $thumbnail_title = $element_info['file'];
-  }
-  else
-  {
-    $thumbnail_title = '';
-  }
-
-  if (!empty($element_info['filesize']))
-  {
-    $thumbnail_title .= ' : '.sprintf(l10n('%d Kb'), $element_info['filesize']);
-  }
-
-  return $thumbnail_title;
+/**
+ * returns the title of the thumbnail based on photo properties
+ */
+function get_thumbnail_title($info)
+{
+  global $conf, $user;
+
+  $title = get_picture_title($info);
+
+  $details = array();
+
+  if ($info['hit'] != 0)
+  {
+    $details[] = $info['hit'].' '.strtolower(l10n('Visits'));
+  }
+
+  if ($conf['rate'] and !empty($info['rating_score']))
+  {
+    $details[] = strtolower(l10n('Rating score')).' '.$info['rating_score'];
+  }
+
+  if (isset($info['nb_comments']) and $info['nb_comments'] != 0)
+  {
+    $details[] = l10n_dec('%d comment', '%d comments', $info['nb_comments']);
+  }
+
+  if (count($details) > 0)
+  {
+    $title.= ' ('.implode(', ', $details).')';
+  }
+
+  if (!empty($info['comment']))
+  {
+    $title.= ' '.$info['comment'];
+  }
+
+  $title = strip_tags($title);
+
+  $title = trigger_event('get_thumbnail_title', $title, $info);
+
+  return $title;
 }
 
@@ -846 +868 @@
 {
   return str_replace('_',' ',get_filename_wo_extension($filename));
+}
+
+/**
+ */
+function get_picture_title($info)
+{
+  if (isset($info['name']) and !empty($info['name']))
+  {
+    return $info['name'];
+  }
+
+  return  get_name_from_file($info['file']);
 }