From 1ba31363330f5d173845324a4ac624993b4e48b7 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Tue, 22 Oct 2013 20:48:28 +0000
Subject: feature 2920: reuse "nb pending comments" calculation in admin/intro.

add missing CSS code in r25084


git-svn-id: http://piwigo.org/svn/trunk@25085 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/intro.php                         | 19 -------------------
 admin/themes/default/template/intro.tpl |  5 +----
 admin/themes/default/theme.css          |  3 +++
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/admin/intro.php b/admin/intro.php
index 53fe33c9f..f9a068dd3 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -213,25 +213,6 @@ SELECT COUNT(*)
 ;';
   list($nb_comments) = pwg_db_fetch_row(pwg_query($query));
   $template->assign('DB_COMMENTS', l10n_dec('%d comment', '%d comments', $nb_comments));
-  
-  // unvalidated comments
-  $query = '
-SELECT COUNT(*)
-  FROM '.COMMENTS_TABLE.'
-  WHERE validated=\'false\'
-;';
-  list($nb_comments) = pwg_db_fetch_row(pwg_query($query));
-
-  if ($nb_comments > 0)
-  {
-    $template->assign(
-      'unvalidated',
-      array(
-        'URL' => PHPWG_ROOT_PATH.'admin.php?page=comments',
-        'INFO' => l10n('%d waiting for validation', $nb_comments)
-        )
-      );
-  }
 }
 
 if ($nb_elements > 0)
diff --git a/admin/themes/default/template/intro.tpl b/admin/themes/default/template/intro.tpl
index 926527e0e..a3c56c214 100644
--- a/admin/themes/default/template/intro.tpl
+++ b/admin/themes/default/template/intro.tpl
@@ -74,10 +74,7 @@ jQuery().ready(function(){
       <li>{$DB_GROUPS}</li>
     {if isset($DB_COMMENTS)}
       <li>
-        {$DB_COMMENTS}
-        {if isset($unvalidated)}
-        (<a href="{$unvalidated.URL}">{$unvalidated.INFO}</a>)
-        {/if}
+        {$DB_COMMENTS}{if $NB_PENDING_COMMENTS > 0} (<a href="{$U_COMMENTS}">{'%d waiting for validation'|translate:$NB_PENDING_COMMENTS}</a>){/if}
       </li>
     {/if}
 			<li>{$DB_RATES}</li>
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index 7eba66a75..e39802d85 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -27,6 +27,9 @@ ul.categoryActions { margin: 0 2px; width: auto; list-style-position:outside;
 .content div.comment blockquote {
   margin-right: 0.5em; overflow: visible; /*avoid a very strange margin behaviour (all browsers) */ }
 
+.commentFilterSelected {color:#666;text-decoration:underline;}
+.comment .pendingFlag {font-style:italic;color:red;}
+
 /* not used but should be */
 #thePopuphelpPage .content { margin: 1em; }
 
-- 
cgit v1.2.3