From fb14ab21e83b119c92060b6f9eb4813226efbb39 Mon Sep 17 00:00:00 2001 From: DeSwa Date: Tue, 8 Oct 2024 15:16:28 +0300 Subject: [PATCH 1/6] New labels for Tree Contextmenu --- Resources/translations/messages.ca.yml | 4 ++++ Resources/translations/messages.de.yml | 4 ++++ Resources/translations/messages.en.yml | 4 ++++ Resources/translations/messages.es.yml | 4 ++++ Resources/translations/messages.fr.yml | 4 ++++ Resources/translations/messages.it.yml | 4 ++++ Resources/translations/messages.nl.yml | 4 ++++ Resources/translations/messages.pl.yml | 4 ++++ Resources/translations/messages.pt_BR.yml | 4 ++++ Resources/translations/messages.ro.yml | 4 ++++ Resources/translations/messages.ru.yml | 4 ++++ Resources/translations/messages.tr.yml | 6 +++++- 12 files changed, 49 insertions(+), 1 deletion(-) diff --git a/Resources/translations/messages.ca.yml b/Resources/translations/messages.ca.yml index 15c5d09..ac86a33 100644 --- a/Resources/translations/messages.ca.yml +++ b/Resources/translations/messages.ca.yml @@ -17,6 +17,10 @@ folder: deleted: success: "La carpeta s'ha eliminat correctament" unauthorized: "La carpeta ja no existeix o no està autoritzat per accedir a aquesta pàgina" + rename: + success: Folder has been renamed successfully + unauthorized: Folder no longer exist or you are not authorized to access this page + danger: Folder could not renamed button: cancel: "CANCEL·LAR" refresh: "Actualitzar" diff --git a/Resources/translations/messages.de.yml b/Resources/translations/messages.de.yml index bd32f31..cf7cd9d 100644 --- a/Resources/translations/messages.de.yml +++ b/Resources/translations/messages.de.yml @@ -17,6 +17,10 @@ folder: deleted: success: Das Verzeichnis wurde erfolgreich gelöscht unauthorized: Die Datei existiert nicht mehr oder Sie haben keine Zugriffsrechte auf diese Seite + rename: + success: Folder has been renamed successfully + unauthorized: Folder no longer exist or you are not authorized to access this page + danger: Folder could not renamed button: cancel: ABBRECHEN refresh: Neu laden diff --git a/Resources/translations/messages.en.yml b/Resources/translations/messages.en.yml index 5e950f4..f460e75 100644 --- a/Resources/translations/messages.en.yml +++ b/Resources/translations/messages.en.yml @@ -17,6 +17,10 @@ folder: deleted: success: Folder has been deleted successfully unauthorized: Folder no longer exist or you are not authorized to access this page + rename: + success: Folder has been renamed successfully + unauthorized: Folder no longer exist or you are not authorized to access this page + danger: Folder could not renamed button: cancel: CANCEL refresh: Refresh diff --git a/Resources/translations/messages.es.yml b/Resources/translations/messages.es.yml index 3b7b98c..0796ed1 100644 --- a/Resources/translations/messages.es.yml +++ b/Resources/translations/messages.es.yml @@ -17,6 +17,10 @@ folder: deleted: success: La carpeta se ha eliminado correctamente unauthorized: La carpeta ya no existe o no está autorizado para acceder a esta página + rename: + success: Folder has been renamed successfully + unauthorized: Folder no longer exist or you are not authorized to access this page + danger: Folder could not renamed button: cancel: CANCELAR refresh: Actualizar diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml index bf1126e..737a8a3 100644 --- a/Resources/translations/messages.fr.yml +++ b/Resources/translations/messages.fr.yml @@ -17,6 +17,10 @@ folder: deleted: success: Le dossier a été supprimé avec succès unauthorized: Le dossier n'existe plus ou vous n'êtes pas autorisé à accéder à cette page + rename: + success: Folder has been renamed successfully + unauthorized: Folder no longer exist or you are not authorized to access this page + danger: Folder could not renamed button: cancel: ANNULER refresh: Rafraîchir diff --git a/Resources/translations/messages.it.yml b/Resources/translations/messages.it.yml index bfd732f..d6388bb 100644 --- a/Resources/translations/messages.it.yml +++ b/Resources/translations/messages.it.yml @@ -17,6 +17,10 @@ folder: deleted: success: La cartella è stata eliminata correttamente unauthorized: La cartella non esiste più o non sei autorizzato ad accedere a questa pagina + rename: + success: Folder has been renamed successfully + unauthorized: Folder no longer exist or you are not authorized to access this page + danger: Folder could not renamed button: cancel: ANNULLA refresh: Aggiorna diff --git a/Resources/translations/messages.nl.yml b/Resources/translations/messages.nl.yml index a627ced..134b537 100644 --- a/Resources/translations/messages.nl.yml +++ b/Resources/translations/messages.nl.yml @@ -17,6 +17,10 @@ folder: deleted: success: Map is met succes verwijderd. unauthorized: Map bestaat niet meer of u bent niet bevoegd om deze pagina te openen. + rename: + success: Folder has been renamed successfully + unauthorized: Folder no longer exist or you are not authorized to access this page + danger: Folder could not renamed button: cancel: ANULEREN refresh: Verversen diff --git a/Resources/translations/messages.pl.yml b/Resources/translations/messages.pl.yml index d95a8cf..b91c1e4 100644 --- a/Resources/translations/messages.pl.yml +++ b/Resources/translations/messages.pl.yml @@ -17,6 +17,10 @@ folder: deleted: success: Folder został pomyślnie usunięty unauthorized: Folder już nie istnieje lub nie masz uprawnień dostępu do tej strony. + rename: + success: Folder has been renamed successfully + unauthorized: Folder no longer exist or you are not authorized to access this page + danger: Folder could not renamed button: cancel: Anuluj refresh: Odśwież diff --git a/Resources/translations/messages.pt_BR.yml b/Resources/translations/messages.pt_BR.yml index 7366d18..7e43e5b 100644 --- a/Resources/translations/messages.pt_BR.yml +++ b/Resources/translations/messages.pt_BR.yml @@ -17,6 +17,10 @@ folder: deleted: success: A pasta excluída com sucesso unauthorized: A pasta não existe mais ou você não tem autorização para acessar esta página + rename: + success: Folder has been renamed successfully + unauthorized: Folder no longer exist or you are not authorized to access this page + danger: Folder could not renamed button: cancel: CANCELAR refresh: Atualizar diff --git a/Resources/translations/messages.ro.yml b/Resources/translations/messages.ro.yml index f0cea15..55ab0f6 100644 --- a/Resources/translations/messages.ro.yml +++ b/Resources/translations/messages.ro.yml @@ -17,6 +17,10 @@ folder: deleted: success: Directorul a fost sters cu succes unauthorized: Directorul nu mai exista sau nu esti autorizat sa accesezi aceasta pagina + rename: + success: Folder has been renamed successfully + unauthorized: Folder no longer exist or you are not authorized to access this page + danger: Folder could not renamed button: cancel: ANULEAZA refresh: Reimprospateaza diff --git a/Resources/translations/messages.ru.yml b/Resources/translations/messages.ru.yml index cf16dc5..7cdd69d 100644 --- a/Resources/translations/messages.ru.yml +++ b/Resources/translations/messages.ru.yml @@ -17,6 +17,10 @@ folder: deleted: success: Папка успешно удалена unauthorized: Папка больше не существует или у вас недостаточно прав для доступа к этой странице + rename: + success: Folder has been renamed successfully + unauthorized: Folder no longer exist or you are not authorized to access this page + danger: Folder could not renamed button: cancel: ОТМЕНА refresh: Обновить diff --git a/Resources/translations/messages.tr.yml b/Resources/translations/messages.tr.yml index a562cb4..f9b0e33 100644 --- a/Resources/translations/messages.tr.yml +++ b/Resources/translations/messages.tr.yml @@ -17,10 +17,14 @@ folder: deleted: success: Klasör başarıyla silindi unauthorized: Klasör mevcut değil veya bu işlem için yetkiniz yok + rename: + success: Klasör başarıyla yeniden adlandırıldı + unauthorized: Klasör mevcut değil veya bu işlem için yetkiniz yok + danger: Klasör yeniden adlandırılamadı button: cancel: İPTAL refresh: Yenile - parent: Parent + parent: Üst Dizin save: KAYDET add: files: Dosya Yükle... From 37ca93b51955882a7d7e5c08b13c3a81724fb08d Mon Sep 17 00:00:00 2001 From: DeSwa Date: Tue, 8 Oct 2024 15:17:51 +0300 Subject: [PATCH 2/6] Modernize + New Features + Remember last working directory --- DependencyInjection/Configuration.php | 1 + Event/FileManagerEvents.php | 2 + Helpers/FileManager.php | 2 + Resources/doc/tutorials/input-button.md | 2 +- Resources/doc/tutorials/integrate-tinymce.md | 2 +- Resources/public/css/manager.css | 118 +++- Resources/public/js/manager.js | 570 ++++++++++--------- Resources/views/extension/_order.html.twig | 3 +- Resources/views/manager.html.twig | 16 +- Resources/views/views/_modals.html.twig | 25 + composer.json | 3 +- 11 files changed, 474 insertions(+), 270 deletions(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 9a20e15..900a210 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -32,6 +32,7 @@ public function getConfigTreeBuilder(): TreeBuilder { ->children() ->scalarNode('dir')->end() ->enumNode('type')->values(['file', 'image', 'media'])->end() + ->booleanNode('remember_last_path')->defaultValue(true)->end() ->booleanNode('tree')->end() ->booleanNode('show_file_count')->defaultValue(true)->end() ->scalarNode('root_name')->defaultValue(null)->end() diff --git a/Event/FileManagerEvents.php b/Event/FileManagerEvents.php index c3a6f90..7c60374 100644 --- a/Event/FileManagerEvents.php +++ b/Event/FileManagerEvents.php @@ -22,6 +22,8 @@ final class FileManagerEvents { public const PRE_DELETE_FOLDER = ' file_manager.pre_delete_folder'; /** @Event("Symfony\Component\EventDispatcher\GenericEvent") */ public const POST_DELETE_FOLDER = 'file_manager.post_delete_folder'; + /** @Event("Symfony\Component\EventDispatcher\GenericEvent") */ + public const RENAME_FOLDER = 'file_manager.post_rename_folder'; /** @Event("Symfony\Component\EventDispatcher\GenericEvent") */ public const POST_DIRECTORY_FILTER_CONFIGURATION = 'file_manager.post_directory_filter_configuration'; diff --git a/Helpers/FileManager.php b/Helpers/FileManager.php index 26ffd3b..610dad6 100644 --- a/Helpers/FileManager.php +++ b/Helpers/FileManager.php @@ -7,6 +7,7 @@ use Symfony\Component\EventDispatcher\GenericEvent; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpFoundation\Session\SessionInterface; use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\Routing\RouterInterface; @@ -75,6 +76,7 @@ public function getParent(): ?string $queryParentParameters['route'] = \dirname($this->getRoute()); } else { unset($queryParentParameters['route']); +// $queryParentParameters['route'] = '/'; } $parentRoute = $this->router->generate('file_manager', $queryParentParameters); diff --git a/Resources/doc/tutorials/input-button.md b/Resources/doc/tutorials/input-button.md index e128e7b..0f1d90d 100644 --- a/Resources/doc/tutorials/input-button.md +++ b/Resources/doc/tutorials/input-button.md @@ -49,7 +49,7 @@ artgris_file_manager:
+ frameborder="0" scrolling="no">
diff --git a/Resources/doc/tutorials/integrate-tinymce.md b/Resources/doc/tutorials/integrate-tinymce.md index c42036f..1059df4 100644 --- a/Resources/doc/tutorials/integrate-tinymce.md +++ b/Resources/doc/tutorials/integrate-tinymce.md @@ -92,7 +92,7 @@ TinyMCE v5 type: 'panel', items: [{ type: 'htmlpanel', - html: windowManagerCSS + '' + html: windowManagerCSS + '' }] }, buttons: [], diff --git a/Resources/public/css/manager.css b/Resources/public/css/manager.css index 6492513..b5faf37 100644 --- a/Resources/public/css/manager.css +++ b/Resources/public/css/manager.css @@ -8,7 +8,12 @@ body { .thead-default th { color: #464a4c; - background-color: #eceeef; + background-color: #f7f8f9; + border-bottom: 0 !important; + font-size: 12px !important; + position: sticky; + top: 0; + z-index: 1; } .bar { @@ -23,7 +28,7 @@ body { } .top-bar { - padding: 10px 0; + padding: 7px 0; margin: 3px 0; } @@ -52,14 +57,23 @@ body { } .label { - font-size: 70% !important; + /*font-size: 70% !important;*/ line-height: 24px !important; - vertical-align: middle; + /*vertical-align: middle;*/ } .jstree { background-color: #f9f9f9; - padding: 10px 5px; + padding: 5px 5px; + font-size: 12px; + height: 470px; + padding-bottom: 25px; + overflow: hidden; +} + +.jstree:hover{ + overflow-y: scroll; + scrollbar-width: thin; } .thumbnail { @@ -148,3 +162,97 @@ button i { } +.jstree-default .jstree-striped{ + background: none; +} + +.list-blk, .thumbnail-blk{ + font-size: 13px !important; + overflow-y:scroll; + scrollbar-width: thin; + height:500px; +} + +div.select-all{ + background-color: #f7f8f9; + position: sticky !important; + z-index: 1 !important; + top: 10px !important; + box-shadow: rgba(50, 50, 93, 0.25) 0px 2px 5px -1px, rgba(0, 0, 0, 0.3) 0px 1px 3px -1px; + padding-top: 3px; +} + +.filemanager-sort-icon{ + padding-left: 5px; +} + +.jstree-default .jstree-search { + font-style: italic; + color: #CD5C5C; + font-weight: normal; +} + + + +/* Context Menu Theme */ + +.vakata-context, +.vakata-context ul { + padding:.5rem 0; + min-width:150px; + font-size:1.3rem; + background: #ffffff; + box-shadow:0px 0px 50px 0px rgba(82, 63, 105, 0.15); + border:0; + border-radius:.475rem; +} + +.vakata-context li, +.vakata-context ul li { + padding:0; + border:0 +} +.vakata-context li a, +.vakata-context ul li a { + padding:0 1.2rem; + border:0 +} +.vakata-context li a i, +.vakata-context ul li a i { + display:none +} + +.vakata-context li a ins, +.vakata-context li a span, +.vakata-context ul li a ins, +.vakata-context ul li a span { + display:none; + border:0!important +} +.vakata-context .vakata-context-hover>a, +.vakata-context li a:hover, +.vakata-context ul .vakata-context-hover>a, +.vakata-context ul li a:hover { + margin:0; + background-color:#F9F9F9; + color:#1B84FF; + box-shadow:none +} +.vakata-context .vakata-context-hover>a .ins, +.vakata-context .vakata-context-hover>a .span, +.vakata-context li a:hover .ins, +.vakata-context li a:hover .span, +.vakata-context ul .vakata-context-hover>a .ins, +.vakata-context ul .vakata-context-hover>a .span, +.vakata-context ul li a:hover .ins, +.vakata-context ul li a:hover .span { + border:0!important +} +.vakata-context .vakata-context-separator a, +.vakata-context-rtl .vakata-context-separator a { + margin:0; + border:0; + height:2px; + background-color:#F1F1F4; +} + diff --git a/Resources/public/js/manager.js b/Resources/public/js/manager.js index 4a99c22..5c93685 100644 --- a/Resources/public/js/manager.js +++ b/Resources/public/js/manager.js @@ -1,298 +1,350 @@ $(function () { - var $renameModal = $('#js-confirm-rename'); - var $deleteModal = $('#js-confirm-delete'); - var $displayModal = $('#js-display-image'); - var callback = function (key, opt) { - switch (key) { - case 'edit': - var $renameModalButton = opt.$trigger.find(".js-rename-modal") - renameFile($renameModalButton) - $renameModal.modal("show"); - break; - case 'delete': - var $deleteModalButton = opt.$trigger.find(".js-delete-modal") - deleteFile($deleteModalButton) - $deleteModal.modal("show"); - break; - case 'download': - var $downloadButton = opt.$trigger.find(".js-download") - downloadFile($downloadButton) - break; - case 'preview': - var $previewModalButton = opt.$trigger.find(".js-open-modal") - previewFile($previewModalButton) - $displayModal.modal("show"); - break; - } - }; - - $.contextMenu({ - selector: '.file', - callback: callback, - items: { - "delete": {name: deleteMessage, icon: "far fa-trash-alt"}, - "edit": {name: renameMessage, icon: "far fa-edit"}, - "download": {name: downloadMessage, icon: "fas fa-download"}, + var $renameModal = $('#js-confirm-rename'); + var $deleteModal = $('#js-confirm-delete'); + var $displayModal = $('#js-display-image'); + var callback = function (key, opt) { + switch (key) { + case 'edit': + var $renameModalButton = opt.$trigger.find(".js-rename-modal") + renameFile($renameModalButton) + $renameModal.modal("show"); + break; + case 'delete': + var $deleteModalButton = opt.$trigger.find(".js-delete-modal") + deleteFile($deleteModalButton) + $deleteModal.modal("show"); + break; + case 'download': + var $downloadButton = opt.$trigger.find(".js-download") + downloadFile($downloadButton) + break; + case 'preview': + var $previewModalButton = opt.$trigger.find(".js-open-modal") + previewFile($previewModalButton) + $displayModal.modal("show"); + break; + } + }; + + $.contextMenu({ + selector: '.file', + callback: callback, + items: { + "delete": {name: deleteMessage, icon: "far fa-trash-alt"}, + "edit": {name: renameMessage, icon: "far fa-edit"}, + "download": {name: downloadMessage, icon: "fas fa-download"}, + } + }); + $.contextMenu({ + selector: '.img', + callback: callback, + items: { + "delete": {name: deleteMessage, icon: "far fa-trash-alt"}, + "edit": {name: renameMessage, icon: "far fa-edit"}, + "download": {name: downloadMessage, icon: "fas fa-download"}, + "preview": {name: previewMessage, icon: "fas fa-eye"}, + } + }); + $.contextMenu({ + selector: '.dir', + callback: callback, + items: { + "delete": {name: deleteMessage, icon: "far fa-trash-alt"}, + "edit": {name: renameMessage, icon: "far fa-edit"}, + } + }); + + function renameFile($renameModalButton) { + $('#rename_f_name').val($renameModalButton.data('name')); + $('#rename_f_extension').val($renameModalButton.data('extension')); + $renameModal.find('form').attr('action', $renameModalButton.data('href')) } - }); - $.contextMenu({ - selector: '.img', - callback: callback, - items: { - "delete": {name: deleteMessage, icon: "far fa-trash-alt"}, - "edit": {name: renameMessage, icon: "far fa-edit"}, - "download": {name: downloadMessage, icon: "fas fa-download"}, - "preview": {name: previewMessage, icon: "fas fa-eye"}, + + function deleteFile($deleteModalButton) { + $('#js-confirm-delete').find('form').attr('action', $deleteModalButton.data('href')); } - }); - $.contextMenu({ - selector: '.dir', - callback: callback, - items: { - "delete": {name: deleteMessage, icon: "far fa-trash-alt"}, - "edit": {name: renameMessage, icon: "far fa-edit"}, + + function previewFile($previewModalButton) { + var href = addParameterToURL($previewModalButton.data('href'), 'time=' + new Date().getTime()); + $('#js-display-image').find('img').attr('src', href); } - }); - function renameFile($renameModalButton) { - $('#rename_f_name').val($renameModalButton.data('name')); - $('#rename_f_extension').val($renameModalButton.data('extension')); - $renameModal.find('form').attr('action', $renameModalButton.data('href')) - } + function addParameterToURL(_url, param) { + _url += (_url.split('?')[1] ? '&' : '?') + param; + return _url; + } - function deleteFile($deleteModalButton) { - $('#js-confirm-delete').find('form').attr('action', $deleteModalButton.data('href')); - } + function downloadFile($downloadButton) { + $downloadButton[0].click(); + } - function previewFile($previewModalButton) { - var href = addParameterToURL($previewModalButton.data('href'), 'time=' + new Date().getTime()); - $('#js-display-image').find('img').attr('src', href); - } + function initTree(treedata) { + $('#tree').jstree({ + 'core': { + 'data': treedata, + "check_callback": true, + "themes": {"stripes": true} + }, + 'search': { + 'case_insensitive': true, + 'show_only_matches': true + }, + "contextmenu": { + items: function ($node) { + return { + "create_folder": { + "seperator_after": true, + "label": newFolderMessage, + "action": function (data) { + $('#addFolder').modal('show'); + var $a_href = data.reference[0].getAttribute("href"); + $a_href_folder = new URLSearchParams($a_href.split('?')[1]).get('route'); + document.getElementById('rename_defined_parent_path').value = $a_href_folder; + } + }, + "delete_folder": { + "separator_before": true, + "seperator_after": true, + "label": deleteMessage, + "action": function (data) { + document.querySelector('.js-delete-modal').click(); + var $a_href = data.reference[0].getAttribute("href"); + $a_href_folder = new URLSearchParams($a_href.split('?')[1]).get('route'); + document.getElementById('delete_f_defined_parent_path').value = $a_href_folder; + } + }, + "rename_folder": { + "label": renameMessage, + "action": function (data) { + $('#js-confirm-folder-rename').modal('show'); + var $old_name = data.reference[0].innerText; + document.getElementById('rename_folder_name').value = $old_name; + document.getElementById('rename_folder_oldname').value = $old_name; + var $a_href = data.reference[0].getAttribute("href"); + $a_href_folder = new URLSearchParams($a_href.split('?')[1]).get('route'); + document.getElementById('rename_folder_oldpath').value = $a_href_folder; + } + }, + } + }, + select_node: + false, + }, + 'plugins': ['search', 'contextmenu','dnd'] + }).bind("changed.jstree", function (e, data) { + if (data.node) { + document.location = data.node.a_attr.href; + } + }).on('search.jstree', function (nodes, str, res) { + if (str.nodes.length === 0) { + $('#jstree-folder-search').jstree(true).hide_all(); + } + }); + } - function addParameterToURL(_url, param) { - _url += (_url.split('?')[1] ? '&' : '?') + param; - return _url; - } + if (tree === true) { - function downloadFile($downloadButton) { - $downloadButton[0].click(); - } + // sticky kit + $("#tree-block").stick_in_parent(); - function initTree(treedata) { - $('#tree').jstree({ - 'core': { - 'data': treedata, - "check_callback": true - } - }).bind("changed.jstree", function (e, data) { - if (data.node) { - document.location = data.node.a_attr.href; - } + initTree(treedata); + } + $(document) + // checkbox select all + .on('click', '#select-all', function () { + var checkboxes = $('#form-multiple-delete').find(':checkbox') + if ($(this).is(':checked')) { + checkboxes.prop('checked', true); + } else { + checkboxes.prop('checked', false); + } + }) + // delete modal buttons + .on('click', '.js-delete-modal', function () { + deleteFile($(this)); + } + ) + // preview modal buttons + .on('click', '.js-open-modal', function () { + previewFile($(this)); + } + ) + // rename modal buttons + .on('click', '.js-rename-modal', function () { + renameFile($(this)); + } + ) + // multiple delete modal button + .on('click', '#js-delete-multiple-modal', function () { + var $multipleDelete = $('#form-multiple-delete').serialize(); + if ($multipleDelete) { + var href = urldelete + '&' + $multipleDelete; + $('#js-confirm-delete').find('form').attr('action', href); + } + }) + // checkbox + .on('click', '#form-multiple-delete :checkbox', function () { + var $jsDeleteMultipleModal = $('#js-delete-multiple-modal'); + if ($(".checkbox").is(':checked')) { + $jsDeleteMultipleModal.removeClass('disabled'); + } else { + $jsDeleteMultipleModal.addClass('disabled'); + } + }); + + // preselected + $renameModal.on('shown.bs.modal', function () { + $('#form_name').select().mouseup(function () { + $('#form_name').unbind("mouseup"); + return false; + }); }); - } - - if (tree === true) { - - // sticky kit - $("#tree-block").stick_in_parent(); - - initTree(treedata); - } - $(document) - // checkbox select all - .on('click', '#select-all', function () { - var checkboxes = $('#form-multiple-delete').find(':checkbox') - if ($(this).is(':checked')) { - checkboxes.prop('checked', true); - } else { - checkboxes.prop('checked', false); - } - }) - // delete modal buttons - .on('click', '.js-delete-modal', function () { - deleteFile($(this)); - } - ) - // preview modal buttons - .on('click', '.js-open-modal', function () { - previewFile($(this)); - } - ) - // rename modal buttons - .on('click', '.js-rename-modal', function () { - renameFile($(this)); - } - ) - // multiple delete modal button - .on('click', '#js-delete-multiple-modal', function () { - var $multipleDelete = $('#form-multiple-delete').serialize(); - if ($multipleDelete) { - var href = urldelete + '&' + $multipleDelete; - $('#js-confirm-delete').find('form').attr('action', href); - } - }) - // checkbox - .on('click', '#form-multiple-delete :checkbox', function () { - var $jsDeleteMultipleModal = $('#js-delete-multiple-modal'); - if ($(".checkbox").is(':checked')) { - $jsDeleteMultipleModal.removeClass('disabled'); - } else { - $jsDeleteMultipleModal.addClass('disabled'); - } + $('#addFolder').on('shown.bs.modal', function () { + $('#rename_name').select().mouseup(function () { + $('#rename_name').unbind("mouseup"); + return false; + }); }); - // preselected - $renameModal.on('shown.bs.modal', function () { - $('#form_name').select().mouseup(function () { - $('#form_name').unbind("mouseup"); - return false; - }); - }); - $('#addFolder').on('shown.bs.modal', function () { - $('#rename_name').select().mouseup(function () { - $('#rename_name').unbind("mouseup"); - return false; - }); - }); + // Module Tiny + if (moduleName === 'tiny') { - // Module Tiny - if (moduleName === 'tiny') { + $('#form-multiple-delete').on('click', '.select', function () { - $('#form-multiple-delete').on('click', '.select', function () { + var windowManager = top != undefined && top.tinymceWindowManager != undefined ? top.tinymceWindowManager : ''; - var windowManager = top != undefined && top.tinymceWindowManager != undefined ? top.tinymceWindowManager : ''; + // tinymce 5 + if (windowManager != '') { + if (top.tinymceCallBackURL != undefined) + top.tinymceCallBackURL = $(this).attr("data-path"); + windowManager.close(); + } else { + // tinymce 4 + var args = top.tinymce.activeEditor.windowManager.getParams(); + var input = args.input; + var document = args.window.document; + var divInputSplit = document.getElementById(input).parentNode.id.split("_"); - // tinymce 5 - if (windowManager != '') { - if (top.tinymceCallBackURL != undefined) - top.tinymceCallBackURL = $(this).attr("data-path"); - windowManager.close(); - } else { - // tinymce 4 - var args = top.tinymce.activeEditor.windowManager.getParams(); - var input = args.input; - var document = args.window.document; - var divInputSplit = document.getElementById(input).parentNode.id.split("_"); + // set url + document.getElementById(input).value = $(this).attr("data-path"); - // set url - document.getElementById(input).value = $(this).attr("data-path"); + // set width and height + var baseId = divInputSplit[0] + '_'; + var baseInt = parseInt(divInputSplit[1], 10); - // set width and height - var baseId = divInputSplit[0] + '_'; - var baseInt = parseInt(divInputSplit[1], 10); + divWidth = baseId + (baseInt + 3); + divHeight = baseId + (baseInt + 5); - divWidth = baseId + (baseInt + 3); - divHeight = baseId + (baseInt + 5); + document.getElementById(divWidth).value = $(this).attr("data-width"); + document.getElementById(divHeight).value = $(this).attr("data-height"); - document.getElementById(divWidth).value = $(this).attr("data-width"); - document.getElementById(divHeight).value = $(this).attr("data-height"); + top.tinymce.activeEditor.windowManager.close(); + } - top.tinymce.activeEditor.windowManager.close(); - } + }); + } - }); - } + // Module CKEditor + if (moduleName === 'ckeditor') { + $('#form-multiple-delete').on('click', '.select', function () { + var regex = new RegExp("[\\?&]CKEditorFuncNum=([^&#]*)"); + var funcNum = regex.exec(location.search)[1]; + var fileUrl = $(this).attr("data-path"); + window.opener.CKEDITOR.tools.callFunction(funcNum, fileUrl); + window.close(); + }); + } - // Module CKEditor - if (moduleName === 'ckeditor') { - $('#form-multiple-delete').on('click', '.select', function () { - var regex = new RegExp("[\\?&]CKEditorFuncNum=([^&#]*)"); - var funcNum = regex.exec(location.search)[1]; - var fileUrl = $(this).attr("data-path"); - window.opener.CKEDITOR.tools.callFunction(funcNum, fileUrl); - window.close(); - }); - } + // Global functions + // display error alert + function displayError(msg) { + displayAlert('danger', msg) + } - // Global functions - // display error alert - function displayError(msg) { - displayAlert('danger', msg) - } + // display success alert + function displaySuccess(msg) { + displayAlert('success', msg) + } - // display success alert - function displaySuccess(msg) { - displayAlert('success', msg) - } + // file upload + $('#fileupload').fileupload({ + dataType: 'json', + processQueue: false, + dropZone: $('#dropzone') + }).on('fileuploaddone', function (e, data) { + $.each(data.result.files, function (index, file) { + const fileName = $("").text(file.name).html(); + if (file.url) { + displaySuccess(fileName + ' ' + successMessage) + // Ajax update view + $.ajax({ + dataType: "json", + url: url, + type: 'GET' + }).done(function (data) { + // update file list + $('#form-multiple-delete').html(data.data); + + lazy(); + + if (tree === true) { + $('#tree').data('jstree', false).empty(); + initTree(data.treeData); + } + + $('#select-all').prop('checked', false); + $('#js-delete-multiple-modal').addClass('disabled'); + + }).fail(function (jqXHR, textStatus, errorThrown) { + displayError('Ajax call error : ' + jqXHR.status + ' ' + errorThrown) + }); + + } else if (file.error) { + displayError(fileName + ' ' + file.error) + } + }); + }).on('fileuploadfail', function (e, data) { + $.each(data.files, function (index, file) { + displayError('File upload failed.') + }); + }).on('fileuploadprogressall', function (e, data) { + + if (e.isDefaultPrevented()) { + return false; + } + var progress = Math.floor((data.loaded / data.total) * 100); + + $('.progress-bar') + .removeClass("notransition") + .attr('aria-valuenow', progress) + .css('width', progress + '%'); - // file upload - $('#fileupload').fileupload({ - dataType: 'json', - processQueue: false, - dropZone: $('#dropzone') - }).on('fileuploaddone', function (e, data) { - $.each(data.result.files, function (index, file) { - const fileName = $("").text(file.name).html(); - if (file.url) { - displaySuccess(fileName+' ' + successMessage) - // Ajax update view - $.ajax({ - dataType: "json", - url: url, - type: 'GET' - }).done(function (data) { - // update file list - $('#form-multiple-delete').html(data.data); - - lazy(); - - if (tree === true) { - $('#tree').data('jstree', false).empty(); - initTree(data.treeData); - } - - $('#select-all').prop('checked', false); - $('#js-delete-multiple-modal').addClass('disabled'); - - }).fail(function (jqXHR, textStatus, errorThrown) { - displayError('Ajax call error : ' + jqXHR.status + ' ' + errorThrown) - }); - - } else if (file.error) { - displayError(fileName+' ' + file.error) + }).on('fileuploadstop', function (e) { + if (e.isDefaultPrevented()) { + return false; } + $('.progress-bar') + .addClass("notransition") + .attr('aria-valuenow', 0) + .css('width', 0 + '%'); }); - }).on('fileuploadfail', function (e, data) { - $.each(data.files, function (index, file) { - displayError('File upload failed.') - }); - }).on('fileuploadprogressall', function (e, data) { - if (e.isDefaultPrevented()) { - return false; + function lazy() { + $('.lazy').Lazy({}); } - var progress = Math.floor((data.loaded / data.total) * 100); - - $('.progress-bar') - .removeClass("notransition") - .attr('aria-valuenow', progress) - .css('width', progress + '%'); - }).on('fileuploadstop', function (e) { - if (e.isDefaultPrevented()) { - return false; - } - $('.progress-bar') - .addClass("notransition") - .attr('aria-valuenow', 0) - .css('width', 0 + '%'); - }); - - function lazy() { - $('.lazy').Lazy({}); - } + lazy(); - lazy(); + $('#search').on("keyup", function () { + var value = $(this).val().toLowerCase(); + $('#form-multiple-delete .file-wrapper').filter(function () { + $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1); + }); - $('#search').on("keyup", function() { - var value = $(this).val().toLowerCase(); - $('#form-multiple-delete .file-wrapper').filter(function() { - $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1); }); - - }); -}) + } +) ; \ No newline at end of file diff --git a/Resources/views/extension/_order.html.twig b/Resources/views/extension/_order.html.twig index 41ae9b6..edc3f99 100644 --- a/Resources/views/extension/_order.html.twig +++ b/Resources/views/extension/_order.html.twig @@ -1,4 +1,5 @@ + {# #} {{ ('table.'~type)|trans }} - + diff --git a/Resources/views/manager.html.twig b/Resources/views/manager.html.twig index 72b5e33..a5e559b 100644 --- a/Resources/views/manager.html.twig +++ b/Resources/views/manager.html.twig @@ -6,6 +6,7 @@ + {% block stylesheets %} @@ -59,7 +60,7 @@ name="files[]" multiple="" accept="{{ fileManager.configuration.accept is defined ? fileManager.configuration.accept : (fileManager.type ? accept(fileManager.type)) }}"> -