From b48f10481eca644c7a7b48946cc5db0ac731808e Mon Sep 17 00:00:00 2001 From: lukasNo1 Date: Tue, 6 Aug 2024 10:26:55 +0200 Subject: [PATCH] Fix styling and toggle all in element slideout container --- CHANGELOG.md | 6 ++++++ composer.json | 2 +- src/assetbundles/sitecopy/dist/css/sitecopy.css | 16 ++++++++++++---- src/assetbundles/sitecopy/dist/js/sitecopy.js | 11 +++++++---- src/templates/_cp/bulkCopyOverlay.twig | 4 ++-- src/templates/_cp/elementsEdit.twig | 4 ++-- 6 files changed, 30 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cda102..91eb5e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 2.1.1 - 2024-08-06 + +### Fixed + +- Fixed the toggle all checkbox and the styling in the element slideout container + ## 2.1.0 - 2024-06-10 ### Added diff --git a/composer.json b/composer.json index 97f4687..bd5d317 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "goldinteractive/craft-sitecopy", "description": "", - "version": "2.1.0", + "version": "2.1.1", "license": "proprietary", "type": "craft-plugin", "minimum-stability": "dev", diff --git a/src/assetbundles/sitecopy/dist/css/sitecopy.css b/src/assetbundles/sitecopy/dist/css/sitecopy.css index 2d03e22..ede6989 100755 --- a/src/assetbundles/sitecopy/dist/css/sitecopy.css +++ b/src/assetbundles/sitecopy/dist/css/sitecopy.css @@ -1,15 +1,23 @@ /* globals */ -.content-pane #sitecopy { +.content-pane .sitecopy { margin-top: 50px; } /* elements */ -.details #sitecopy-options { +.details .sitecopy-options { padding-bottom: 1px; } -.details #sitecopy-options .field { +.details .sitecopy-options .field { margin: 24px 0; -} \ No newline at end of file +} + +.slideout-container .sitecopy-options { + padding-bottom: 1px; +} + +.slideout-container .sitecopy-options .field { + margin: 24px 0; +} diff --git a/src/assetbundles/sitecopy/dist/js/sitecopy.js b/src/assetbundles/sitecopy/dist/js/sitecopy.js index 64141f5..dbe3801 100644 --- a/src/assetbundles/sitecopy/dist/js/sitecopy.js +++ b/src/assetbundles/sitecopy/dist/js/sitecopy.js @@ -1,5 +1,6 @@ function toggleSitecopyTargets(source) { - const checkboxes = document.getElementsByName('sitecopy[targets][]'); + const sitecopyDiv = source.closest('.sitecopy'); + const checkboxes = sitecopyDiv.querySelectorAll('.sitecopy-options input[type="checkbox"]'); const isChecked = source.checked; for (let i = 1, n = checkboxes.length; i < n; i++) { @@ -7,11 +8,13 @@ function toggleSitecopyTargets(source) { } } -function updateSitecopyToggleAll() { - const toggleAll = document.getElementById('sitecopy-toggle-all'); +function updateSitecopyToggleAll(source) { + const sitecopyDiv = source.closest('.sitecopy'); + const toggleAll = sitecopyDiv.querySelector('[id$="sitecopy-toggle-all"]'); + if (toggleAll) { - const checkboxes = document.getElementsByName('sitecopy[targets][]'); + const checkboxes = sitecopyDiv.querySelectorAll('.sitecopy-options input[type="checkbox"]'); toggleAll.checked = Array.from(checkboxes).every((checkbox) => checkbox.checked); } } diff --git a/src/templates/_cp/bulkCopyOverlay.twig b/src/templates/_cp/bulkCopyOverlay.twig index 2d78346..2c7c635 100644 --- a/src/templates/_cp/bulkCopyOverlay.twig +++ b/src/templates/_cp/bulkCopyOverlay.twig @@ -9,8 +9,8 @@
{% if siteCopyTargetOptions is not empty %} -
-
+
+
{{ forms.checkboxGroupField({ label: elementCount > 1 ? "To which site should the elements be copied?"|t('site-copy-x') : "To which site should it be copied?"|t('site-copy-x'), id: 'siteCopy-targets', diff --git a/src/templates/_cp/elementsEdit.twig b/src/templates/_cp/elementsEdit.twig index ec095d0..d902e33 100755 --- a/src/templates/_cp/elementsEdit.twig +++ b/src/templates/_cp/elementsEdit.twig @@ -5,7 +5,7 @@ {% set siteCopyTargetOptions = craft.sitecopy.getSiteInputOptions(supportedSites, [siteId]) %} {% if siteCopyTargetOptions is not empty %} -
+
{{ forms.lightswitchField({ label: 'Copy to site'|t('site-copy-x'), id: 'siteCopy-toggle', @@ -14,7 +14,7 @@ toggle: '#sitecopy-options', }) }} -
+
{{ forms.checkboxGroupField({ label: "To which site should it be copied?"|t('site-copy-x'), id: 'siteCopy-targets',