aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--admin/themes/default/template/thumbnail.tpl65
-rw-r--r--admin/thumbnail.php13
-rw-r--r--language/en_UK/admin.lang.php1
-rw-r--r--language/fr_FR/admin.lang.php3
4 files changed, 42 insertions, 40 deletions
diff --git a/admin/themes/default/template/thumbnail.tpl b/admin/themes/default/template/thumbnail.tpl
index 3c46b2c2e..5e981c3ef 100644
--- a/admin/themes/default/template/thumbnail.tpl
+++ b/admin/themes/default/template/thumbnail.tpl
@@ -11,9 +11,9 @@ var done = 0;
{literal}
var queuedManager = $.manageAjax.create('queued', {
- queue: true,
- cacheResponse: false,
- maxRequests: 3,
+ queue: true,
+ cacheResponse: false,
+ maxRequests: 3,
complete: function() {
jQuery("#thumb_remaining").text(todo-(++done) + ' ' + remaining);
if (todo == done) {
@@ -23,13 +23,13 @@ var queuedManager = $.manageAjax.create('queued', {
});
function processThumbs(width,height,crop,follow_orientation) {
- jQuery('tr.nothumb').each(function() {
- var image_path = jQuery(this).find('td.filepath').text();
- var td=this;
- queuedManager.add({
- type: 'GET',
- url: 'ws.php',
- data: {
+ jQuery('tr.nothumb').each(function() {
+ var image_path = jQuery(this).find('td.filepath').text();
+ var td=this;
+ queuedManager.add({
+ type: 'GET',
+ url: 'ws.php',
+ data: {
method: 'pwg.images.resize',
image_path: image_path,
type: 'thumbnail',
@@ -39,24 +39,24 @@ function processThumbs(width,height,crop,follow_orientation) {
follow_orientation: follow_orientation,
format:'json'
},
- dataType: 'json',
- success: (function(row) { return function(data) {
- if (data.stat =='ok') {
+ dataType: 'json',
+ success: (function(row) { return function(data) {
+ if (data.stat =='ok') {
if (todo < 200)
jQuery(row).find('td.thumbpic').html('<img src="'+data.result.destination+'"/>');
jQuery(row).find('td.thumbdim').html(""+data.result.width+" x "+data.result.height);
jQuery(row).find('td.thumbgentime').html(""+data.result.time);
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);
+ } else {
+ jQuery(row).find('td.thumbdim').html('#ERR#'+data.err+"# : "+data.message);
jQuery(row).removeClass("nothumb");
jQuery(row).addClass("error");
- }
- }
+ }
+ }
})(td)
- });
- });
+ });
+ });
}
function toggleCropFields() {
@@ -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();
@@ -113,23 +113,23 @@ jQuery(document).ready(function(){
<ul>
<li>
<span class="property"><label for="thumb_crop">{'Crop'|@translate}</label></span>
- <input type="checkbox" name="thumb_crop" id="thumb_crop" {$values.thumb_crop}>
+ <input type="checkbox" name="thumb_crop" id="thumb_crop" {$values.thumb_crop}>
</li>
<li id="thumb_follow_orientation_li">
<span class="property"><label for="thumb_follow_orientation">{'Follow Orientation'|@translate}</label></span>
- <input type="checkbox" name="thumb_follow_orientation" id="thumb_follow_orientation" {$values.thumb_follow_orientation}>
+ <input type="checkbox" name="thumb_follow_orientation" id="thumb_follow_orientation" {$values.thumb_follow_orientation}>
</li>
<li>
<span class="property"><label for="thumb_maxwidth">{'Maximum Width'|@translate}</label></span>
- <input type="text" name="thumb_maxwidth" id="thumb_maxwidth" value="{$values.thumb_maxwidth}" size="4" maxlength="4"> {'pixels'|@translate}
+ <input type="text" name="thumb_maxwidth" id="thumb_maxwidth" value="{$values.thumb_maxwidth}" size="4" maxlength="4"> {'pixels'|@translate}
</li>
<li>
<span class="property"><label for="thumb_maxheight">{'Maximum Height'|@translate}</label></span>
- <input type="text" name="thumb_maxheight" id="thumb_maxheight" value="{$values.thumb_maxheight}" size="4" maxlength="4"> {'pixels'|@translate}
+ <input type="text" name="thumb_maxheight" id="thumb_maxheight" value="{$values.thumb_maxheight}" size="4" maxlength="4"> {'pixels'|@translate}
</li>
<li>
<span class="property"><label for="thumb_quality">{'Image Quality'|@translate}</label></span>
- <input type="text" name="thumb_quality" id="thumb_quality" value="{$values.thumb_quality}" size="3" maxlength="3"> %
+ <input type="text" name="thumb_quality" id="thumb_quality" value="{$values.thumb_quality}" size="3" maxlength="3"> %
</li>
</ul>
</fieldset>
@@ -156,13 +156,16 @@ jQuery(document).ready(function(){
<td class="filepath">{$elt.PATH}</td>
<td>{$elt.FILESIZE_IMG}</td>
<td>{$elt.WIDTH_IMG} x {$elt.HEIGHT_IMG}</td>
- <td class="thumbpic"><img src="admin/themes/default/images/ajax-loader.gif"></td>
- <td class="thumbgentime">&nbsp;</td>
- <td class="thumbsize">&nbsp;</td>
- <td class="thumbdim">&nbsp;</td>
+ <td class="thumbpic"><img src="admin/themes/default/images/ajax-loader.gif"></td>
+ <td class="thumbgentime">&nbsp;</td>
+ <td class="thumbsize">&nbsp;</td>
+ <td class="thumbdim">&nbsp;</td>
</tr>
{/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} \ No newline at end of file
diff --git a/admin/thumbnail.php b/admin/thumbnail.php
index 461b11425..a59a931b5 100644
--- a/admin/thumbnail.php
+++ b/admin/thumbnail.php
@@ -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');
?>
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index f79d3e052..842b29c33 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -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>.';
?> \ No newline at end of file
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 84b524f1e..ed139318a 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -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>.';
+?> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 15:52:31 +0000