aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--admin/batch_manager_global.php58
-rw-r--r--admin/themes/default/template/batch_manager_global.tpl348
-rw-r--r--admin/themes/default/template/maintenance.tpl2
3 files changed, 190 insertions, 218 deletions
diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php
index c2a9fdc53..6242a2dc9 100644
--- a/admin/batch_manager_global.php
+++ b/admin/batch_manager_global.php
@@ -411,39 +411,28 @@ DELETE
);
}
- if ('regenerateThumbnails' == $action)
+ if ('delete_derivatives' == $action)
{
- if ($_POST['regenerateSuccess'] != '0')
- array_push($page['infos'], sprintf(l10n('%s thumbnails have been regenerated'), $_POST['regenerateSuccess']));
-
- if ($_POST['regenerateError'] != '0')
- array_push($page['warnings'], sprintf(l10n('%s thumbnails can not be regenerated'), $_POST['regenerateError']));
-
- $update_fields = array('thumb_maxwidth', 'thumb_maxheight', 'thumb_quality', 'thumb_crop', 'thumb_follow_orientation');
+ $query='SELECT path,representative_ext FROM '.IMAGES_TABLE.'
+ WHERE id IN ('.implode(',', $collection).')';
+ $result = pwg_query($query);
+ while ($info = pwg_db_fetch_assoc($result))
+ {
+ foreach( $_POST['del_derivatives_type'] as $type)
+ {
+ delete_element_derivatives($info, $type);
+ }
+ }
}
- if ('regenerateWebsize' == $action)
+ if ('generate_derivatives' == $action)
{
if ($_POST['regenerateSuccess'] != '0')
- array_push($page['infos'], sprintf(l10n('%s photos have been regenerated'), $_POST['regenerateSuccess']));
+ array_push($page['infos'], sprintf(l10n('%s photos were generated'), $_POST['regenerateSuccess']));
if ($_POST['regenerateError'] != '0')
- array_push($page['warnings'], sprintf(l10n('%s photos can not be regenerated'), $_POST['regenerateError']));
-
- $update_fields = array('websize_maxwidth', 'websize_maxheight', 'websize_quality');
- }
+ array_push($page['warnings'], sprintf(l10n('%s photos were not generated'), $_POST['regenerateError']));
- if (!empty($update_fields))
- {
- // Update upload configuration
- $updates = array();
- foreach ($update_fields as $field)
- {
- $value = !empty($_POST[$field]) ? $_POST[$field] : null;
- $form_values[$field] = $value;
- $updates[$field] = $value;
- }
- save_upload_form_config($updates);
}
trigger_action('element_set_global_action', $action, $collection);
@@ -672,6 +661,19 @@ $template->assign(
)
);
+//derivatives
+$del_deriv_map = array();
+foreach(ImageStdParams::get_defined_type_map() as $params)
+{
+ $del_deriv_map[$params->type] = l10n($params->type);
+}
+$template->assign(
+ array(
+ 'del_derivatives_types' => $del_deriv_map,
+ 'generate_derivatives_types' => $del_deriv_map,
+ )
+ );
+
// +-----------------------------------------------------------------------+
// | global mode thumbnails |
// +-----------------------------------------------------------------------+
@@ -756,7 +758,7 @@ SELECT id,path,representative_ext,file,filesize,level,name
while ($row = pwg_db_fetch_assoc($result))
{
$nb_thumbs_page++;
- $src = DerivativeImage::thumb_url($row);
+ $src_image = new SrcImage($row);
$title = render_element_name($row);
if ($title != get_name_from_file($row['file']))
@@ -768,11 +770,11 @@ SELECT id,path,representative_ext,file,filesize,level,name
'thumbnails',
array(
'ID' => $row['id'],
- 'TN_SRC' => $src,
+ 'TN_SRC' => DerivativeImage::url(IMG_THUMB, $src_image),
'FILE' => $row['file'],
'TITLE' => $title,
'LEVEL' => $row['level'],
- 'FILE_SRC' => $row['path'],
+ 'FILE_SRC' => DerivativeImage::url(IMG_LARGE, $src_image),
'U_EDIT' => get_root_url().'admin.php?page=photo-'.$row['id'],
)
);
diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl
index d368591c2..8dfd08cb1 100644
--- a/admin/themes/default/template/batch_manager_global.tpl
+++ b/admin/themes/default/template/batch_manager_global.tpl
@@ -94,14 +94,13 @@ jQuery(document).ready(function() {ldelim}
var nb_thumbs_page = {$nb_thumbs_page};
var nb_thumbs_set = {$nb_thumbs_set};
var applyOnDetails_pattern = "{'on the %d selected photos'|@translate}";
-var elements = new Array();
+var elements = [];
var all_elements = [{if !empty($all_elements)}{','|@implode:$all_elements}{/if}];
+var generate_derivatives_done=false;
var selectedMessage_pattern = "{'%d of %d photos selected'|@translate}";
var selectedMessage_none = "{'No photo selected, %d photos in current set'|@translate}";
var selectedMessage_all = "{'All %d photos are selected'|@translate}";
-var regenerateThumbnailsMessage = "{'Thumbnails generation in progress...'|@translate}";
-var regenerateWebsizeMessage = "{'Photos generation in progress...'|@translate}";
var width_str = '{'Width'|@translate}';
var height_str = '{'Height'|@translate}';
@@ -162,12 +161,16 @@ function progress(val, max, success) {
boxImage: 'themes/default/images/progressbar.gif',
barImage: 'themes/default/images/progressbg_orange.gif'
});
- type = success ? 'regenerateSuccess': 'regenerateError'
- s = jQuery('[name="'+type+'"]').val();
- jQuery('[name="'+type+'"]').val(++s);
-
- if (val == max)
- jQuery('#applyAction').click();
+ if (success !== undefined) {
+ var type = success ? 'regenerateSuccess': 'regenerateError',
+ s = jQuery('[name="'+type+'"]').val();
+ jQuery('[name="'+type+'"]').val(++s);
+ }
+
+ if (val == max) {
+ generate_derivatives_done = true;
+ jQuery('#applyAction').click();
+ }
}
$(document).ready(function() {
@@ -402,112 +405,97 @@ $(document).ready(function() {
});
jQuery('#applyAction').click(function() {
- if (elements.length != 0)
- {
- return true;
- }
- else if (jQuery('[name="selectAction"]').val() == 'regenerateThumbnails')
- {
- resizeMethod = 'pwg.images.resizeThumbnail';
- maxRequests = 3;
- maxwidth = jQuery('input[name="thumb_maxwidth"]').val();
- maxheight = jQuery('input[name="thumb_maxheight"]').val();
- regenerationText = regenerateThumbnailsMessage;
- crop = jQuery('input[name="thumb_crop"]').is(':checked');
- follow_orientation = jQuery('input[name="thumb_follow_orientation"]').is(':checked');
- }
- else if(jQuery('[name="selectAction"]').val() == 'regenerateWebsize')
- {
- resizeMethod = 'pwg.images.resizeWebsize';
- maxRequests = 1;
- maxwidth = jQuery('input[name="websize_maxwidth"]').val();
- maxheight = jQuery('input[name="websize_maxheight"]').val();
- regenerationText = regenerateWebsizeMessage;
- crop = false;
- follow_orientation = false;
- }
- else return true;
-
- jQuery('.bulkAction').hide();
- jQuery('#regenerationText').html(regenerationText);
-
- var queuedManager = jQuery.manageAjax.create('queued', {
- queue: true,
- cacheResponse: false,
- maxRequests: maxRequests
- });
-
- if (jQuery('input[name="setSelected"]').attr('checked'))
- elements = all_elements;
- else
- jQuery('input[name="selection[]"]').each(function() {
- if (jQuery(this).attr('checked')) {
- elements.push(jQuery(this).val());
- }
- });
-
- progressBar_max = elements.length;
- todo = 0;
-
- jQuery('#applyActionBlock').hide();
- jQuery('select[name="selectAction"]').hide();
- jQuery('#regenerationMsg').show();
-
- jQuery('#progressBar').progressBar(0, {
- max: progressBar_max,
- textFormat: 'fraction',
- boxImage: 'themes/default/images/progressbar.gif',
- barImage: 'themes/default/images/progressbg_orange.gif'
- });
-
- for (i=0;i<elements.length;i++) {
- queuedManager.add({
- type: 'GET',
- url: 'ws.php',
- data: {
- method: resizeMethod,
- maxwidth: maxwidth,
- maxheight: maxheight,
- crop: crop,
- follow_orientation: follow_orientation,
- image_id: elements[i],
- format: 'json'
- },
- dataType: 'json',
- success: ( function(data) { progress(++todo, progressBar_max, data['result']) }),
- error: ( function(data) { progress(++todo, progressBar_max, false) })
- });
- }
- return false;
+ if (jQuery('[name="selectAction"]').val() != 'generate_derivatives')
+ {
+ return true;
+ }
+ if (generate_derivatives_done)
+ {
+ return true;
+ }
+
+ jQuery('.bulkAction').hide();
+
+ var queuedManager = jQuery.manageAjax.create('queued', {
+ queue: true,
+ cacheResponse: false,
+ maxRequests: 1
+ });
+
+ if (jQuery('input[name="setSelected"]').attr('checked'))
+ elements = all_elements;
+ else
+ jQuery('input[name="selection[]"]').each(function() {
+ if (jQuery(this).attr('checked')) {
+ elements.push(jQuery(this).val());
+ }
+ });
+
+ progressBar_max = 0;
+ todo = 0;
+
+ jQuery('#applyActionBlock').hide();
+ jQuery('select[name="selectAction"]').hide();
+ jQuery('#regenerationMsg').show();
+
+ jQuery('#progressBar').progressBar(0, {
+ max: progressBar_max,
+ textFormat: 'fraction',
+ boxImage: 'themes/default/images/progressbar.gif',
+ barImage: 'themes/default/images/progressbg_orange.gif'
+ });
+
+ getDerivativeUrls();
+ return false;
});
- function toggleCropFields(prefix) {
- if (jQuery("#"+prefix+"_crop").is(':checked')) {
- jQuery("#"+prefix+"_width_th").text(width_str);
- jQuery("#"+prefix+"_height_th").text(height_str);
- jQuery("#"+prefix+"_follow_orientation_tr").show();
- }
- else {
- jQuery("#"+prefix+"_width_th").text(max_width_str);
- jQuery("#"+prefix+"_height_th").text(max_height_str);
- jQuery("#"+prefix+"_follow_orientation_tr").hide();
- }
- }
-
- toggleCropFields("thumb");
- jQuery("#thumb_crop").click(function () {toggleCropFields("thumb")});
+ function getDerivativeUrls() {
+ if (elements.length==0)
+ return;
+ var ids = elements.splice(0, 500);
+ var params = {max_urls: 100000, ids: ids, types: []};
+ jQuery("#action_generate_derivatives input").each( function(i, t) {
+ if ($(t).attr("checked"))
+ params.types.push( t.value );
+ } );
+
+ jQuery.ajax( {
+ type: "POST",
+ url: 'ws.php?format=json&method=pwg.getMissingDerivatives',
+ data: params,
+ dataType: "json",
+ success: function(data) {
+ if (!data.stat || data.stat != "ok") {
+ return;
+ }
+ progressBar_max += data.result.urls.length;
+ progress(todo, progressBar_max);
+ for (var i=0; i < data.result.urls.length; i++) {
+ jQuery.manageAjax.add("queued", {
+ type: 'GET',
+ url: data.result.urls[i] + "&ajaxload=true",
+ dataType: 'json',
+ success: ( function(data) { progress(++todo, progressBar_max, true) }),
+ error: ( function(data) { progress(++todo, progressBar_max, false) })
+ });
+ }
+ }
+ } );
+ }
checkPermitAction()
});
jQuery(window).load(function() {
- var max_dim = 0;
- $(".thumbnails img").each(function () {
- max_dim = Math.max(max_dim, $(this).height(), $(this).width() );
- });
- max_dim += 35;
- $("ul.thumbnails span, ul.thumbnails label").css('width', max_dim+'px').css('height', max_dim+'px');
- $('ul.thumbnails').enableShiftClick();
+ var max_w=0, max_h=0;
+ $(".thumbnails img").each(function () {
+ max_w = Math.max(max_w, $(this).width() );
+ max_h = Math.max(max_h, $(this).height() );
+ });
+ max_w += 10;
+ max_h += 35;
+ $("ul.thumbnails span, ul.thumbnails label").css('width', max_w+'px').css('height', max_h+'px');
+ $('ul.thumbnails').enableShiftClick();
});
{/literal}{/footer_script}
@@ -603,33 +591,29 @@ jQuery(window).load(function() {
</p>
<ul class="thumbnails">
- {foreach from=$thumbnails item=thumbnail}
- {if in_array($thumbnail.ID, $selection)}
- {assign var='isSelected' value=true}
- {else}
- {assign var='isSelected' value=false}
- {/if}
-
- <li>
- <span class="wrap1">
- <label>
- <span class="wrap2{if $isSelected} thumbSelected{/if}">
- <div class="actions"><a href="{$thumbnail.FILE_SRC}" class="preview-box">{'Zoom'|@translate}</a> &middot; <a href="{$thumbnail.U_EDIT}" target="_blank">{'Edit'|@translate}</a></div>
- {if $thumbnail.LEVEL > 0}
- <em class="levelIndicatorB">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}</em>
- <em class="levelIndicatorF" title="{'Who can see these photos?'|@translate} : ">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}</em>
- {/if}
- <span>
- <img src="{$thumbnail.TN_SRC}"
- alt="{$thumbnail.FILE}"
- title="{$thumbnail.TITLE|@escape:'html'}"
- class="thumbnail">
- </span>
- </span>
- <input type="checkbox" name="selection[]" value="{$thumbnail.ID}" {if $isSelected}checked="checked"{/if}>
- </label>
- </span>
- </li>
+ {foreach from=$thumbnails item=thumbnail}
+ {if in_array($thumbnail.ID, $selection)}
+ {assign var='isSelected' value=true}
+ {else}
+ {assign var='isSelected' value=false}
+ {/if}
+ <li>
+ <span class="wrap1">
+ <label>
+ <span class="wrap2{if $isSelected} thumbSelected{/if}">
+ <div class="actions"><a href="{$thumbnail.FILE_SRC}" class="preview-box">{'Zoom'|@translate}</a> &middot; <a href="{$thumbnail.U_EDIT}" target="_blank">{'Edit'|@translate}</a></div>
+ {if $thumbnail.LEVEL > 0}
+ <em class="levelIndicatorB">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}</em>
+ <em class="levelIndicatorF" title="{'Who can see these photos?'|@translate} : ">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}</em>
+ {/if}
+ <span>
+ <img src="{$thumbnail.TN_SRC}" alt="{$thumbnail.FILE}" title="{$thumbnail.TITLE|@escape:'html'}" class="thumbnail">
+ </span>
+ </span>
+ <input type="checkbox" name="selection[]" value="{$thumbnail.ID}" {if $isSelected}checked="checked"{/if}>
+ </label>
+ </span>
+ </li>
{/foreach}
</ul>
@@ -686,8 +670,8 @@ jQuery(window).load(function() {
{else}
<option value="add_to_caddie">{'Add to caddie'|@translate}</option>
{/if}
- <option value="regenerateThumbnails">{'Regenerate Thumbnails'|@translate}</option>
- <option value="regenerateWebsize">{'Regenerate Websize Photos'|@translate}</option>
+ <option value="delete_derivatives">{'Delete multiple size images'|@translate}</option>
+ <option value="generate_derivatives">{'Generate multiple size images'|@translate}</option>
{if !empty($element_set_global_plugins_actions)}
{foreach from=$element_set_global_plugins_actions item=action}
<option value="{$action.ID}">{$action.NAME}</option>
@@ -784,59 +768,45 @@ jQuery(window).load(function() {
<div id="action_metadata" class="bulkAction">
</div>
- <!-- regenerate thumbnails -->
- <div id="action_regenerateThumbnails" class="bulkAction">
- <table style="margin-left:20px;">
- <tr>
- <th><label for="thumb_crop">{'Crop'|@translate}</label></th>
- <td><input type="checkbox" name="thumb_crop" id="thumb_crop" {if $upload_form_settings.thumb_crop}checked="checked"{/if}></td>
- </tr>
- <tr id="thumb_follow_orientation_tr">
- <th><label for="thumb_follow_orientation">{'Follow Orientation'|@translate}</label></th>
- <td><input type="checkbox" name="thumb_follow_orientation" id="thumb_follow_orientation" {if $upload_form_settings.thumb_follow_orientation}checked="checked"{/if}></td>
- </tr>
- <tr>
- <th id="thumb_width_th">{'Maximum Width'|@translate}</th>
- <td><input type="text" name="thumb_maxwidth" value="{$upload_form_settings.thumb_maxwidth}" size="4" maxlength="4"> {'pixels'|@translate}</td>
- </tr>
- <tr>
- <th id="thumb_height_th">{'Maximum Height'|@translate}</th>
- <td><input type="text" name="thumb_maxheight" value="{$upload_form_settings.thumb_maxheight}" size="4" maxlength="4"> {'pixels'|@translate}</td>
- </tr>
- <tr>
- <th>{'Image Quality'|@translate}</th>
- <td><input type="text" name="thumb_quality" value="{$upload_form_settings.thumb_quality}" size="3" maxlength="3"> %</td>
- </tr>
- </table>
- </div>
-
- <!-- regenerate websize -->
- <div id="action_regenerateWebsize" class="bulkAction">
- <p>
- <img src="admin/themes/default/icon/warning.png" alt="!" style="vertical-align:middle;">
- {'By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'|@translate}
- {'If no HD is available and if the current websize is bigger than resize dimensions, Piwigo will move it as HD and create a downsized websize photo from it.'|@translate}
- </p>
-
- <table style="margin:10px 20px;">
- <tr>
- <th>{'Maximum Width'|@translate}</th>
- <td><input type="text" name="websize_maxwidth" value="{$upload_form_settings.websize_maxwidth}" size="4" maxlength="4"> {'pixels'|@translate}</td>
- </tr>
- <tr>
- <th>{'Maximum Height'|@translate}</th>
- <td><input type="text" name="websize_maxheight" value="{$upload_form_settings.websize_maxheight}" size="4" maxlength="4"> {'pixels'|@translate}</td>
- </tr>
- <tr>
- <th>{'Image Quality'|@translate}</th>
- <td><input type="text" name="websize_quality" value="{$upload_form_settings.websize_quality}" size="3" maxlength="3"> %</td>
- </tr>
- </table>
- </div>
-
+ <!-- generate derivatives -->
+ <div id="action_generate_derivatives" class="bulkAction">
+ <a href="javascript:selectGenerateDerivAll()">{'All'|@translate}</a>,
+ <a href="javascript:selectGenerateDerivNone()">{'None'|@translate}</a>
+ <br>
+ {foreach from=$generate_derivatives_types key=type item=disp}
+ <label><input type="checkbox" name="generate_derivatives_type[]" value="{$type}"> {$disp}</label>
+ {/foreach}
+ {footer_script}
+ function selectGenerateDerivAll() {ldelim}
+ $("#action_generate_derivatives input[type=checkbox]").attr("checked", true);
+ }
+ function selectGenerateDerivNone() {ldelim}
+ $("#action_generate_derivatives input[type=checkbox]").attr("checked", false);
+ }
+ {/footer_script}
+ </div>
+
+ <!-- delete derivatives -->
+ <div id="action_delete_derivatives" class="bulkAction">
+ <a href="javascript:selectDelDerivAll()">{'All'|@translate}</a>,
+ <a href="javascript:selectDelDerivNone()">{'None'|@translate}</a>
+ <br>
+ {foreach from=$del_derivatives_types key=type item=disp}
+ <label><input type="checkbox" name="del_derivatives_type[]" value="{$type}"> {$disp}</label>
+ {/foreach}
+ {footer_script}
+ function selectDelDerivAll() {ldelim}
+ $("#action_delete_derivatives input[type=checkbox]").attr("checked", true);
+ }
+ function selectDelDerivNone() {ldelim}
+ $("#action_delete_derivatives input[type=checkbox]").attr("checked", false);
+ }
+ {/footer_script}
+ </div>
+
<!-- progress bar -->
- <div id="regenerationMsg" class="bulkAction">
- <p id="regenerationText" style="margin-bottom:10px;"></p>
+ <div id="regenerationMsg" class="bulkAction" style="display:none">
+ <p id="regenerationText" style="margin-bottom:10px;">{'Generate multiple size images'|@translate}</p>
<span class="progressBar" id="progressBar"></span>
<input type="hidden" name="regenerateSuccess" value="0">
<input type="hidden" name="regenerateError" value="0">
diff --git a/admin/themes/default/template/maintenance.tpl b/admin/themes/default/template/maintenance.tpl
index f55d10d2e..fc568fa42 100644
--- a/admin/themes/default/template/maintenance.tpl
+++ b/admin/themes/default/template/maintenance.tpl
@@ -34,7 +34,7 @@
<li><a href="{$U_MAINT_FEEDS}">{'Purge never used notification feeds'|@translate}</a></li>
<li><a href="{$U_MAINT_SEARCH}"onclick="return confirm('{'Purge search history'|@translate|@escape:'javascript'}');">{'Purge search history'|@translate}</a></li>
<li><a href="{$U_MAINT_COMPILED_TEMPLATES}">{'Purge compiled templates'|@translate}</a></li>
- <li>{'Purge derivative image cache'|@translate}:
+ <li>{'Delete multiple size images'|@translate}:
{foreach from=$purge_derivatives key=name item=url name=loop}{if !$smarty.foreach.loop.first}, {/if}<a href="{$url}">{$name}</a>{/foreach}
</li>
</ul>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 05:01:12 +0000