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

feature:2274

Browse source 
Bug corrected with crop option.
Clean code.
Add sentence in thumbnails page for regeneration.

git-svn-id: http://piwigo.org/svn/trunk@10571 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2011-04-22 14:22:50 +00:00
commit ef00110fe7
4 changed files with 42 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

11
admin/themes/default/template/thumbnail.tpl
View file

@ -49,7 +49,7 @@ function processThumbs(width,height,crop,follow_orientation) {
jQuery(row).find('td.thumbsize').html(""+data.result.size);
jQuery(row).removeClass("nothumb");
} else {
jQuery(row).find('td.thumbpic').html('#ERR#'+data.err+"# : "+data.message);
jQuery(row).find('td.thumbdim').html('#ERR#'+data.err+"# : "+data.message);
jQuery(row).removeClass("nothumb");
jQuery(row).addClass("error");
}
@ -76,8 +76,8 @@ jQuery(document).ready(function(){
jQuery('input#proceed').click (function () {
var width = jQuery('input[name="thumb_maxwidth"]').val();
var height = jQuery('input[name="thumb_maxheight"]').val();
var crop = jQuery('#crop').is(':checked');
var follow_orientation = jQuery('#follow_orientation').is(':checked');
var crop = jQuery('#thumb_crop').is(':checked');
var follow_orientation = jQuery('#thumb_follow_orientation').is(':checked');
jQuery(".waiting_bar").toggle();
if (todo < 200)
jQuery('.thumbpic').show();
@ -164,5 +164,8 @@ jQuery(document).ready(function(){
{/foreach}
</table>
{else}
<div style="text-align:center;font-weight:bold;margin:10px;"> [ {'No missing thumbnail'|@translate} ]</div>
<p style="text-align:left;margin:20px;">
<b>{'No missing thumbnail'|@translate}</b><br><br>
{'If you want to regenerate thumbnails, please go to the <a href="%s">Batch Manager</a>.'|@translate|@sprintf:"admin.php?page=batch_manager"}
</p>
{/if}

13
admin/thumbnail.php
View file

@ -100,6 +100,8 @@ while ( $row=pwg_db_fetch_assoc($result) )
// +-----------------------------------------------------------------------+
// | form & pictures without thumbnails display |
// +-----------------------------------------------------------------------+
$template->set_filenames( array('thumbnail'=>'thumbnail.tpl') );
if (count($wo_thumbnails) > 0)
{
foreach ($wo_thumbnails as $path)
@ -114,7 +116,8 @@ if (count($wo_thumbnails) > 0)
'FILESIZE_IMG'=>$size,
'WIDTH_IMG'=>$width,
'HEIGHT_IMG'=>$height,
));
)
);
}
}
@ -131,15 +134,9 @@ $template->assign(
'F_ACTION' => get_root_url().'admin.php?page=thumbnail',
'values' => $form_values,
'TOTAL_NB_REMAINING' => count($wo_thumbnails),
'U_HELP' => get_root_url().'admin/popuphelp.php?page=thumbnail',
)
);
// +-----------------------------------------------------------------------+
// | return to admin |
// +-----------------------------------------------------------------------+
$template->set_filenames( array('thumbnail'=>'thumbnail.tpl') );
$template->assign('U_HELP', get_root_url().'admin/popuphelp.php?page=thumbnail');
$template->assign_var_from_handle('ADMIN_CONTENT', 'thumbnail');
?>

1
language/en_UK/admin.lang.php
View file

@ -829,4 +829,5 @@ $lang['Crop'] = 'Crop';
$lang['Width'] = 'Width';
$lang['Height'] = 'Height';
$lang['Follow Orientation'] = 'Follow Orientation';
$lang['If you want to regenerate thumbnails, please go to the <a href="%s">Batch Manager</a>.'] = 'If you want to regenerate thumbnails, please go to the <a href="%s">Batch Manager</a>.';
?>

1
language/fr_FR/admin.lang.php
View file

@ -840,4 +840,5 @@ $lang['Crop'] = 'Retailler';
$lang['Width'] = 'Largeur';
$lang['Height'] = 'Hauteur';
$lang['Follow Orientation'] = "Respecter l'orientation";
$lang['If you want to regenerate thumbnails, please go to the <a href="%s">Batch Manager</a>.'] = 'Si vous voulez régénérer des miniatures, merci de vous rendre dans la <a href="%s">Gestion par lot</a>.';
?>