Merge pull request #1 from christianromeni/little-updates

Little updates
christianromeni · Jun 29, 2016 · 79fa6ae · 79fa6ae
2 parents 7654c9a + c5f1b69
commit 79fa6ae
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 27 deletions.
diff --git a/dca/tl_content.php b/dca/tl_content.php
@@ -48,60 +48,76 @@
 $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),
+    '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 ''"
 );
 
 $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),
+    '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 ''"
 );
 $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),
+    '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 ''"
 );
 $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),
+    '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 ''"
 );
 
 $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),
+    '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 ''"
 );
 
 $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),
+    '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 ''"
 );
 $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),
+    '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 ''"
 );
 $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),
+    '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 ''"
 );
 
@@ -111,7 +127,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 +137,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 +146,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 +155,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 +255,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';
         }
     }
-}
+}
diff --git a/languages/de/tl_content.xlf b/languages/de/tl_content.xlf
@@ -91,6 +91,10 @@
         <source>Grid Order &amp; Offset</source>
       </trans-unit>
 
+      <trans-unit id="tl_content.pull.-1">
+        <source>-</source>
+        <target>-</target>
+      </trans-unit>
       <trans-unit id="tl_content.pull_xs.0">
         <source>Pull on mobil</source>
         <target>Pull in Mobil</target>
@@ -124,6 +128,10 @@
         <target>Pullt das Element in dem desktop layout.</target>
       </trans-unit>
 
+      <trans-unit id="tl_content.push.-1">
+        <source>-</source>
+        <target>-</target>
+      </trans-unit>
       <trans-unit id="tl_content.push_xs.0">
         <source>Push on mobil</source>
         <target>Push in Mobil</target>
@@ -157,14 +165,14 @@
         <target>Pushed das Element in dem desktop layout.</target>
       </trans-unit>
 
-      <trans-unit id="tl_content.offset_xs.0">
-        <source>Offset on mobil</source>
-        <target>Offset in Mobil</target>
-      </trans-unit>
       <trans-unit id="tl_content.offset.-1">
         <source>-</source>
         <target>-</target>
       </trans-unit>
+      <trans-unit id="tl_content.offset_xs.0">
+        <source>Offset on mobil</source>
+        <target>Offset in Mobil</target>
+      </trans-unit>
       <trans-unit id="tl_content.offset_xs.1">
         <source>Offsets the Element in the mobil layout</source>
         <target>Offsetted das Element in dem mobil layout</target>
@@ -227,4 +235,4 @@
       </trans-unit>
     </body>
   </file>
-</xliff>
+</xliff>
diff --git a/languages/en/tl_content.xlf b/languages/en/tl_content.xlf
@@ -74,6 +74,9 @@
         <source>Grid Order &amp; Offset</source>
       </trans-unit>
 
+      <trans-unit id="tl_content.pull.-1">
+        <source>-</source>
+      </trans-unit>
       <trans-unit id="tl_content.pull_xs.0">
         <source>Pull on mobil</source>
       </trans-unit>
@@ -99,6 +102,9 @@
         <source>Pulls the Element in the desktop layout.</source>
       </trans-unit>
 
+      <trans-unit id="tl_content.push.-1">
+        <source>-</source>
+      </trans-unit>
       <trans-unit id="tl_content.push_xs.0">
         <source>Push on mobil</source>
       </trans-unit>
@@ -124,6 +130,9 @@
         <source>Pushes the Element in the desktop layout.</source>
       </trans-unit>
 
+      <trans-unit id="tl_content.offset.-1">
+        <source>-</source>
+      </trans-unit>
       <trans-unit id="tl_content.offset.-1">
         <source>-</source>
       </trans-unit>
@@ -177,4 +186,4 @@
       </trans-unit>
     </body>
   </file>
-</xliff>
+</xliff>