Fix #1401: collage layout selection guard + admin layout picker

- Admin: replaces collage layouts multi-select with a modal layout picker using SVG previews
- Adds client-side guard: allow_selection requires at least two selected layouts
- Adds server-side config validation: auto-disables allow_selection if <2 unique layouts
- Adds EN i18n keys for button label and warning

Change-Id: I1ad6149d048e237bbb2bf3d632b847149c950074

Author: flacoonb

admin/components/_getSettings.php

@@ -36,7 +36,6 @@
         }
 
         $i18ntag = $section . ':' . $key;
-
         echo '<!-- ' . strtoupper($setting['type']) . ' ' . strtoupper($setting['name']) . ' -->';
         echo '<div class="adminSettingCard relative flex flex-col rounded-xl p-3 shadow-xl bg-white ' . $hidden . '" id="' . $i18ntag . '">';
 
@@ -65,6 +64,12 @@
             case 'checkbox':
                 echo AdminInput::renderCheckbox($setting, $i18ntag);
                 break;
+            case 'toggle-button-group':
+                echo AdminInput::renderToggleButtonGroup($setting, $i18ntag);
+                break;
+            case 'toggle-button-group-modal':
+                echo AdminInput::renderToggleButtonGroupModal($setting, $i18ntag);
+                break;
             case 'multi-select':
             case 'select':
                 echo AdminInput::renderSelect($setting, $i18ntag);

lib/configsetup.inc.php

@@ -987,10 +987,12 @@
         ],
         'collage_layouts_enabled' => [
             'view' => 'advanced',
-            'type' => 'multi-select',
+            'type' => 'toggle-button-group-modal',
             'name' => 'collage[layouts_enabled]',
+            'button_label' => 'choose_layouts',
             'placeholder' => $defaultConfig['collage']['layouts_enabled'],
             'options' => CollageLayoutEnum::cases(),
+            'preview_orientation' => $config['collage']['orientation'] ?? 'landscape',
             'value' => $config['collage']['layouts_enabled'],
         ],
         'collage_orientation' => [

resources/lang/en.json

@@ -39,6 +39,7 @@
   "choose_font": "Choose a font",
   "choose_frame": "Choose a frame",
   "choose_image": "Choose an image",
+  "choose_layouts": "Choose layouts",
   "choose_placeholder": "Choose a placeholder",
   "choose_video": "Choose a video",
   "chroma_needs_background": "Please choose a background first!",
@@ -49,6 +50,7 @@
   "click_element": "Click",
   "close": "Close",
   "collage": "Collage",
+  "collage_select_min_two_layouts": "Choose at least two layouts to enable layout selection.",
   "collage:collage_allow_selection": "Allow layout selection",
   "collage:collage_background": "Background",
   "collage:collage_background_color": "Collage background color",

src/Configuration/Section/CollageConfiguration.php

@@ -12,6 +12,25 @@ public static function getNode(): NodeDefinition
     {
         return (new TreeBuilder('collage'))->getRootNode()->addDefaultsIfNotSet()
             ->ignoreExtraKeys()
+            ->validate()
+                ->always(function (array $value): array {
+                    $layouts = $value['layouts_enabled'] ?? [];
+                    $layouts = is_array($layouts) ? $layouts : [];
+
+                    $layoutValues = array_map(
+                        static fn ($l): string => $l instanceof \BackedEnum ? (string) $l->value : (string) $l,
+                        $layouts
+                    );
+
+                    $uniqueCount = count(array_unique($layoutValues));
+
+                    if (($value['allow_selection'] ?? false) && $uniqueCount < 2) {
+                        $value['allow_selection'] = false;
+                    }
+
+                    return $value;
+                })
+                ->end()
             ->children()
                 ->booleanNode('enabled')->defaultValue(true)->end()
                 ->integerNode('cntdwn_time')