Merge pull request #186 from menatwork/dev

davidmaack · davidmaack · commit b013029875c6 · 2015-06-03T17:07:31.000+02:00
Merge laste fixes from dev branch to master branch
diff --git a/system/modules/multicolumnwizard/MultiColumnWizard.php b/system/modules/multicolumnwizard/MultiColumnWizard.php
@@ -699,7 +699,7 @@ protected function getMcWDatePickerString($strId, $strKey, $rgxp)
                     break;
             }
 
-            return ' <img src="system/modules/multicolumnwizard/html/img/datepicker.gif" width="20" height="20" alt="" id="toggle_' . $strId . '" style="vertical-align:-6px">
+            return ' <img src="system/modules/multicolumnwizard/html/img/datepicker.gif" width="20" height="20" alt="" id="toggle_' . $strId . '" style="vertical-align:-6px;cursor:pointer;">
                         <script>
                         window.addEvent("domready", function() {
                             new Picker.Date($$("#ctrl_' . $strId . '"), {
diff --git a/system/modules/multicolumnwizard/html/js/multicolumnwizard_be_src.js b/system/modules/multicolumnwizard/html/js/multicolumnwizard_be_src.js
@@ -443,7 +443,6 @@ var MultiColumnWizard = new Class(
     
     reinitStylect: function()
     {
-        var version = parseContaoVersion();
 
         if(window.Stylect)
         {

Original file line number	Diff line number	Diff line change
`@@ -699,7 +699,7 @@ protected function getMcWDatePickerString($strId, $strKey, $rgxp)`
`699`	`699`	`break;`
`700`	`700`	`}`
`701`	`701`
`702`		`- return ' <img src="system/modules/multicolumnwizard/html/img/datepicker.gif" width="20" height="20" alt="" id="toggle_' . $strId . '" style="vertical-align:-6px">`
	`702`	`+ return ' <img src="system/modules/multicolumnwizard/html/img/datepicker.gif" width="20" height="20" alt="" id="toggle_' . $strId . '" style="vertical-align:-6px;cursor:pointer;">`
`703`	`703`	`<script>`
`704`	`704`	`window.addEvent("domready", function() {`
`705`	`705`	`new Picker.Date($$("#ctrl_' . $strId . '"), {`
Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,6 @@ var MultiColumnWizard = new Class(`
`443`	`443`
`444`	`444`	`reinitStylect: function()`
`445`	`445`	`{`
`446`		`- var version = parseContaoVersion();`
`447`	`446`
`448`	`447`	`if(window.Stylect)`
`449`	`448`	`{`