From fac62f863dceea47f90027c9404604ec74c559d3 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Tue, 22 Oct 2013 20:39:10 +0000
Subject: feature 2920 added: change admin screen "pending comments" to "all
 comments". Now the administrator can filter on "all" or "pending" with a
 single click.

In the admin menu, we display the number of pending comments.


git-svn-id: http://piwigo.org/svn/trunk@25084 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/themes/default/template/admin.tpl    | 4 ++--
 admin/themes/default/template/comments.tpl | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'admin/themes')

diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl
index 782b9a0d1..bb46a3a70 100644
--- a/admin/themes/default/template/admin.tpl
+++ b/admin/themes/default/template/admin.tpl
@@ -72,8 +72,8 @@ jQuery(document).ready(function(){ldelim}
 {/if}
 				<li><a class="icon-signal" href="{$U_HISTORY_STAT}">{'History'|@translate}</a></li>
 				<li><a class="icon-tools" href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
-{if isset($U_PENDING_COMMENTS)}
-				<li><a class="icon-chat" href="{$U_PENDING_COMMENTS}">{'Pending Comments'|@translate}</a></li>
+{if isset($U_COMMENTS)}
+				<li><a class="icon-chat" href="{$U_COMMENTS}">{'Comments'|@translate}{if $NB_PENDING_COMMENTS > 0}<span class="adminMenubarCounter" title="{'%d waiting for validation'|translate:$NB_PENDING_COMMENTS}">{$NB_PENDING_COMMENTS}</span>{/if}</a></li>
 {/if}
         <li><a class="icon-arrows-cw" href="{$U_UPDATES}">{'Updates'|@translate}</a></li>
       </ul>
diff --git a/admin/themes/default/template/comments.tpl b/admin/themes/default/template/comments.tpl
index 82fe169db..908ffbe49 100644
--- a/admin/themes/default/template/comments.tpl
+++ b/admin/themes/default/template/comments.tpl
@@ -43,7 +43,12 @@ jQuery(document).ready(function(){
 });
 {/literal}{/footer_script}
 
-<h2>{'Pending Comments'|@translate} {$TABSHEET_TITLE}</h2>
+<h2>{'User comments'|@translate} {$TABSHEET_TITLE}</h2>
+
+<p style="text-align:left;margin-left:1em;">
+  <a href="{$F_ACTION}&amp;filter=all" class="{if $filter == 'all'}commentFilterSelected{/if}">{'All'|@translate}</a> ({$nb_total})
+  | <a href="{$F_ACTION}&amp;filter=pending" class="{if $filter == 'pending'}commentFilterSelected{/if}">{'Waiting'|@translate}</a> ({$nb_pending})
+</p>
 
 {if !empty($comments) }
 <form method="post" action="{$F_ACTION}" id="pendingComments">
@@ -57,7 +62,7 @@ jQuery(document).ready(function(){
     <td>
   <div class="comment">
     <a class="illustration" href="{$comment.U_PICTURE}"><img src="{$comment.TN_SRC}"></a>
-    <p class="commentHeader"><strong>{$comment.AUTHOR}</strong> - <em>{$comment.DATE}</em></p>
+    <p class="commentHeader">{if $comment.IS_PENDING}<span class="pendingFlag">{'Waiting'|@translate}</span> - {/if}<strong>{$comment.AUTHOR}</strong> - <em>{$comment.DATE}</em></p>
     <blockquote>{$comment.CONTENT}</blockquote>
   </div>
     </td>
-- 
cgit v1.2.3