From 7bf700c29d096fd6dabcc40e30fba1f3b0b7f870 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Wed, 16 Jun 2021 18:41:05 +0200 Subject: [PATCH] backports murph-skeleton --- assets/css/admin.scss | 4 + .../components/file-manager/FileManager.vue | 9 +- .../admin/components/file-manager/Files.vue | 30 ++- assets/js/admin/modules/editor.js | 53 +++- assets/js/admin/modules/file-manager.js | 1 - assets/js/admin/modules/modal.js | 46 ++-- core/Controller/Admin/AdminController.php | 16 +- core/Controller/Admin/Crud/CrudController.php | 10 +- .../FileManagerAdminController.php | 79 ++++-- core/Controller/Site/NodeAdminController.php | 8 +- core/Controller/Site/PageAdminController.php | 16 +- core/Controller/Site/PageController.php | 2 +- core/Controller/Site/TreeAdminController.php | 3 +- core/Controller/Task/TaskAdminController.php | 4 +- core/Entity/FileInformation.php | 48 ++++ core/Entity/Site/Page/CollectionBlock.php | 1 - core/Entity/Site/Page/Page.php | 2 +- core/Factory/FileInformationFactory.php | 16 ++ core/Factory/NavigationSettingFactory.php | 3 +- core/FileManager/FsFileManager.php | 54 +++- core/Form/FileManager/DirectoryCreateType.php | 7 +- core/Form/FileManager/DirectoryRenameType.php | 7 +- .../FileInformationAttributeType.php | 49 ++++ core/Form/FileManager/FileInformationType.php | 34 +++ core/Form/FileManager/FileUploadType.php | 4 +- .../Site/NavigationAdditionalDomainType.php | 4 +- core/Form/Site/NavigationType.php | 5 +- core/Form/Site/NodeType.php | 4 +- core/Form/Site/Page/CollectionBlockType.php | 8 +- core/Maker/MakeRepositoryQuery.php | 4 +- core/Repository/FileInformationRepository.php | 21 ++ .../FileInformationRepositoryQuery.php | 14 + core/Resources/translations/messages.fr.yaml | 2 + .../views/file_manager/info.html.twig | 255 +++++++++++++----- .../views/site/node_admin/_form.html.twig | 2 +- .../Extension/FileInformationExtension.php | 85 ++++++ .../{BlockExtension.php => UrlExtension.php} | 4 +- 37 files changed, 726 insertions(+), 188 deletions(-) create mode 100644 core/Entity/FileInformation.php create mode 100644 core/Factory/FileInformationFactory.php create mode 100644 core/Form/FileManager/FileInformationAttributeType.php create mode 100644 core/Form/FileManager/FileInformationType.php create mode 100644 core/Repository/FileInformationRepository.php create mode 100644 core/Repository/FileInformationRepositoryQuery.php create mode 100644 core/Twig/Extension/FileInformationExtension.php rename core/Twig/Extension/{BlockExtension.php => UrlExtension.php} (93%) diff --git a/assets/css/admin.scss b/assets/css/admin.scss index 88a5546..cb980d3 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -501,6 +501,10 @@ form { } } +.modal { + z-index: 3000; +} + .modal-dialog-large { max-width: 80%; } diff --git a/assets/js/admin/components/file-manager/FileManager.vue b/assets/js/admin/components/file-manager/FileManager.vue index 6c59160..b159d5b 100644 --- a/assets/js/admin/components/file-manager/FileManager.vue +++ b/assets/js/admin/components/file-manager/FileManager.vue @@ -2,7 +2,7 @@
- +
@@ -16,6 +16,13 @@ import Files from './Files' export default { name: 'FileManager', + props: { + context: { + type: String, + required: true, + default: 'crud', + } + }, components: { Files } diff --git a/assets/js/admin/components/file-manager/Files.vue b/assets/js/admin/components/file-manager/Files.vue index 5c3e0d7..bf043bd 100644 --- a/assets/js/admin/components/file-manager/Files.vue +++ b/assets/js/admin/components/file-manager/Files.vue @@ -1,9 +1,6 @@