Merge pull request #15 from clickpress/feature-gapsizes

Add feature for gap sizes
clickpress · Nov 5, 2024 · efa83ef · efa83ef
2 parents 83fc567 + cee957a
commit efa83ef
Show file tree

Hide file tree

Showing 28 changed files with 503 additions and 195 deletions.
diff --git a/composer.json b/composer.json
@@ -3,12 +3,26 @@
     "type": "contao-bundle",
     "description": "Grid System for Contao based on CSS Grid",
     "license": "LGPL-3.0-or-later",
-    "authors": [
-        {
-            "name": "Stefan Schulz-Lauterbach",
-            "homepage": "https://github.com/stefansl"
-        }
-    ],
+  "authors": [
+    {
+      "name": "Stefan Schulz-Lauterbach",
+      "email": "[email protected]",
+      "homepage": "https://clickpress.de",
+      "role": "Developer"
+    },
+    {
+      "name": "Martin Auswöger",
+      "email": "[email protected]",
+      "homepage": "https://madeyourday.net",
+      "role": "Developer"
+    },
+    {
+      "name": "Jannik Nölke",
+      "email": "[email protected]",
+      "homepage": "https://plakart.net",
+      "role": "Developer"
+    }
+  ],
     "require": {
         "php": "^8.1",
         "contao/core-bundle": "^5.3"

diff --git a/contao/config/config.php b/contao/config/config.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of Contao Clickpress Grid.
  *
@@ -9,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-/**
+/*
  * Taken with friendly permission from RockSolid Columns
  *
  * @author Martin Auswöger <[email protected]>

diff --git a/contao/dca/tl_content.php b/contao/dca/tl_content.php
@@ -1,15 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 /**
- * ClickpressGrid DCA
- * Partly taken with friendly permission from RockSolid Columns
- *
- * @author Martin Auswöger <[email protected]>
- * @author Stefan Schulz-Lauterbach <[email protected]>
+ * ClickpressGrid DCA Partly taken with friendly permission from RockSolid Columns.
  */
-
-
-$GLOBALS['TL_DCA']['tl_content']['palettes']['cp_grid_start'] = '{type_legend},type,headline;{cp_grid_legend},cp_grid_mobile,cp_grid_tablet,cp_grid_desktop,cp_grid_valign,cp_grid_halign;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID;{invisible_legend:hide},invisible,start,stop';
+$GLOBALS['TL_DCA']['tl_content']['palettes']['cp_grid_start'] = '{type_legend},type,headline;{cp_grid_legend},cp_grid_mobile,cp_grid_tablet,cp_grid_desktop,cp_gap_mobile,cp_gap_tablet,cp_gap_desktop,cp_grid_valign,cp_grid_halign;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID;{invisible_legend:hide},invisible,start,stop';
 $GLOBALS['TL_DCA']['tl_content']['palettes']['cp_grid_stop'] = '{type_legend},type;{protected_legend:hide},protected;{expert_legend:hide},guests;{invisible_legend:hide},invisible,start,stop';
 $GLOBALS['TL_DCA']['tl_content']['palettes']['cp_column_start'] = '{type_legend},type,headline;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID;{invisible_legend:hide},invisible,start,stop';
 $GLOBALS['TL_DCA']['tl_content']['palettes']['cp_column_stop'] = '{type_legend},type;{protected_legend:hide},protected;{expert_legend:hide},guests;{invisible_legend:hide},invisible,start,stop';
@@ -47,7 +43,6 @@
     'sql' => "varchar(255) NOT NULL default ''",
 ];
 
-
 $GLOBALS['TL_DCA']['tl_content']['fields']['cp_grid_tablet'] = [
     'label' => &$GLOBALS['TL_LANG']['tl_content']['cp_grid_tablet'],
     'inputType' => 'select',
@@ -77,7 +72,6 @@
     'sql' => "varchar(255) NOT NULL default ''",
 ];
 
-
 $GLOBALS['TL_DCA']['tl_content']['fields']['cp_grid_mobile'] = [
     'label' => &$GLOBALS['TL_LANG']['tl_content']['cp_grid_mobile'],
     'inputType' => 'select',
@@ -104,6 +98,85 @@
     'sql' => "varchar(255) NOT NULL default ''",
 ];
 
+$GLOBALS['TL_DCA']['tl_content']['fields']['cp_gap_mobile'] = [
+    'inputType' => 'select',
+    'reference' => &$GLOBALS['TL_LANG']['tl_content']['cp_gap_options'],
+    'default' => '',
+    'options' => [
+        'gap_0',
+        'gap_1',
+        'gap_2',
+        'gap_3',
+        'gap_4',
+        'gap_5',
+        'gap_6',
+        'gap_7',
+        'gap_8',
+        'gap_9',
+        'gap_10',
+        'gap_11',
+        'gap_12',
+    ],
+    'eval' => [
+        'includeBlankOption' => true,
+        'blankOptionLabel' => '-',
+        'tl_class' => 'w33',
+    ],
+    'sql' => "varchar(255) NOT NULL default ''",
+];
+$GLOBALS['TL_DCA']['tl_content']['fields']['cp_gap_tablet'] = [
+    'inputType' => 'select',
+    'default' => '',
+    'options' => [
+        'gap_0',
+        'gap_1',
+        'gap_2',
+        'gap_3',
+        'gap_4',
+        'gap_5',
+        'gap_6',
+        'gap_7',
+        'gap_8',
+        'gap_9',
+        'gap_10',
+        'gap_11',
+        'gap_12',
+    ],
+    'reference' => &$GLOBALS['TL_LANG']['tl_content']['cp_gap_options'],
+    'eval' => [
+        'includeBlankOption' => true,
+        'blankOptionLabel' => '-',
+        'tl_class' => 'w33',
+    ],
+    'sql' => "varchar(255) NOT NULL default ''",
+];
+$GLOBALS['TL_DCA']['tl_content']['fields']['cp_gap_desktop'] = [
+    'inputType' => 'select',
+    'default' => '',
+    'options' => [
+        'gap_0',
+        'gap_1',
+        'gap_2',
+        'gap_3',
+        'gap_4',
+        'gap_5',
+        'gap_6',
+        'gap_7',
+        'gap_8',
+        'gap_9',
+        'gap_10',
+        'gap_11',
+        'gap_12',
+    ],
+    'reference' => &$GLOBALS['TL_LANG']['tl_content']['cp_gap_options'],
+    'eval' => [
+        'includeBlankOption' => true,
+        'blankOptionLabel' => '-',
+        'tl_class' => 'w33',
+    ],
+    'sql' => "varchar(255) NOT NULL default ''",
+];
+
 $GLOBALS['TL_DCA']['tl_content']['fields']['cp_grid_valign'] = [
     'inputType' => 'select',
     'default' => false,
@@ -112,12 +185,12 @@
         'items-center' => 'center',
         'items-end' => 'bottom',
         'items-stretch' => 'stretch',
-        'items-baseline' => 'baseline'
+        'items-baseline' => 'baseline',
     ],
     'reference' => &$GLOBALS['TL_LANG']['tl_content']['cp_grid_valign_options'],
     'eval' => [
-        'tl_class' => 'w50 m12',
-        'includeBlankOption' => true
+        'tl_class' => 'w50 m12 clr',
+        'includeBlankOption' => true,
     ],
     'sql' => "varchar(255) NOT NULL default ''",
 ];
@@ -126,15 +199,15 @@
     'inputType' => 'select',
     'default' => false,
     'options' => [
-        'justify-items-start'=>'left',
-        'justify-items-center'=>'center',
-        'justify-items-end'=>'right',
-        'justify-items-stretch'=>'stretch',
+        'justify-items-start' => 'left',
+        'justify-items-center' => 'center',
+        'justify-items-end' => 'right',
+        'justify-items-stretch' => 'stretch',
     ],
     'reference' => &$GLOBALS['TL_LANG']['tl_content']['cp_grid_halign_options'],
     'eval' => [
         'tl_class' => 'w50 m12',
-        'includeBlankOption' => true
+        'includeBlankOption' => true,
     ],
     'sql' => "varchar(255) NOT NULL default ''",
 ];
diff --git a/contao/dca/tl_form_field.php b/contao/dca/tl_form_field.php
@@ -1,21 +1,18 @@
 <?php
+
+declare(strict_types=1);
+
 /**
- * ClickpressGrid DCA
- * Partly taken with friendly permission from RockSolid Columns
- *
- * @author Martin Auswöger <[email protected]>
- * @author Stefan Schulz-Lauterbach <[email protected]>
- * @author Jannik Nölke <[email protected]>
+ * ClickpressGrid DCA Partly taken with friendly permission from RockSolid Columns.
  */
-
 $GLOBALS['TL_DCA']['tl_form_field']['palettes']['cp_grid_start'] = '{type_legend},type;{form_cp_grid_legend},form_cp_grid_mobile,form_cp_grid_tablet,form_cp_grid_desktop;{expert_legend:hide},class;{invisible_legend:hide},invisible';
 $GLOBALS['TL_DCA']['tl_form_field']['palettes']['cp_grid_stop'] = '{type_legend},type;{expert_legend:hide},class;{invisible_legend:hide},invisible';
 $GLOBALS['TL_DCA']['tl_form_field']['palettes']['cp_column_start'] = '{type_legend},type,headline;{expert_legend:hide},class;{invisible_legend:hide},invisible';
 $GLOBALS['TL_DCA']['tl_form_field']['palettes']['cp_column_stop'] = '{type_legend},type;{expert_legend:hide},class;{invisible_legend:hide},invisible';
-$GLOBALS['TL_DCA']['tl_form_field']['fields']['form_cp_grid_desktop'] = array(
+$GLOBALS['TL_DCA']['tl_form_field']['fields']['form_cp_grid_desktop'] = [
     'label' => &$GLOBALS['TL_LANG']['tl_form_field']['form_cp_grid_desktop'],
     'inputType' => 'select',
-    'options' => array(
+    'options' => [
         'grid_100',
         'grid_50_50',
         'grid_33_33_33',
@@ -38,19 +35,18 @@
         'grid_20_40_20_20',
         'grid_20_20_40_20',
         'grid_20_20_20_40',
-    ),
+    ],
     'reference' => &$GLOBALS['TL_LANG']['tl_form_field']['form_cp_grid_options'],
-    'eval' => array(
+    'eval' => [
         'tl_class' => 'w33',
-    ),
+    ],
     'sql' => "varchar(255) NOT NULL default ''",
-);
+];
 
-
-$GLOBALS['TL_DCA']['tl_form_field']['fields']['form_cp_grid_tablet'] = array(
+$GLOBALS['TL_DCA']['tl_form_field']['fields']['form_cp_grid_tablet'] = [
     'label' => &$GLOBALS['TL_LANG']['tl_form_field']['form_cp_grid_tablet'],
     'inputType' => 'select',
-    'options' => array(
+    'options' => [
         'grid_100',
         'grid_50_50',
         'grid_33_33_33',
@@ -68,19 +64,18 @@
         'grid_20_40_40',
         'grid_40_20_40',
         'grid_40_40_20',
-    ),
+    ],
     'reference' => &$GLOBALS['TL_LANG']['tl_form_field']['form_cp_grid_options'],
-    'eval' => array(
+    'eval' => [
         'tl_class' => 'w33',
-    ),
+    ],
     'sql' => "varchar(255) NOT NULL default ''",
-);
-
+];
 
-$GLOBALS['TL_DCA']['tl_form_field']['fields']['form_cp_grid_mobile'] = array(
+$GLOBALS['TL_DCA']['tl_form_field']['fields']['form_cp_grid_mobile'] = [
     'label' => &$GLOBALS['TL_LANG']['tl_form_field']['form_cp_grid_mobile'],
     'inputType' => 'select',
-    'options' => array(
+    'options' => [
         'grid_100',
         'grid_50_50',
         'grid_33_33_33',
@@ -95,10 +90,10 @@
         'grid_40_30_30',
         'grid_30_40_30',
         'grid_30_30_40',
-    ),
+    ],
     'reference' => &$GLOBALS['TL_LANG']['tl_form_field']['form_cp_grid_options'],
-    'eval' => array(
+    'eval' => [
         'tl_class' => 'w33',
-    ),
+    ],
     'sql' => "varchar(255) NOT NULL default ''",
-);
+];
diff --git a/contao/dca/tl_layout.php b/contao/dca/tl_layout.php
@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 $GLOBALS['TL_DCA']['tl_layout']['palettes']['default'] .= ';{cp_grid_legend},cp_grid_load_css';
 
-$GLOBALS['TL_DCA']['tl_layout']['fields']['cp_grid_load_css'] = array(
+$GLOBALS['TL_DCA']['tl_layout']['fields']['cp_grid_load_css'] = [
     'inputType' => 'checkbox',
     'label' => &$GLOBALS['TL_LANG']['tl_layout']['cp_grid_load_css'],
     'sql' => "char(1) NOT NULL default '1'",
-);
+];
diff --git a/contao/languages/de/default.php b/contao/languages/de/default.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 $GLOBALS['TL_LANG']['CTE']['cp_grid'] = 'Grid Spaltenset';
 $GLOBALS['TL_LANG']['CTE']['cp_grid_start'][0] = 'Spaltenset Anfang';
 $GLOBALS['TL_LANG']['CTE']['cp_grid_start'][1] = '';

diff --git a/contao/languages/de/tl_content.php b/contao/languages/de/tl_content.php
@@ -1,19 +1,25 @@
 <?php
 
+declare(strict_types=1);
+
 $GLOBALS['TL_LANG']['tl_content']['cp_grid_valign'] = ['Vertikale Ausrichtung', 'Position der Elemente auf der Y-Achse'];
 $GLOBALS['TL_LANG']['tl_content']['cp_grid_halign'] = ['Horizontale Ausrichtung', 'Position der Elemente auf der X-Achse'];
 
 $GLOBALS['TL_LANG']['tl_content']['cp_grid_desktop'] = ['Desktop', 'Spaltenanzahl in der Desktopansicht'];
 $GLOBALS['TL_LANG']['tl_content']['cp_grid_tablet'] = ['Tablet', 'Spaltenanzahl in der Tabletansicht'];
-$GLOBALS['TL_LANG']['tl_content']['cp_grid_mobile'] = ['Mobile', 'Spaltenanzahl in der Mobilansicht'];
+$GLOBALS['TL_LANG']['tl_content']['cp_grid_mobile'] = ['Mobil', 'Spaltenanzahl in der Mobilansicht'];
+
+$GLOBALS['TL_LANG']['tl_content']['cp_gap_desktop'] = ['Spalten-Abstand Desktop', 'Spalten-Abstand in der Desktopansicht in rem (1rem entspricht meistens 16px)'];
+$GLOBALS['TL_LANG']['tl_content']['cp_gap_tablet'] = ['Spalten-Abstand Tablet', 'Spalten-Abstand in der Tabletansicht in rem (1rem entspricht meistens 16px)'];
+$GLOBALS['TL_LANG']['tl_content']['cp_gap_mobile'] = ['Spalten-Abstand Mobil', 'Spalten-Abstand in der Mobilansicht in rem (1rem entspricht meistens 16px)'];
 
 // References
 $GLOBALS['TL_LANG']['tl_content']['cp_grid_valign_options'] = [
     'top' => 'oben',
     'center' => 'zentriert',
     'bottom' => 'unten',
     'stretch' => 'strecken',
-    'baseline' => 'Grundlinie'
+    'baseline' => 'Grundlinie',
 ];
 
 $GLOBALS['TL_LANG']['tl_content']['cp_grid_halign_options'] = [
@@ -48,5 +54,21 @@
     'grid_20_20_20_40' => '4 Spalten - aufgeteilt in 20% 20% 20% 40%',
 ];
 
+$GLOBALS['TL_LANG']['tl_content']['cp_gap_options'] = [
+    'gap_0' => 'kein Abstand',
+    'gap_1' => '1',
+    'gap_2' => '2',
+    'gap_3' => '3',
+    'gap_4' => '4',
+    'gap_5' => '5',
+    'gap_6' => '6',
+    'gap_7' => '7',
+    'gap_8' => '8',
+    'gap_9' => '9',
+    'gap_10' => '10',
+    'gap_11' => '11',
+    'gap_12' => '12',
+];
+
 // Legend
 $GLOBALS['TL_LANG']['tl_content']['cp_grid_legend'] = 'Spalten-Konfiguration';
diff --git a/contao/languages/de/tl_form_field.php b/contao/languages/de/tl_form_field.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 $GLOBALS['TL_LANG']['tl_form_field']['form_cp_grid_desktop'] = ['Desktop', 'Spaltenanzahl in der Desktopansicht'];
 $GLOBALS['TL_LANG']['tl_form_field']['form_cp_grid_tablet'] = ['Tablet', 'Spaltenanzahl in der Tabletansicht'];
 $GLOBALS['TL_LANG']['tl_form_field']['form_cp_grid_mobile'] = ['Mobile', 'Spaltenanzahl in der Mobilansicht'];

diff --git a/contao/languages/de/tl_layout.php b/contao/languages/de/tl_layout.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 // Legends
 $GLOBALS['TL_LANG']['tl_layout']['cp_grid_legend'] = 'Clickpress Grid CSS';
 

diff --git a/contao/languages/en/default.php b/contao/languages/en/default.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 $GLOBALS['TL_LANG']['CTE']['cp_grid'] = 'Grid Columnset';
 $GLOBALS['TL_LANG']['CTE']['cp_grid_start'][0] = 'Gridset start';
 $GLOBALS['TL_LANG']['CTE']['cp_grid_start'][1] = '';