aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2006-08-16 04:30:35 +0000
committerrvelices <rv-github@modusoptimus.com>2006-08-16 04:30:35 +0000
commitd7ba4d77fe14adee382436238e40a28786791a91 (patch)
tree12dbed71581f6c58ccd28260de0465a0558c36ad
parent48c6d7e8a4d5b44a6c5c6fa919267d098ed28ee7 (diff)
added number of tags, image-tag associations and image-category association
on the main admin page git-svn-id: http://piwigo.org/svn/trunk@1538 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/intro.php23
-rw-r--r--language/en_UK.iso-8859-1/admin.lang.php2
-rw-r--r--language/fr_FR.iso-8859-1/admin.lang.php2
-rw-r--r--template/yoga/admin/intro.tpl3
4 files changed, 28 insertions, 2 deletions
diff --git a/admin/intro.php b/admin/intro.php
index 9c6ffa088..d855bc870 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -55,7 +55,7 @@ if (isset($_GET['action']) and 'check_upgrade' == $_GET['action'])
{
$versions = array('current' => PHPWG_VERSION);
$lines = @file('http://www.phpwebgallery.net/latest_version');
-
+
// if the current version is a BSF (development branch) build, we check
// the first line, for stable versions, we check the second line
if (preg_match('/^BSF/', $versions{'current'}))
@@ -150,6 +150,24 @@ list($nb_physical) = mysql_fetch_row(pwg_query($query));
$query = '
SELECT COUNT(*)
+ FROM '.IMAGE_CATEGORY_TABLE.'
+;';
+list($nb_image_category) = mysql_fetch_row(pwg_query($query));
+
+$query = '
+SELECT COUNT(*)
+ FROM '.TAGS_TABLE.'
+;';
+list($nb_tags) = mysql_fetch_row(pwg_query($query));
+
+$query = '
+SELECT COUNT(*)
+ FROM '.IMAGE_TAG_TABLE.'
+;';
+list($nb_image_tag) = mysql_fetch_row(pwg_query($query));
+
+$query = '
+SELECT COUNT(*)
FROM '.USERS_TABLE.'
;';
list($nb_users) = mysql_fetch_row(pwg_query($query));
@@ -180,6 +198,9 @@ $template->assign_vars(
$nb_physical,
$nb_virtual
),
+ 'DB_IMAGE_CATEGORY' =>sprintf(l10n('%d associations'), $nb_image_category),
+ 'DB_TAGS' => sprintf(l10n('%d tags'), $nb_tags),
+ 'DB_IMAGE_TAG' => sprintf(l10n('%d associations'), $nb_image_tag),
'DB_USERS' => sprintf(l10n('%d users'), $nb_users),
'DB_GROUPS' => sprintf(l10n('%d groups'), $nb_groups),
'DB_COMMENTS' => sprintf(l10n('%d comments'), $nb_comments),
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 8d0b21173..f81dd9b87 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -25,12 +25,14 @@
// | USA. |
// +-----------------------------------------------------------------------+
+$lang['%d associations'] = '%d associations';
$lang['%d categories including %d physical and %d virtual'] = '%d categories including %d physical and %d virtual';
$lang['%d categories moved'] = '%d categories moved';
$lang['%d comments'] = '%d comments';
$lang['%d elements'] = '%d elements';
$lang['%d groups'] = '%d groups';
$lang['%d members'] = '%d members';
+$lang['%d tags'] = '%d tags';
$lang['%d user comments rejected'] = '%d user comments rejected';
$lang['%d user comments validated'] = '%d user comments validated';
$lang['%d users deleted'] = '%d users deleted';
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index 961159348..56f9ee7a4 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -25,12 +25,14 @@
// | USA. |
// +-----------------------------------------------------------------------+
+$lang['%d associations'] = '%d associations';
$lang['%d categories including %d physical and %d virtual'] = '%d catégories dont %d physiques et %d virtuelles';
$lang['%d categories moved'] = '%d catégories déplacées';
$lang['%d comments'] = '%d commentaires utilisateur';
$lang['%d elements'] = '%d éléments';
$lang['%d groups'] = '%d groupes';
$lang['%d members'] = '%d membres';
+$lang['%d tags'] = '%d tags';
$lang['%d user comments rejected'] = '%d commentaires utilisateur rejetés';
$lang['%d user comments validated'] = '%d commentaires utilisateur validés';
$lang['%d users deleted'] = '%d utilisateurs supprimés';
diff --git a/template/yoga/admin/intro.tpl b/template/yoga/admin/intro.tpl
index 58c6b2510..4605b35b3 100644
--- a/template/yoga/admin/intro.tpl
+++ b/template/yoga/admin/intro.tpl
@@ -32,7 +32,8 @@
({first_added.DB_DATE})
<!-- END first_added -->
</li>
- <li>{DB_CATEGORIES}</li>
+ <li>{DB_CATEGORIES} ({DB_IMAGE_CATEGORY})</li>
+ <li>{DB_TAGS} ({DB_IMAGE_TAG})</li>
<li>{DB_USERS}</li>
<li>{DB_GROUPS}</li>
<li>