Changeset 1763

Timestamp:

Jan 28, 2007, 9:56:10 PM (17 years ago)

Author:

vdigital

Message:

Issue 0000614: Display hits under thumbnails like comments counter

Location:

trunk

Files:

• admin/configuration.php (modified) (2 diffs)
• admin/include/functions.php (modified) (1 diff)
• admin/user_list.php (modified) (3 diffs)
• include/category_default.inc.php (modified) (1 diff)
• include/config_default.inc.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (2 diffs)
• language/en_UK.iso-8859-1/common.lang.php (modified) (2 diffs)
• language/en_UK.iso-8859-1/help/configuration.html (modified) (1 diff)
• language/fr_FR.iso-8859-1/common.lang.php (modified) (2 diffs)
• language/fr_FR.iso-8859-1/help/configuration.html (modified) (1 diff)
• profile.php (modified) (3 diffs)
• template/yoga/admin/configuration.tpl (modified) (1 diff)
• template/yoga/admin/user_list.tpl (modified) (1 diff)
• template/yoga/profile_content.tpl (modified) (1 diff)
• template/yoga/thumbnails.tpl (modified) (1 diff)

trunk/admin/configuration.php

@@ -233 +233 @@
     $show_yes = ($conf['show_nb_comments']==true)?'checked="checked"':'';
     $show_no = ($conf['show_nb_comments']==false)?'checked="checked"':'';
+    $hits_yes = ($conf['show_nb_hits']==true)?'checked="checked"':'';
+    $hits_no = ($conf['show_nb_hits']==false)?'checked="checked"':'';
     $expand_yes = ($conf['auto_expand']==true)?'checked="checked"':'';
     $expand_no  = ($conf['auto_expand']==false)?'checked="checked"':'';
@@ -248 +250 @@
         'EXPAND_NO'=>$expand_no,
         'SHOW_COMMENTS_YES'=>$show_yes,
-        'SHOW_COMMENTS_NO'=>$show_no
+        'SHOW_COMMENTS_NO'=>$show_no,
+        'SHOW_HITS_YES'=>$hits_yes,
+        'SHOW_HITS_NO'=>$hits_no,
         ));
 

trunk/admin/include/functions.php

@@ -1158 +1158 @@
       $insert['show_nb_comments'] =
         boolean_to_string($conf['show_nb_comments']);
+      $insert['show_nb_hits'] =
+        boolean_to_string($conf['show_nb_hits']);
       $insert['maxwidth'] = $conf['default_maxwidth'];
       $insert['maxheight'] = $conf['default_maxheight'];

trunk/admin/user_list.php

@@ -343 +343 @@
     array('nb_image_line', 'nb_line_page', 'template', 'language',
           'recent_period', 'maxwidth', 'expand', 'show_nb_comments',
-          'maxheight', 'status', 'enabled_high');
-
-  $true_false_fields = array('expand', 'show_nb_comments', 'enabled_high');
+          'show_nb_hits', 'maxheight', 'status', 'enabled_high');
+
+  $true_false_fields = array('expand', 'show_nb_comments', 
+                       'show_nb_hits', 'enabled_high');
   if ($conf['allow_adviser'])
   {
@@ -557 +558 @@
 //   $user['expand'] = $conf['auto_expand'];
 //   $user['show_nb_comments'] = $conf['show_nb_comments'];
+//   $user['show_nb_hits'] = $conf['show_nb_hits'];
 // ---
 
@@ -577 +579 @@
       'SHOW_NB_COMMENTS_NO' =>
         'false' == $_POST['show_nb_comments'] ? 'checked="checked"' : '',
+      'SHOW_NB_HITS_YES' =>
+        'true' == $_POST['show_nb_hits'] ? 'checked="checked"' : '',
+      'SHOW_NB_HITS_NO' =>
+        'false' == $_POST['show_nb_hits'] ? 'checked="checked"' : '',
       'ENABLED_HIGH_YES' => 'true' == $_POST['enabled_high'] ? 'checked="checked"' : '',
       'ENABLED_HIGH_NO' => 'false' == $_POST['enabled_high'] ? 'checked="checked"' : '',

trunk/include/category_default.inc.php

@@ -105 +105 @@
       )
     );
+  if ($user['show_nb_hits']
+      and isset($page['category']) 
+      and $conf['show_nb_hits'])
+  {
+    $template->assign_block_vars(
+      'thumbnails.line.thumbnail.nb_hits',
+      array('HITS'=> l10n_dec('%d hit', '%d hits', $row['hit'])));
+  }
 
   if ($conf['show_thumbnail_caption'])

trunk/include/config_default.inc.php

@@ -161 +161 @@
 // bottom of each page ?
 $conf['show_version'] = true;
+
+// show_nb_hits :       Show hits count under thumbnails
+// false = never... true = depending on profile...
+$conf['show_nb_hits'] = false;
 
 // links : list of external links to add in the menu. An example is the best

trunk/include/functions_user.inc.php

@@ -161 +161 @@
     $user['expand'] = $conf['auto_expand'];
     $user['show_nb_comments'] = $conf['show_nb_comments'];
+    $user['show_nb_hits'] = $conf['show_nb_hits'];
     $user['enabled_high'] = $conf['newuser_default_enabled_high'];
   }
@@ -776 +777 @@
       'expand' => boolean_to_string($conf['auto_expand']),
       'show_nb_comments' => boolean_to_string($conf['show_nb_comments']),
+      'show_nb_hits' => boolean_to_string($conf['show_nb_hits']),
       'maxwidth' => $conf['default_maxwidth'],
       'maxheight' => $conf['default_maxheight'],

trunk/language/en_UK.iso-8859-1/common.lang.php

@@ -300 +300 @@
 $lang['%d new comment'] = '%d new comment';
 $lang['%d new comments'] = '%d new comments';
+$lang['%d hit'] = '%d hit';
+$lang['%d hits'] = '%d hits';
 $lang['%d new element'] = '%d new element';
 $lang['%d new elements'] = '%d new elements';
@@ -571 +573 @@
 $lang['set as category representative'] = 'set as category representative';
 $lang['show_nb_comments'] = 'Show number of comments';
+$lang['show_nb_hits'] = 'Show hits count';
 $lang['slideshow'] = 'slideshow';
 $lang['slideshow_stop'] = 'stop the slideshow';

trunk/language/en_UK.iso-8859-1/help/configuration.html

@@ -94 +94 @@
   for each picture on the thumbnails page. Resource consuming.</li>
 
+  <li><strong>Show hits count</strong>: display hits observed on picture
+  just under its thumbnail on the thumbnails page. 
+  Only when advanced configuration parameter is: <br />
+  $conf['show_nb_hits'] = true; <br />
+  Notice: it is false by default.</li>
+
   <li><strong>Maximum width of the pictures</strong>: maximum displayed
   width. If pictures are larger than this setting, they will be resized on

trunk/language/fr_FR.iso-8859-1/common.lang.php

@@ -300 +300 @@
 $lang['%d new comment'] = '%d nouveau commentaire utilisateur';
 $lang['%d new comments'] = '%d nouveaux commentaires utilisateur';
+$lang['%d hit'] = 'vue %d fois';
+$lang['%d hits'] = 'vue %d fois';
 $lang['%d new element'] = '%d nouvel élément';
 $lang['%d new elements'] = '%d nouveaux éléments';
@@ -572 +574 @@
 $lang['set as category representative'] = 'élire comme représentant de cette catégorie';
 $lang['show_nb_comments'] = 'Montrer le nombre de commentaires';
+$lang['show_nb_hits'] = 'Montrer le nombre de visualisations';
 $lang['slideshow'] = 'diaporama';
 $lang['slideshow_stop'] = 'arrêter le diaporama';

trunk/language/fr_FR.iso-8859-1/help/configuration.html

@@ -99 +99 @@
 ressources.</li>
 
+  <li><strong>Montrer le nombre de visualisations  </strong>: affiche les 
+  « hits » relevés sur une image sous sa miniature dans la page de miniatures.
+  Uniquement valable si le paramètre de configuration avancée est :<br />
+  $conf['show_nb_hits'] = true; <br />
+  N.B.: par defaut il est à false.</li>
+
   <li><strong>Largeur maximum des images</strong>: à l'affichage. Si l'image
 est plus large que ce paramètre, alors elle sera redimensionnée à

trunk/profile.php

@@ -173 +173 @@
     $fields = array(
       'nb_image_line', 'nb_line_page', 'language', 'maxwidth', 'maxheight',
-      'expand', 'show_nb_comments', 'recent_period', 'template'
+      'expand', 'show_nb_comments', 'show_nb_hits', 'recent_period', 'template'
       );
 
@@ -202 +202 @@
   $template->set_filename('profile_content', 'profile_content.tpl');
 
-  $expand = ($userdata['expand'] == 'true') ? 'EXPAND_TREE_YES':'EXPAND_TREE_NO';
+  $expand = ($userdata['expand'] == 'true') ? 
+            'EXPAND_TREE_YES':'EXPAND_TREE_NO';
 
   $nb_comments =
-    ($userdata['show_nb_comments'] == 'true') ? 'NB_COMMENTS_YES':'NB_COMMENTS_NO';
+    ($userdata['show_nb_comments'] == 'true') ? 
+               'NB_COMMENTS_YES':'NB_COMMENTS_NO';
+
+  $nb_hits =
+    ($userdata['show_nb_hits'] == 'true') ? 
+               'NB_HITS_YES':'NB_HITS_NO';
 
   $template->assign_vars(
@@ -220 +226 @@
       $expand=>'checked="checked"',
       $nb_comments=>'checked="checked"',
+      $nb_hits=>'checked="checked"',
   
       'REDIRECT' => $url_redirect,

trunk/template/yoga/admin/configuration.tpl

@@ -195 +195 @@
 
     <li>
+      <span class="property">{lang:show_nb_hits}</span>
+      <label><input type="radio" class="radio" name="show_nb_hits" value="true" {default.SHOW_HITS_YES} />{lang:Yes}</label>
+      <label><input type="radio" class="radio" name="show_nb_hits" value="false" {default.SHOW_HITS_NO} />{lang:No}</label>
+    </li>
+
+    <li>
       <span class="property">
         <label for="default_maxwidth">{lang:Maximum width of the pictures}</label>

trunk/template/yoga/admin/user_list.tpl

@@ -269 +269 @@
 
   <tr>
+    <td>{lang:show_nb_hits}</td>
+    <td>
+      <label><input type="radio" name="show_nb_hits" value="leave" checked="checked" /> {lang:leave}</label>
+      / {lang:set to}
+      <label><input type="radio" name="show_nb_hits" value="true" {SHOW_NB_HITS_YES} />{lang:yes}</label>
+      <label><input type="radio" name="show_nb_hits" value="false" {SHOW_NB_HITS_NO} />{lang:no}</label>
+    </td>
+  </tr>
+
+  <tr>
     <td>{lang:maxwidth}</td>
     <td>

trunk/template/yoga/profile_content.tpl

@@ -92 +92 @@
       </li>
       <li>
+        <span class="property">{lang:show_nb_hits}</span>
+        <label><input type="radio" name="show_nb_hits" value="true" {NB_HITS_YES}> {lang:yes}</label>
+        <label><input type="radio" name="show_nb_hits" value="false" {NB_HITS_NO}> {lang:no}</label>
+      </li>
+      <li>
         <span class="property">
           <label for="maxwidth">{lang:maxwidth}</label>

trunk/template/yoga/thumbnails.tpl

@@ -24 +24 @@
       <br />{thumbnails.line.thumbnail.nb_comments.NB_COMMENTS} {lang:comments}
       <!-- END nb_comments -->
+      <!-- BEGIN nb_hits -->
+      <br />{thumbnails.line.thumbnail.nb_hits.HITS}
+      <!-- END nb_comments -->
       </span>
     </span>