aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2011-11-12 12:45:19 +0000
committermistic100 <mistic@piwigo.org>2011-11-12 12:45:19 +0000
commit0fbc085f52bb2921f2272b1d5f20372d55ffde48 (patch)
tree11e4c927881ed1500a3f1e5a51fd904aaa357ef9
parent7f28ff8de0110ad9f095ecc57d437e561de2cfbe (diff)
feature:2466 Display high-definition dimensions in picture_modify
(file size was already displayed) git-svn-id: http://piwigo.org/svn/trunk@12612 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/picture_modify.php10
-rw-r--r--admin/themes/default/template/picture_modify.tpl5
-rw-r--r--language/en_UK/admin.lang.php1
-rw-r--r--language/fr_CA/admin.lang.php1
-rw-r--r--language/fr_FR/admin.lang.php1
5 files changed, 12 insertions, 6 deletions
diff --git a/admin/picture_modify.php b/admin/picture_modify.php
index fb39a16a6..daf17939f 100644
--- a/admin/picture_modify.php
+++ b/admin/picture_modify.php
@@ -312,12 +312,10 @@ $template->assign(
if ($row['has_high'] == 'true')
{
- $template->assign(
- 'HIGH_FILESIZE',
- isset($row['high_filesize'])
- ? $row['high_filesize'].' KB'
- : l10n('unknown')
- );
+ $template->assign(array(
+ 'HIGH_FILESIZE' => isset($row['high_filesize']) ? $row['high_filesize'].' KB' : l10n('unknown'),
+ 'HIGH_DIMENSIONS' => isset($row['high_width']) ? $row['high_width'].' * '.$row['high_height'] : l10n('unknown'),
+ ));
}
// image level options
diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl
index 3832d60fb..807ff7a57 100644
--- a/admin/themes/default/template/picture_modify.tpl
+++ b/admin/themes/default/template/picture_modify.tpl
@@ -68,6 +68,11 @@ pwg_initialization_datepicker("#date_creation_day", "#date_creation_month", "#da
{if isset($HIGH_FILESIZE) }
<tr>
+ <td><strong>{'High dimensions'|@translate}</strong></td>
+ <td>{$HIGH_DIMENSIONS}</td>
+ </tr>
+
+ <tr>
<td><strong>{'High filesize'|@translate}</strong></td>
<td>{$HIGH_FILESIZE}</td>
</tr>
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 4c8691b0e..b3ea58692 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -328,6 +328,7 @@ $lang['Hide'] = "Hide";
$lang['High definition enabled'] = "High definition enabled";
$lang['High definition'] = "High definition";
$lang['High filesize'] = "High resolution filesize";
+$lang['High dimensions'] = 'High resolution dimensions';
$lang['high'] = "high";
$lang['History'] = "History";
$lang['Hit'] = "Hit";
diff --git a/language/fr_CA/admin.lang.php b/language/fr_CA/admin.lang.php
index 11cb71951..d46106448 100644
--- a/language/fr_CA/admin.lang.php
+++ b/language/fr_CA/admin.lang.php
@@ -466,6 +466,7 @@ $lang['Hour'] = "Heure";
$lang['guest'] = "invité";
$lang['default values'] = "valeurs par défaut";
$lang['High filesize'] = "Taille du fichier haute résolution";
+$lang['High dimensions'] = 'Dimensions du fichier haute résolution';
$lang['Guest cannot be deleted'] = "L'invité ne peut pas être supprimé";
$lang['Default user cannot be deleted'] = "L'utilisateur par défaut ne peut pas être supprimé";
$lang['Purge history detail'] = "Purger le détail de l'historique";
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 237f28a48..c54be447b 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -459,6 +459,7 @@ $lang['Hour'] = "Heure";
$lang['guest'] = "invité";
$lang['default values'] = "valeurs par défaut";
$lang['High filesize'] = "Taille du fichier haute résolution";
+$lang['High dimensions'] = 'Dimensions du fichier haute résolution';
$lang['Guest cannot be deleted'] = "L'invité ne peut pas être supprimé";
$lang['Default user cannot be deleted'] = "L'utilisateur par défaut ne peut pas être supprimé";
$lang['Purge history detail'] = "Purger le détail de l'historique";