diff options
| -rw-r--r-- | admin/picture_modify.php | 47 | ||||
| -rw-r--r-- | admin/themes/default/template/picture_modify.tpl | 39 |
2 files changed, 33 insertions, 53 deletions
diff --git a/admin/picture_modify.php b/admin/picture_modify.php index cfd119bf4..4de5f00e8 100644 --- a/admin/picture_modify.php +++ b/admin/picture_modify.php @@ -296,30 +296,15 @@ SELECT '.$conf['user_fields']['username'].' AS username $result = pwg_query($query); while ($user_row = pwg_db_fetch_assoc($result)) { - $added_by = $user_row['username']; + $row['added_by'] = $user_row['username']; } -$intro = sprintf( - l10n('This photo was posted on %s by %s.'), - format_date($row['date_available']), - $added_by - ); - -$intro.= ' '; - -$intro.= sprintf( - l10n('Original file is %s, %ux%u pixels, %.2fMB.'), - $row['file'], - $row['width'], - $row['height'], - $row['filesize']/1024 - ); - -$intro.= ' '; - -$intro.= sprintf( - l10n('%u visits'), - $row['hit'] +$intro_vars = array( + 'file' => sprintf(l10n('Original file : %s'), $row['file']), + 'added' => sprintf(l10n('Posted %s on %s by %s'), time_since($row['date_available'], 'month'), format_date($row['date_available'], false, false), $row['added_by']), + 'size' => $row['width'].'×'.$row['height'].' pixels, '.sprintf('%.2f', $row['filesize']/1024).'MB', + 'hits' => sprintf(l10n('%d visits'), $row['hit']), + 'id' => sprintf(l10n('Numeric identifier : %d'), $row['id']), ); if ($conf['rate'] and !empty($row['rating_score'])) @@ -330,23 +315,13 @@ SELECT FROM '.RATE_TABLE.' WHERE element_id = '.$_GET['image_id'].' ;'; - list($nb_rates) = pwg_db_fetch_row(pwg_query($query)); + list($row['nb_rates']) = pwg_db_fetch_row(pwg_query($query)); - $intro.= sprintf( - l10n(', %u rates, rating score %s'), - $nb_rates, - $row['rating_score'] - ); + $intro_vars['rate'] = sprintf(l10n('Rated %d times, score : %f'), $row['nb_rates'], $row['rating_score']); } -$intro.= '. '; - -$intro.= sprintf( - l10n('Numeric identifier is %u.'), - $row['id'] - ); - -$template->assign('INTRO', $intro); +$template->assign('INTRO', $intro_vars); + if (in_array(get_extension($row['path']),$conf['picture_ext'])) { diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl index 11a0fcdb2..dc6ab8d2c 100644 --- a/admin/themes/default/template/picture_modify.tpl +++ b/admin/themes/default/template/picture_modify.tpl @@ -44,24 +44,29 @@ pwg_initialization_datepicker("#date_creation_day", "#date_creation_month", "#da <tr> <td id="albumThumbnail"> -<img src="{$TN_SRC}" alt="{'Thumbnail'|@translate}" class="Thumbnail"> + <img src="{$TN_SRC}" alt="{'Thumbnail'|@translate}" class="Thumbnail"> </td> - - <td id="albumLinks"> -<p style="text-align:left">{$INTRO}</p> - -<ul style="padding-left:15px;"> -{if isset($U_JUMPTO) } - <li><a href="{$U_JUMPTO}">{'jump to photo'|@translate} →</a></li> -{/if} - -{if !url_is_remote($PATH)} - <li><a href="{$U_SYNC}">{'Synchronize metadata'|@translate}</a></li> - - <li><a href="{$U_DELETE}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');">{'delete photo'|@translate}</a></li> - {/if} - -</ul> + <td id="albumLinks" style="width:500px;vertical-align:top;"> + <ul> + <li>{$INTRO.file}</li> + <li>{$INTRO.added}</li> + <li>{$INTRO.size}</li> + <li>{$INTRO.hits}</li> + {if $INTRO.rate}<li>{$INTRO.rate}</li>{/if} + <li>{$INTRO.id}</li> + </ul> + </td> + <td style="vertical-align:top;"> + <ul style="padding-left:15px;"> + {if isset($U_JUMPTO) } + <li><a href="{$U_JUMPTO}">{'jump to photo'|@translate} →</a></li> + {/if} + {if !url_is_remote($PATH)} + <li><a href="{$U_SYNC}">{'Synchronize metadata'|@translate}</a></li> + + <li><a href="{$U_DELETE}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');">{'delete photo'|@translate}</a></li> + {/if} + </ul> </td> </tr> </table> |