Merge branch '3.0.0'

Conflicts: README.md system/modules/multicolumnwizard/MultiColumnWizard.php
menatwork · Apr 30, 2012 · a96c463 · a96c463
2 parents 6cab8bb + d779d02
commit a96c463
Show file tree

Hide file tree

Showing 12 changed files with 1,246 additions and 430 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,11 @@
+# OS
+.DS_Store
+Thumbs.db
 
-system/modules/multicolumnwizard/html/.DS_Store
+# IDEs 
+.buildpath
+.project
+.settings/
+.build/
+.idea/
+nbproject/
diff --git a/README.md b/README.md
@@ -1,8 +1,9 @@
 Usage with columnFields
 =======================
 
-```php
-<?php 
+<pre><code>
+<?php
+
 $GLOBALS['TL_DCA']['tl_theme']['fields']['templateSelection'] = array
 (
     'label'         => &$GLOBALS['TL_LANG']['tl_theme']['templateSelection'],
@@ -38,14 +39,17 @@ $GLOBALS['TL_DCA']['tl_theme']['fields']['templateSelection'] = array
             )
         )
 );
+
 ?>
-```
+</code></pre>
+
 
 Usage with callback
 ===================
 
-```php
-<?php
+<pre><code>
+<?php 
+
 $GLOBALS['TL_DCA']['tl_table']['fields']['anything'] = array
 (
     'label'         => &$GLOBALS['TL_LANG']['tl_table']['anything'],
@@ -57,8 +61,10 @@ $GLOBALS['TL_DCA']['tl_table']['fields']['anything'] = array
         'columnsCallback'       => array('Class', 'Method')
         )
 );
+
 ?>
-```
+</code></pre>
+
 
 More information
 ================

diff --git a/system/modules/multicolumnwizard/LICENSE.txt b/system/modules/multicolumnwizard/LICENSE.txt
@@ -18,4 +18,4 @@
  * Author       Andreas Schempp <[email protected]>
  * Link		http://www.iserv.ch/
  * License    	GNU/LGPL
- */
+ */