From 47962f06824f153bbb415ed85b4dcde8f8043eab Mon Sep 17 00:00:00 2001 From: Christian Romeni Date: Wed, 29 Jun 2016 17:21:18 +0200 Subject: [PATCH 1/4] Update tl_content.php fixed select in content dca (including 0 and -) --- dca/tl_content.php | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dca/tl_content.php b/dca/tl_content.php index 4897fd4..400f36a 100644 --- a/dca/tl_content.php +++ b/dca/tl_content.php @@ -48,60 +48,60 @@ $GLOBALS['TL_DCA']['tl_content']['fields']['pull_xs'] = array ( 'label' => &$GLOBALS['TL_LANG']['tl_content']['pull_xs'], 'inputType' => 'select', - 'options' => range(1, 12), - 'eval' => array('includeBlankOption'=>true, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), + 'options' => range(-1, 12), + 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default ''" ); $GLOBALS['TL_DCA']['tl_content']['fields']['pull_sm'] = array ( 'label' => &$GLOBALS['TL_LANG']['tl_content']['pull_sm'], 'inputType' => 'select', - 'options' => range(1, 12), - 'eval' => array('includeBlankOption'=>true, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), + 'options' => range(-1, 12), + 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default ''" ); $GLOBALS['TL_DCA']['tl_content']['fields']['pull_md'] = array ( 'label' => &$GLOBALS['TL_LANG']['tl_content']['pull_md'], 'inputType' => 'select', - 'options' => range(1, 12), - 'eval' => array('includeBlankOption'=>true, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), + 'options' => range(-1, 12), + 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default ''" ); $GLOBALS['TL_DCA']['tl_content']['fields']['pull_lg'] = array ( 'label' => &$GLOBALS['TL_LANG']['tl_content']['pull_lg'], 'inputType' => 'select', - 'options' => range(1, 12), - 'eval' => array('includeBlankOption'=>true, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), + 'options' => range(-1, 12), + 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default ''" ); $GLOBALS['TL_DCA']['tl_content']['fields']['push_xs'] = array ( 'label' => &$GLOBALS['TL_LANG']['tl_content']['push_xs'], 'inputType' => 'select', - 'options' => range(1, 12), - 'eval' => array('includeBlankOption'=>true, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), + 'options' => range(-1, 12), + 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default ''" ); $GLOBALS['TL_DCA']['tl_content']['fields']['push_sm'] = array ( 'label' => &$GLOBALS['TL_LANG']['tl_content']['push_sm'], 'inputType' => 'select', - 'options' => range(1, 12), - 'eval' => array('includeBlankOption'=>true, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), + 'options' => range(-1, 12), + 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default ''" ); $GLOBALS['TL_DCA']['tl_content']['fields']['push_md'] = array ( 'label' => &$GLOBALS['TL_LANG']['tl_content']['push_md'], 'inputType' => 'select', - 'options' => range(1, 12), - 'eval' => array('includeBlankOption'=>true, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), + 'options' => range(-1, 12), + 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default ''" ); $GLOBALS['TL_DCA']['tl_content']['fields']['push_lg'] = array ( 'label' => &$GLOBALS['TL_LANG']['tl_content']['push_lg'], 'inputType' => 'select', - 'options' => range(1, 12), - 'eval' => array('includeBlankOption'=>true, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), + 'options' => range(-1, 12), + 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default ''" ); @@ -111,7 +111,7 @@ 'options' => range(-1, 12), 'reference' => &$GLOBALS['TL_LANG']['tl_content']['offset'], 'default' => -1, - 'eval' => array('includeBlankOption'=>true, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), + 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default '-1'" ); @@ -121,7 +121,7 @@ 'options' => range(-1, 12), 'reference' => &$GLOBALS['TL_LANG']['tl_content']['offset'], 'default' => -1, - 'eval' => array('includeBlankOption'=>true, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), + 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default '-1'" ); $GLOBALS['TL_DCA']['tl_content']['fields']['offset_md'] = array ( @@ -130,7 +130,7 @@ 'options' => range(-1, 12), 'reference' => &$GLOBALS['TL_LANG']['tl_content']['offset'], 'default' => -1, - 'eval' => array('includeBlankOption'=>true, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), + 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default '-1'" ); $GLOBALS['TL_DCA']['tl_content']['fields']['offset_lg'] = array ( @@ -139,7 +139,7 @@ 'options' => range(-1, 12), 'reference' => &$GLOBALS['TL_LANG']['tl_content']['offset'], 'default' => -1, - 'eval' => array('includeBlankOption'=>true, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), + 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default '-1'" ); @@ -239,4 +239,4 @@ public function appendGridComponents(DataContainer $dc = null) $GLOBALS['TL_DCA']['tl_content']['palettes'][$key] = $value . ';{grid_legend:hide},grid_xs,grid_sm,grid_md,grid_lg,grid_visible,grid_hidden,col_no_padding,col_centered,col_newline;{grid_order_legend:hide},pull_xs,pull_sm,pull_md,pull_lg,push_xs,push_sm,push_md,push_lg,offset_xs,offset_sm,offset_md,offset_lg'; } } -} \ No newline at end of file +} From 545fe8c0dceadcbc5b50dc33934de8e9e4d4f625 Mon Sep 17 00:00:00 2001 From: Christian Romeni Date: Wed, 29 Jun 2016 17:26:15 +0200 Subject: [PATCH 2/4] Update tl_content.xlf added the translation for -1 --- languages/de/tl_content.xlf | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/languages/de/tl_content.xlf b/languages/de/tl_content.xlf index 5f6dc40..669cd2f 100644 --- a/languages/de/tl_content.xlf +++ b/languages/de/tl_content.xlf @@ -91,6 +91,10 @@ Grid Order & Offset + + - + - + Pull on mobil Pull in Mobil @@ -124,6 +128,10 @@ Pullt das Element in dem desktop layout. + + - + - + Push on mobil Push in Mobil @@ -157,14 +165,14 @@ Pushed das Element in dem desktop layout. - - Offset on mobil - Offset in Mobil - - - + + Offset on mobil + Offset in Mobil + Offsets the Element in the mobil layout Offsetted das Element in dem mobil layout @@ -227,4 +235,4 @@ - \ No newline at end of file + From 7469e172924eb706405a7a56605968b02160439b Mon Sep 17 00:00:00 2001 From: Christian Romeni Date: Wed, 29 Jun 2016 17:26:40 +0200 Subject: [PATCH 3/4] Update tl_content.php added translations --- dca/tl_content.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dca/tl_content.php b/dca/tl_content.php index 400f36a..6e8faf5 100644 --- a/dca/tl_content.php +++ b/dca/tl_content.php @@ -49,6 +49,8 @@ 'label' => &$GLOBALS['TL_LANG']['tl_content']['pull_xs'], 'inputType' => 'select', 'options' => range(-1, 12), + 'reference' => &$GLOBALS['TL_LANG']['tl_content']['pull'], + 'default' => -1, 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default ''" ); @@ -57,6 +59,8 @@ 'label' => &$GLOBALS['TL_LANG']['tl_content']['pull_sm'], 'inputType' => 'select', 'options' => range(-1, 12), + 'reference' => &$GLOBALS['TL_LANG']['tl_content']['pull'], + 'default' => -1, 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default ''" ); @@ -64,6 +68,8 @@ 'label' => &$GLOBALS['TL_LANG']['tl_content']['pull_md'], 'inputType' => 'select', 'options' => range(-1, 12), + 'reference' => &$GLOBALS['TL_LANG']['tl_content']['pull'], + 'default' => -1, 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default ''" ); @@ -71,6 +77,8 @@ 'label' => &$GLOBALS['TL_LANG']['tl_content']['pull_lg'], 'inputType' => 'select', 'options' => range(-1, 12), + 'reference' => &$GLOBALS['TL_LANG']['tl_content']['pull'], + 'default' => -1, 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default ''" ); @@ -79,6 +87,8 @@ 'label' => &$GLOBALS['TL_LANG']['tl_content']['push_xs'], 'inputType' => 'select', 'options' => range(-1, 12), + 'reference' => &$GLOBALS['TL_LANG']['tl_content']['push'], + 'default' => -1, 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default ''" ); @@ -87,6 +97,8 @@ 'label' => &$GLOBALS['TL_LANG']['tl_content']['push_sm'], 'inputType' => 'select', 'options' => range(-1, 12), + 'reference' => &$GLOBALS['TL_LANG']['tl_content']['push'], + 'default' => -1, 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default ''" ); @@ -94,6 +106,8 @@ 'label' => &$GLOBALS['TL_LANG']['tl_content']['push_md'], 'inputType' => 'select', 'options' => range(-1, 12), + 'reference' => &$GLOBALS['TL_LANG']['tl_content']['push'], + 'default' => -1, 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default ''" ); @@ -101,6 +115,8 @@ 'label' => &$GLOBALS['TL_LANG']['tl_content']['push_lg'], 'inputType' => 'select', 'options' => range(-1, 12), + 'reference' => &$GLOBALS['TL_LANG']['tl_content']['push'], + 'default' => -1, 'eval' => array('includeBlankOption'=>false, 'mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w25'), 'sql' => "varchar(2) NOT NULL default ''" ); From c5f1b6936f0142e51c66352ce220dabd7e18571d Mon Sep 17 00:00:00 2001 From: Christian Romeni Date: Wed, 29 Jun 2016 17:27:54 +0200 Subject: [PATCH 4/4] Update tl_content.xlf --- languages/en/tl_content.xlf | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/languages/en/tl_content.xlf b/languages/en/tl_content.xlf index 85973d1..f49a2c2 100644 --- a/languages/en/tl_content.xlf +++ b/languages/en/tl_content.xlf @@ -74,6 +74,9 @@ Grid Order & Offset + + - + Pull on mobil @@ -99,6 +102,9 @@ Pulls the Element in the desktop layout. + + - + Push on mobil @@ -124,6 +130,9 @@ Pushes the Element in the desktop layout. + + - + - @@ -177,4 +186,4 @@ - \ No newline at end of file +