archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature 2920: reuse "nb pending comments" calculation in admin/intro.

Browse source 
add missing CSS code in r25084


git-svn-id: http://piwigo.org/svn/trunk@25085 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2013-10-22 20:48:28 +00:00
commit 1ba3136333
3 changed files with 4 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

19
admin/intro.php
View file

@ -213,25 +213,6 @@ SELECT COUNT(*)
;'; ;';
list($nb_comments) = pwg_db_fetch_row(pwg_query($query)); list($nb_comments) = pwg_db_fetch_row(pwg_query($query));
$template->assign('DB_COMMENTS', l10n_dec('%d comment', '%d comments', $nb_comments)); $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) if ($nb_elements > 0)

5
admin/themes/default/template/intro.tpl
View file

@ -74,10 +74,7 @@ jQuery().ready(function(){
<li>{$DB_GROUPS}</li> <li>{$DB_GROUPS}</li>
{if isset($DB_COMMENTS)} {if isset($DB_COMMENTS)}
<li> <li>
{$DB_COMMENTS} {$DB_COMMENTS}{if $NB_PENDING_COMMENTS > 0} (<a href="{$U_COMMENTS}">{'%d waiting for validation'|translate:$NB_PENDING_COMMENTS}</a>){/if}
{if isset($unvalidated)}
(<a href="{$unvalidated.URL}">{$unvalidated.INFO}</a>)
{/if}
</li> </li>
{/if} {/if}
<li>{$DB_RATES}</li> <li>{$DB_RATES}</li>

3
admin/themes/default/theme.css
View file

@ -27,6 +27,9 @@ ul.categoryActions { margin: 0 2px; width: auto; list-style-position:outside;
.content div.comment blockquote { .content div.comment blockquote {
margin-right: 0.5em; overflow: visible; /*avoid a very strange margin behaviour (all browsers) */ } 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 */ /* not used but should be */
#thePopuphelpPage .content { margin: 1em; } #thePopuphelpPage .content { margin: 1em; }