Changeset 1769

Timestamp:

Jan 30, 2007, 8:00:17 AM (17 years ago)

Author:

vdigital

Message:

Issue 0000614: Display hits under thumbnails like comments counter

• Comments are not plurial < 2
• hits and comments have specific classes for css control

Location:

trunk

Files:

• include/category_default.inc.php (modified) (2 diffs)
• include/functions_html.inc.php (modified) (1 diff)
• language/en_UK.iso-8859-1/common.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/common.lang.php (modified) (1 diff)
• template/yoga/theme/p0w0/theme.css (modified) (1 diff)
• template/yoga/theme/wipi/theme.css (modified) (2 diffs)
• template/yoga/thumbnails.tpl (modified) (1 diff)

trunk/include/category_default.inc.php

@@ -111 +111 @@
     $template->assign_block_vars(
       'thumbnails.line.thumbnail.nb_hits',
-      array('HITS'=> l10n_dec('%d hit', '%d hits', $row['hit'])));
+      array(
+      'HITS'=> l10n_dec('%d hit', '%d hits', $row['hit']),
+      'CLASS'=> set_span_class($row['hit']) . ' nb-hits',
+      )
+    );
+    
   }
 
@@ -166 +171 @@
     $template->assign_block_vars(
       'thumbnails.line.thumbnail.nb_comments',
-      array('NB_COMMENTS'=>$row['nb_comments']));
+      array(
+        'NB_COMMENTS'=> l10n_dec('%d comment', '%d comments', 
+                        $row['nb_comments']),
+        'CLASS'=> set_span_class($row['nb_comments']) . ' nb-comments',
+      )
+    );
   }
 

trunk/include/functions_html.inc.php

@@ -719 +719 @@
   trigger_action('set_status_header', $code, $text);
 }
+
+/**
+ * set a class to display a counter
+ * .zero .one .2nmore 
+ */
+function set_span_class($count)
+{
+  if ($count > 1) 
+  { 
+    return '2nmore';
+  }
+  return ( $count == 0 ) ? 'zero':'one'; 
+}
 ?>

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 comment'] = '%d comment';
+$lang['%d comments'] = '%d comments';
 $lang['%d hit'] = '%d hit';
 $lang['%d hits'] = '%d hits';

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 comment'] = '%d commentaire';
+$lang['%d comments'] = '%d commentaires';
 $lang['%d hit'] = 'vue %d fois';
 $lang['%d hits'] = 'vue %d fois';

trunk/template/yoga/theme/p0w0/theme.css

@@ -249 +249 @@
         cursor:pointer
 }
+
+.zero { display: none }
+.one { }
+.2nmore { }
+
 /* nice looking month calendar*/
 TD.calDayCellEmpty, TD.calDayCellFull { border: 1px solid gray;}

trunk/template/yoga/theme/wipi/theme.css

@@ -239 +239 @@
         cursor:pointer
 }
+
+.zero { display: none }
+.one { }
+.2nmore { }
+
 /* nice looking month calendar*/
 TD.calDayCellEmpty, TD.calDayCellFull { border: 1px solid gray;}
@@ -247 +252 @@
 .calForeDate { color: #fff; }
 .virtual_cat { background: #222 !important; }
+
+.PWG {
+  font-family: verdana, arial, helvetica, sans-serif !important;
+  font-size: 0.9em;
+  font-weight: normal;
+  letter-spacing: 0px;
+}
+a.PWG { border: 0px; }
+a.PWG .P { color : #f92; }
+a.PWG .W { color : #aaa; }
+a.PWG .G { color : #69c; }
+a.PWG:hover .P { color : #69c; }
+a.PWG:hover .G { color : #f92; }

trunk/template/yoga/thumbnails.tpl

@@ -22 +22 @@
       {thumbnails.line.thumbnail.IMAGE_TS}
       <!-- BEGIN nb_comments -->
-      <br />{thumbnails.line.thumbnail.nb_comments.NB_COMMENTS} {lang:comments}
+      <span class="{thumbnails.line.thumbnail.nb_comments.CLASS}">
+        <br />
+        {thumbnails.line.thumbnail.nb_comments.NB_COMMENTS}
+      </span>
       <!-- END nb_comments -->
       <!-- BEGIN nb_hits -->
-      <br />{thumbnails.line.thumbnail.nb_hits.HITS}
-      <!-- END nb_comments -->
+      <span class="{thumbnails.line.thumbnail.nb_hits.CLASS}">
+        <br />
+        {thumbnails.line.thumbnail.nb_hits.HITS}
+      </span>
+      <!-- END nb_hits -->
       </span>
     </span>