From 2fecf48d743d6e1086a11d260dbe577531d5125f Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Tue, 26 Apr 2016 15:37:02 +0200 Subject: [PATCH] Dev Removed obsolete jquery-ui timepicker --- application/config/third_party.php | 15 --------------- application/core/Survey_Common_Action.php | 2 -- .../widgets/datetimepicker/WhDateTimePicker.php | 2 +- application/helpers/surveytranslator_helper.php | 2 +- application/views/admin/super/header.php | 2 +- .../views/admin/survey/editLocalSettings_view.php | 2 +- .../subview/accordion/_publication_panel.php | 3 ++- .../survey/subview/accordion/_resources_panel.php | 2 +- 8 files changed, 7 insertions(+), 23 deletions(-) diff --git a/application/config/third_party.php b/application/config/third_party.php index 58d7e76099e..2136400d32f 100755 --- a/application/config/third_party.php +++ b/application/config/third_party.php @@ -285,20 +285,5 @@ 'css' => array( 'leaflet.css' ), - ), - - // Bootstrap DateRangePicker - 'bootstrap-daterangepicker' => array( - 'baseUrl' => 'third_party/bootstrap-daterangepicker-2.1.19/', - 'js' => array( - 'moment.js', - 'daterangepicker.js' - ), - 'css' => array( - 'daterangepicker.css' - ), - 'depends' => array( - 'bootstrap' - ) ) ); diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php index 9bbac2b4718..523d51be55b 100644 --- a/application/core/Survey_Common_Action.php +++ b/application/core/Survey_Common_Action.php @@ -40,8 +40,6 @@ public function __construct($controller=null, $id=null) */ public function runWithParams($params) { - App()->getClientScript()->registerPackage('bootstrap-daterangepicker'); - // Default method that would be called if the subaction and run() do not exist $sDefault = 'index'; diff --git a/application/extensions/yiiwheels/widgets/datetimepicker/WhDateTimePicker.php b/application/extensions/yiiwheels/widgets/datetimepicker/WhDateTimePicker.php index ecd4a523d23..a9eaf27e635 100644 --- a/application/extensions/yiiwheels/widgets/datetimepicker/WhDateTimePicker.php +++ b/application/extensions/yiiwheels/widgets/datetimepicker/WhDateTimePicker.php @@ -112,7 +112,7 @@ public function registerClientScript() /* @var $cs CClientScript */ $cs = Yii::app()->getClientScript(); - + $this->getYiiWheels()->registerAssetJs('moment.min.js'); $cs->registerCssFile($assetsUrl . '/css/bootstrap-datetimepicker.min.css'); $cs->registerScriptFile($assetsUrl . '/js/bootstrap-datetimepicker.min.js', CClientScript::POS_END); if (isset($this->pluginOptions['language'])) { diff --git a/application/helpers/surveytranslator_helper.php b/application/helpers/surveytranslator_helper.php index b758efc6998..9f35ab65038 100644 --- a/application/helpers/surveytranslator_helper.php +++ b/application/helpers/surveytranslator_helper.php @@ -960,7 +960,7 @@ function getLanguageDetails($codetosearch) * * @param mixed $sLocale LimeSurvey locale code */ - function translateLStoDateTimePickerLocale($sLocale) + function convertLStoDateTimePickerLocale($sLocale) { // Strip informal string always for easier matching $sLocale=str_replace('-informal','',$sLocale); diff --git a/application/views/admin/super/header.php b/application/views/admin/super/header.php index 58f697efe89..99b1121b41f 100644 --- a/application/views/admin/super/header.php +++ b/application/views/admin/super/header.php @@ -5,7 +5,7 @@ */ ?> - > + > diff --git a/application/views/admin/survey/editLocalSettings_view.php b/application/views/admin/survey/editLocalSettings_view.php index 86ce6acb771..8a7f5d561a5 100644 --- a/application/views/admin/survey/editLocalSettings_view.php +++ b/application/views/admin/survey/editLocalSettings_view.php @@ -9,7 +9,7 @@
-