Dev Removed obsolete jquery-ui timepicker

LimeSurvey · Apr 26, 2016 · 2fecf48 · 2fecf48
1 parent 3d260e5
commit 2fecf48
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 23 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -5,7 +5,7 @@
  */
 ?>
 <!DOCTYPE html>
-<html lang="<?php echo $adminlang; ?>"<?php echo $languageRTL;?> >
+<html lang="<?php echo str_replace('-informal','',$adminlang); ?>"<?php echo $languageRTL;?> >
 <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />

diff --git a/application/views/admin/survey/editLocalSettings_view.php b/application/views/admin/survey/editLocalSettings_view.php
@@ -9,7 +9,7 @@
 
     <!-- Survey title -->
     <div class="form-group">
-        <label class="col-sm-2 question-group-title control-label" for="short_title<?php echo $esrow['surveyls_language']; ?>">
+        <label class="col-sm-2 question-group-title control-label" for="short_title_<?php echo $esrow['surveyls_language']; ?>">
             <?php eT("Survey title:"); ?>
         </label>
         <div class="col-sm-9">

diff --git a/application/views/admin/survey/subview/accordion/_publication_panel.php b/application/views/admin/survey/subview/accordion/_publication_panel.php
@@ -42,7 +42,8 @@
                         'drops' => 'up',  // TODO: Does not work. Why?
                         'timePicker' => true,
                         'timePicker12Hour' => false,  // NB: timePicker24Hour = true does not work
-                        'timePickerIncrement' => 1
+                        'timePickerIncrement' => 1,
+                        'language'=>convertLStoDateTimePickerLocale(Yii::app()->session['adminlang'])
                     )
                 ));
             ?>

diff --git a/application/views/admin/survey/subview/accordion/_resources_panel.php b/application/views/admin/survey/subview/accordion/_resources_panel.php
@@ -12,7 +12,7 @@
         <li>
             <label>&nbsp;</label>
             <?php echo CHtml::dropDownList('type', 'files', array('files' =>  gT('Files','unescaped'), 'flash' =>  gT('Flash','unescaped'), 'images' =>  gT('Images','unescaped')), array('class'=>'btn btn-default')); ?>
-            <a class="btn btn-default" href="<?php echo Yii::app()->getConfig('publicurl') ; ?>third_party/kcfinder/browse.php?language='<?php echo sTranslateLangCode2CK( App()->language); ?>'" type='btn btn-default btn-lg'  target='_blank'>
+            <a class="btn btn-default" href="<?php echo Yii::app()->getConfig('publicurl') ; ?>third_party/kcfinder/browse.php?language='<?php echo sTranslateLangCode2CK( App()->language); ?>'" target='_blank'>
                 <?php  eT("Browse uploaded resources") ?>
             </a>
         </li>