Add the option to reset offset/push/pull values (DMAGmbH#20)

qzminski · Mar 15, 2019 · 8daa009 · 8daa009
1 parent f09761c
commit 8daa009
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 7 deletions.
diff --git a/src/dma_simple_grid/classes/DmaSimpleGrid.php b/src/dma_simple_grid/classes/DmaSimpleGrid.php
@@ -78,7 +78,7 @@ public static function hasDmaGridInfos($arrTemplateData)
 
     public static function getColumnClasses($arrTemplateData)
     {
-		
+
 		if ($arrTemplateData['origId'] && $GLOBALS['TL_CONFIG']['dmaSimpleGrid_useOwnSettingsByIncludeElements'])
 		{
 			// includiertes Inhaltselement
@@ -131,7 +131,9 @@ public static function getColumnClasses($arrTemplateData)
             $arrElementSettings = $arrOffsetSettings[0];
             if (is_array($arrElementSettings)) {
                 foreach ($arrElementSettings as $columnKey => $varValue) {
-                    if ($varValue) {
+                    if ($varValue === 'reset' && isset(static::$arrCache['grid']['config']['hasColumnOffsetReset']) && static::$arrCache['grid']['config']['hasColumnOffsetReset']) {
+                        $arrConfiguredClasses[] = sprintf(static::$arrCache['grid']['config']['columns-config'][$columnKey]['offset-class'], 0);
+                    } elseif ($varValue) {
                         $arrConfiguredClasses[] = sprintf(static::$arrCache['grid']['config']['columns-config'][$columnKey]['offset-class'], $varValue);
                     }
                 }
@@ -142,7 +144,9 @@ public static function getColumnClasses($arrTemplateData)
             $arrElementSettings = $arrOffsetRightSettings[0];
             if (is_array($arrElementSettings)) {
                 foreach ($arrElementSettings as $columnKey => $varValue) {
-                    if ($varValue) {
+                    if ($varValue === 'reset' && isset(static::$arrCache['grid']['config']['hasColumnOffsetRightReset']) && static::$arrCache['grid']['config']['hasColumnOffsetRightReset']) {
+                        $arrConfiguredClasses[] = sprintf(static::$arrCache['grid']['config']['columns-config'][$columnKey]['offset-right-class'], 0);
+                    } elseif ($varValue) {
                         $arrConfiguredClasses[] = sprintf(static::$arrCache['grid']['config']['columns-config'][$columnKey]['offset-right-class'], $varValue);
                     }
                 }
@@ -153,7 +157,9 @@ public static function getColumnClasses($arrTemplateData)
             $arrElementSettings = $arrPushSettings[0];
             if (is_array($arrElementSettings)) {
                 foreach ($arrElementSettings as $columnKey => $varValue) {
-                    if ($varValue) {
+                    if ($varValue === 'reset' && isset(static::$arrCache['grid']['config']['hasColumnPushReset']) && static::$arrCache['grid']['config']['hasColumnPushReset']) {
+                        $arrConfiguredClasses[] = sprintf(static::$arrCache['grid']['config']['columns-config'][$columnKey]['push-class'], 0);
+                    } elseif ($varValue) {
                         $arrConfiguredClasses[] = sprintf(static::$arrCache['grid']['config']['columns-config'][$columnKey]['push-class'], $varValue);
                     }
                 }
@@ -164,7 +170,9 @@ public static function getColumnClasses($arrTemplateData)
             $arrElementSettings = $arrPullSettings[0];
             if (is_array($arrElementSettings)) {
                 foreach ($arrElementSettings as $columnKey => $varValue) {
-                    if ($varValue) {
+                    if ($varValue === 'reset' && isset(static::$arrCache['grid']['config']['hasColumnPullReset']) && static::$arrCache['grid']['config']['hasColumnPullReset']) {
+                        $arrConfiguredClasses[] = sprintf(static::$arrCache['grid']['config']['columns-config'][$columnKey]['pull-class'], 0);
+                    } elseif ($varValue) {
                         $arrConfiguredClasses[] = sprintf(static::$arrCache['grid']['config']['columns-config'][$columnKey]['pull-class'], $varValue);
                     }
                 }
@@ -273,6 +281,16 @@ public static function columnsSelectCallback(\Widget $widget = null)
                     $options['hide'] = &$GLOBALS['TL_LANG']['MSC']['dma_simplegrid_hidden'];
                 }
 
+                // Add the reset/zero option for offset/offset-right/push/pull settings
+                if ($widget !== null && (
+                    ($widget->dataContainer->field === 'dma_simplegrid_offsetsettings' && isset(static::$arrCache['grid']['config']['hasColumnOffsetReset']) && static::$arrCache['grid']['config']['hasColumnOffsetReset'])
+                    || ($widget->dataContainer->field === 'dma_simplegrid_offsetrightsettings' && isset(static::$arrCache['grid']['config']['hasColumnOffsetRightReset']) && static::$arrCache['grid']['config']['hasColumnOffsetRightReset'])
+                    || ($widget->dataContainer->field === 'dma_simplegrid_pushsettings' && isset(static::$arrCache['grid']['config']['hasColumnPushReset']) && static::$arrCache['grid']['config']['hasColumnPushReset'])
+                    || ($widget->dataContainer->field === 'dma_simplegrid_pullsettings' && isset(static::$arrCache['grid']['config']['hasColumnPullReset']) && static::$arrCache['grid']['config']['hasColumnPullReset'])
+                )) {
+                    $options['reset'] = '0 (reset)';
+                }
+
                 // Add the column sizes
                 foreach (static::$arrCache['grid']['config']['columns-sizes'] as $column) {
                     $options[$column] = $column;

diff --git a/src/dma_simple_grid/config/config.php b/src/dma_simple_grid/config/config.php
@@ -99,9 +99,12 @@
         'hasRows' => true,
         'hasColumns' => true,
         'hasColumnOffset' => true,
+        'hasColumnOffsetReset' => true,
         'hasColumnOffsetRight' => false,
         'hasColumnPush' => true,
+        'hasColumnPushReset' => true,
         'hasColumnPull' => true,
+        'hasColumnPullReset' => true,
         'hasRowClasses' => false,
         'hasColumnClasses' => false,
         'row-class' => 'row',
@@ -158,9 +161,12 @@
         'hasRows' => true,
         'hasColumns' => true,
         'hasColumnOffset' => true,
+        'hasColumnOffsetReset' => true,
         'hasColumnOffsetRight' => false,
         'hasColumnPush' => true,
+        'hasColumnPushReset' => true,
         'hasColumnPull' => true,
+        'hasColumnPullReset' => true,
         'hasWrapperClasses' => true,
         'hasRowClasses' => false,
         'hasColumnClasses' => false,
@@ -230,9 +236,12 @@
         'hasRows' => true,
         'hasColumns' => true,
         'hasColumnOffset' => true,
+        'hasColumnOffsetReset' => true,
         'hasColumnOffsetRight' => false,
         'hasColumnPush' => true,
+        'hasColumnPushReset' => true,
         'hasColumnPull' => true,
+        'hasColumnPullReset' => true,
         'hasRowClasses' => false,
         'hasColumnClasses' => false,
         'row-class' => 'row',
@@ -374,8 +383,8 @@
         'hasColumns' => true,
         'hasColumnClasses' => true,
         'hasColumnOffset' => true,
-        'hasColumnPush' => true,        
-		'hasBlockGrid' => true,        
+        'hasColumnPush' => true,
+		'hasBlockGrid' => true,
         'column-class' => 'cell',
         'block-sizes' => array('1','2','3','4','5','6','7','8'),
         'columns-sizes' => array('1','2','3','4','5','6','7','8','9','10','11','12'),