diff --git a/admin/picture_formats.php b/admin/picture_formats.php index ba9c6403a..7aba30905 100644 --- a/admin/picture_formats.php +++ b/admin/picture_formats.php @@ -47,7 +47,7 @@ foreach ($formats as &$format) $format['label'] = $lang[$lang_key]; } - $format['filesize'] = sprintf('%.1fMB', $format['filesize']/1024); + $format['filesize'] = round($format['filesize']/1024, 2); } $template->assign(array( diff --git a/admin/themes/default/js/picture_formats.js b/admin/themes/default/js/picture_formats.js index 774dfeb57..8be323c9d 100644 --- a/admin/themes/default/js/picture_formats.js +++ b/admin/themes/default/js/picture_formats.js @@ -11,25 +11,45 @@ $('.format-card').each((i, node) => { let card = $(node) let button = card.find(".format-delete") button.click(() => { - console.log(card.data('id')); - button.find('i').attr("class", "icon-spin6 animate-spin") - $.ajax({ - url: "ws.php?format=json&method=pwg.images.formats.delete", - type: "POST", - data: { - pwg_token : pwg_token, - format_id: card.data('id'), + $.confirm({ + title: str_confirm_delete_format.replace("%s",card.find('.format-card-ext span').html()), + content: "", + buttons: { + confirm: { + text: str_confirm_msg, + btnClass: 'btn-red', + action: function () { + deleteFormat(card) + }, + }, + cancel: { + text: str_cancel_msg + } }, - success: function (raw_data) { - card.fadeOut("slow", () => { - card.remove(); - if ($('.format-card').length == 0) - $('.no-formats').show() - }) - }, - error: function(message) { - console.log(message); - } - }) + ...jConfirm_confirm_options + }) + }) -}) \ No newline at end of file +}) + +function deleteFormat(card) { + card.find('.format-delete i').attr("class", "icon-spin6 animate-spin") + $.ajax({ + url: "ws.php?format=json&method=pwg.images.formats.delete", + type: "POST", + data: { + pwg_token : pwg_token, + format_id: card.data("id"), + }, + success: function (raw_data) { + card.fadeOut("slow", () => { + card.remove(); + if ($('.format-card').length == 0) + $('.no-formats').show() + }) + }, + error: function(message) { + console.log(message); + } + }) +} \ No newline at end of file diff --git a/admin/themes/default/template/picture_formats.tpl b/admin/themes/default/template/picture_formats.tpl index 573f343de..84f8296c8 100644 --- a/admin/themes/default/template/picture_formats.tpl +++ b/admin/themes/default/template/picture_formats.tpl @@ -1,13 +1,19 @@ {combine_css path="admin/themes/default/fontello/css/animation.css" order=10} {* order 10 is required, see issue 1080 *} {combine_script id='picture_formats' load='footer' path='admin/themes/default/js/picture_formats.js'} +{combine_script id='jquery.confirm' load='footer' require='jquery' path='themes/default/js/plugins/jquery-confirm.min.js'} +{combine_css path="themes/default/js/plugins/jquery-confirm.min.css"} +{combine_script id='common' load='footer' path='admin/themes/default/js/common.js'}