Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey

LimeSurvey · Apr 27, 2016 · efde12f · efde12f
2 parents 422b173 + 19c4211
commit efde12f
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 0 deletions.
diff --git a/application/controllers/admin/dataentry.php b/application/controllers/admin/dataentry.php
@@ -738,6 +738,8 @@ public function editdata($subaction, $id, $surveyid, $language='')
                                     'value' => $thisdate,
                                     'pluginOptions' => array(
                                         'format' => $dateformatdetails['jsdate'] . " HH:mm",
+                                        'allowInputToggle' =>true,
+                                        'showClear' => true,
                                         'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                                     )
                                 ));

diff --git a/application/views/admin/dataentry/content_view.php b/application/views/admin/dataentry/content_view.php
@@ -60,6 +60,8 @@
                         'name' => $fieldname,
                         'pluginOptions' => array(
                             'format' => $dateformatdetails['jsdate'] . " HH:mm",
+                            'allowInputToggle' =>true,
+                            'showClear' => true,
                             'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                         )
                     )); ?>

diff --git a/application/views/admin/export/statistics_subviews/_submissiondate.php b/application/views/admin/export/statistics_subviews/_submissiondate.php
@@ -14,6 +14,8 @@
                             'value' => isset($_POST['datestampE']) ? $_POST['datestampE'] : '',
                             'pluginOptions' => array(
                                 'format' => ($dateformatdetails['jsdate']),
+                                'allowInputToggle' =>true,
+                                'showClear' => true,
                                 'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                             )
                         ));
@@ -30,6 +32,8 @@
                             'value' => isset($_POST['datestampG']) ? $_POST['datestampG'] : '',
                             'pluginOptions' => array(
                                 'format' => $dateformatdetails['jsdate'] . " HH:mm",
+                                'allowInputToggle' =>true,
+                                'showClear' => true,
                                 'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                             )
                         ));
@@ -46,6 +50,8 @@
                             'value' => isset($_POST['datestampL']) ? $_POST['datestampL'] : '',
                             'pluginOptions' => array(
                                 'format' => $dateformatdetails['jsdate'] . " HH:mm",
+                                'allowInputToggle' =>true,
+                                'showClear' => true,
                                 'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                             )
                         ));

diff --git a/application/views/admin/survey/subview/accordion/_publication_panel.php b/application/views/admin/survey/subview/accordion/_publication_panel.php
@@ -38,6 +38,8 @@
                     'value' => $startdate,
                     'pluginOptions' => array(
                         'format' => $dateformatdetails['jsdate'] . " HH:mm",
+                        'allowInputToggle' =>true,
+                        'showClear' => true,
                         'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                     )
                 ));
@@ -56,6 +58,8 @@
                     'value' => $expires,
                     'pluginOptions' => array(
                         'format' => $dateformatdetails['jsdate'] . " HH:mm",
+                        'allowInputToggle' =>true,
+                        'showClear' => true,
                         'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                     )
                 ));

diff --git a/application/views/admin/token/dummytokenform.php b/application/views/admin/token/dummytokenform.php
@@ -85,6 +85,8 @@
                                 'value' => isset($validfrom) ? $validfrom : '',
                                 'pluginOptions' => array(
                                     'format' => $dateformatdetails['jsdate'] . " HH:mm",
+                                    'allowInputToggle' =>true,
+                                    'showClear' => true,
                                     'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                                 )
                             ));
@@ -100,6 +102,8 @@
                                 'value' => isset($validuntil) ? $validuntil : '',
                                 'pluginOptions' => array(
                                     'format' => $dateformatdetails['jsdate'] . " HH:mm",
+                                    'allowInputToggle' =>true,
+                                    'showClear' => true,
                                     'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                                 )
                             ));

diff --git a/application/views/admin/token/tokenform.php b/application/views/admin/token/tokenform.php
@@ -143,6 +143,8 @@
                         'value' => isset($validfrom) ? $validfrom : '',
                         'pluginOptions' => array(
                             'format' => $dateformatdetails['jsdate'] . " HH:mm",
+                            'allowInputToggle' =>true,
+                            'showClear' => true,
                             'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                         )
                     ));
@@ -158,6 +160,8 @@
                         'value' => isset($validuntil) ? $validuntil : '',
                         'pluginOptions' => array(
                             'format' => $dateformatdetails['jsdate'] . " HH:mm",
+                            'allowInputToggle' =>true,
+                            'showClear' => true,
                             'locale' => convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                         )
                     ));

diff --git a/application/views/survey/questions/date/selector/answer.php b/application/views/survey/questions/date/selector/answer.php
@@ -49,6 +49,8 @@ class='form-control'
                 'pluginOptions' => array(
                     'class' => 'test',
                     'format' => $dateformatdetailsjs,
+                    'allowInputToggle' =>true,
+                    'showClear' => true,
                     'locale' => convertLStoDateTimePickerLocale($language)
                     /*
                     Min/max Date implementation missing?