diff --git a/admin/picture_modify.php b/admin/picture_modify.php index 4b146e9c4..6919b525d 100644 --- a/admin/picture_modify.php +++ b/admin/picture_modify.php @@ -282,13 +282,17 @@ while ($user_row = pwg_db_fetch_assoc($result)) $row['added_by'] = $user_row['username']; } +$extTab = explode('.',$row['file']); + $intro_vars = array( - 'file' => l10n('Original file : %s', $row['file']), - 'add_date' => l10n('Posted %s on %s', time_since($row['date_available'], 'year'), format_date($row['date_available'], array('day', 'month', 'year'))), + 'file' => l10n('%s', $row['file']), + 'date' => l10n('Posted the %s', format_date($row['date_available'], array('day', 'month', 'year'))), + 'age' => l10n(ucfirst(time_since($row['date_available'], 'year'))), 'added_by' => l10n('Added by %s', $row['added_by']), 'size' => $row['width'].'×'.$row['height'].' pixels, '.sprintf('%.2f', $row['filesize']/1024).'MB', 'stats' => l10n('Visited %d times', $row['hit']), - 'id' => l10n('Numeric identifier : %d', $row['id']), + 'id' => l10n($row['id']), + 'ext' => l10n('%s file type',strtoupper(end($extTab))) ); if ($conf['rate'] and !empty($row['rating_score'])) diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl index 4a6899610..b0aa89d43 100644 --- a/admin/themes/default/template/picture_modify.tpl +++ b/admin/themes/default/template/picture_modify.tpl @@ -84,14 +84,14 @@ $('#action-delete-picture').on('click', function() { }()); {/footer_script} -

{$TITLE} › {'Edit photo'|@translate} {$TABSHEET_TITLE}

+

{$TITLE} › {'Edit photo #%s'|@translate:$INTRO.id} {$TABSHEET_TITLE}

- +
@@ -108,7 +108,7 @@ $('#action-delete-picture').on('click', function() {
{$INTRO.file}
{$INTRO.size}
{$INTRO.formats}
-
{$INTRO.id}
+
{$INTRO.ext}
@@ -117,7 +117,8 @@ $('#action-delete-picture').on('click', function() {
-
{$INTRO.add_date}
+
{$INTRO.date}
+
{$INTRO.age}
{$INTRO.added_by}
{$INTRO.stats}
@@ -153,7 +154,7 @@ $('#action-delete-picture').on('click', function() {
+ data-default="{$STORAGE_ALBUM}" name="associate[]" multiple style="width:103%;">

@@ -161,7 +162,7 @@ $('#action-delete-picture').on('click', function() {
+ name="represent[]" multiple style="width:103%;">

@@ -169,7 +170,7 @@ $('#action-delete-picture').on('click', function() {
+ data-create="true" name="tags[]" multiple style="width:103%;">

diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index 9bacd7775..bb5976dd5 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -1764,6 +1764,7 @@ a#showPermissions:hover {text-decoration: none;} display: flex; margin: 0; justify-content: space-evenly; + margin-top: 30px } #picture-preview { @@ -1816,6 +1817,10 @@ a#showPermissions:hover {text-decoration: none;} transition: ease 0.2s; } +#picture-content input[type=text], #picture-content textarea, #picture-content .selectize-control { + margin-top: 5px; +} + #picture-content .date-input { position: relative; } @@ -1838,8 +1843,8 @@ a#showPermissions:hover {text-decoration: none;} } #picture-infos { - display: flex; - justify-content: space-around; + display: grid; + grid-template-columns: 50% 50%; } .picture-infos-category { @@ -1847,7 +1852,8 @@ a#showPermissions:hover {text-decoration: none;} border: #EEE solid 2px; padding: 20px; border-radius: 5px; - margin: 5px; + margin: 5px 10px; + align-items: center; } .picture-infos-icon { @@ -1863,6 +1869,7 @@ a#showPermissions:hover {text-decoration: none;} .picture-infos-container { margin: 0; + display: inline-table; } .picture-infos-container div { diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index 417b6b2d7..3cbde373e 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -879,7 +879,7 @@ $lang['Y Position'] = 'Position Y'; $lang['Multiple Size'] = 'Tailles multiples'; $lang['Watermark'] = 'Filigrane'; $lang['Original file : %s'] = 'Fichier original : %s'; -$lang['Posted %s on %s'] = 'Postée %s le %s'; +$lang['Posted the %s'] = 'Postée le %s'; $lang['Added by %s'] = 'Ajouté par %s'; $lang['Visited %d times'] = 'Visitée %d fois'; $lang['Numeric identifier : %d'] = 'Identifiant numérique : %d'; @@ -901,7 +901,7 @@ $lang['%d minutes'] = '%d minutes'; $lang['%d second'] = '%d seconde'; $lang['%d seconds'] = '%d secondes'; $lang['Sharpen'] = 'Renforcer la netteté'; -$lang['Edit photo'] = 'Éditer la photo'; +$lang['Edit photo #%s'] = 'Éditer la photo #%s'; $lang['create a new site'] = 'créer un nouveau site'; $lang['No order field selected'] = 'Aucun critère de tri sélectionné'; $lang['Name of the duplicate'] = "Nom du duplicata";