adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-05 09:22:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

issue #1253 badge style for counter

Browse Source 
badge style for counter in the progress bar of batch manager
This commit is contained in:
Louis
2020-11-10 14:59:26 +01:00
parent 1997f311f4
commit a46eeb1592
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/themes/default/js/batchManagerGlobal.js
+7 -7
View File
@@ -217,7 +217,7 @@ function getDerivativeUrls() {
return;
}
derivatives.total += data.result.urls.length;
jQuery('#regenerationText').html(lang.generateMsg + " " + derivatives.done.toString() + "/" + derivatives.total.toString());
jQuery('#regenerationStatus .badge-number').html(derivatives.done.toString() + "/" + derivatives.total.toString());
progress();
for (var i=0; i < data.result.urls.length; i++) {
jQuery.manageAjax.add("queued", {
@@ -226,12 +226,12 @@ function getDerivativeUrls() {
dataType: 'json',
success: ( function(data) {
derivatives.done++;
jQuery('#regenerationText').html(lang.generateMsg + " " + derivatives.done.toString() + "/" + derivatives.total.toString());
jQuery('#regenerationStatus .badge-number').html(derivatives.done.toString() + "/" + derivatives.total.toString());
progress(true)
}),
error: ( function(data) {
derivatives.done++;
jQuery('#regenerationText').html(lang.generateMsg + " " + derivatives.done.toString() + "/" + derivatives.total.toString());
jQuery('#regenerationStatus .badge-number').html(derivatives.done.toString() + "/" + derivatives.total.toString());
progress(false)
})
});
@@ -312,13 +312,13 @@ jQuery('#applyAction').click(function(e) {
if (isOk && data.result.nb_synchronized != thisBatchSize)
/*TODO: user feedback only data.nb_synchronized images out of thisBatchSize were sync*/;
/*TODO: user feedback if isError*/
jQuery('#regenerationText').html(lang.syncProgressMessage + " " + todo.toString() + "/" + progressBar_max.toString());
jQuery('#regenerationStatus .badge-number').html(todo.toString() + "/" + progressBar_max.toString());
progress_bar(todo, progressBar_max, false);
},
error: function(data) {
todo += thisBatchSize;
/*TODO: user feedback*/
jQuery('#regenerationText').html(lang.syncProgressMessage + " " + todo.toString() + "/" + progressBar_max.toString());
jQuery('#regenerationStatus .badge-number').html(todo.toString() + "/" + progressBar_max.toString());
progress_bar(todo, progressBar_max, false);
}
});
@@ -395,13 +395,13 @@ jQuery('#applyAction').click(function(e) {
if (isOk && data.result != thisBatchSize);
/*TODO: user feedback only data.result images out of thisBatchSize were deleted*/;
/*TODO: user feedback if isError*/
jQuery('#regenerationText').html(lang.deleteProgressMessage + " " + todo.toString() + "/" + progressBar_max.toString());
jQuery('#regenerationStatus .badge-number').html(todo.toString() + "/" + progressBar_max.toString());
progress_bar(todo, progressBar_max, false);
},
error: function(data) {
todo += thisBatchSize;
/*TODO: user feedback*/
jQuery('#regenerationText').html(lang.deleteProgressMessage + " " + todo.toString() + "/" + progressBar_max.toString());
jQuery('#regenerationStatus .badge-number').html(todo.toString() + "/" + progressBar_max.toString());
progress_bar(todo, progressBar_max, false);
}
});
admin/themes/default/template/batch_manager_global.tpl
+8 -7
View File
@@ -772,12 +772,6 @@ UL.thumbnails SPAN.wrap2 {ldelim}
{/foreach}
</div>
<div id="regenerationMsg" class="bulkAction" style="display:none">
<p id="regenerationText" style="margin-bottom:10px;">{'Generate multiple size images'|@translate}</p>
<input type="hidden" name="regenerateSuccess" value="0">
<input type="hidden" name="regenerateError" value="0">
</div>
<!-- plugins -->
{if !empty($element_set_global_plugins_actions)}
{foreach from=$element_set_global_plugins_actions item=action}
@@ -788,7 +782,14 @@ UL.thumbnails SPAN.wrap2 {ldelim}
{/if}
</div>
</div> <!-- #permitAction -->
<div id="regenerationMsg" class="bulkAction" style="display:none;margin-left:0;">
<div id="regenerationStatus" style="margin-bottom:10px;">
<span id="regenerationText">{'Generate multiple size images'|@translate}</span>
<span class="badge-number" style="font-size:12.8px"></span>
</div>
<input type="hidden" name="regenerateSuccess" value="0">
<input type="hidden" name="regenerateError" value="0">
</div>
<!-- progress bar -->
<div id="uploadingActions" style="display:none">
<div class="big-progressbar" style="max-width:100%;margin-bottom: 10px;">