Merge branch '2.05' of https://github.com/LimeSurvey/LimeSurvey.git i…

…nto 2.05
LimeSurvey · Jun 5, 2013 · 2daf588 · 2daf588
2 parents 0c226cd + a87c89e
commit 2daf588
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 20 deletions.
diff --git a/application/config/third_party.php b/application/config/third_party.php
@@ -87,10 +87,10 @@
     'qTip2' => array(
         'baseUrl' => 'third_party/qTip2',
         'js' => array(
-            'dist/jquery.qtip.js'
+            'dist/jquery.qtip.min.js'
         ),
         'css' => array(
-            'dist/jquery.qtip.css'
+            'dist/jquery.qtip.min.css'
         ),
         'depends' => array(
             'jquery'

diff --git a/application/controllers/admin/labels.php b/application/controllers/admin/labels.php
@@ -235,8 +235,8 @@ public function view($lid = 0)
         $aData = array();
 
         // Includes some javascript files
-        App()->getClientScript->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'labels.js');
-        App()->getClientScript->registerPackage('jquery-json');
+        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'labels.js');
+        App()->getClientScript()->registerPackage('jquery-json');
         // Checks if user have the sufficient rights to manage the labels
         if (Permission::model()->hasGlobalPermission('labelsets','read'))
         {

diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -46,6 +46,7 @@ public function __construct($controller, $id)
     */
     public function index()
     {
+        App()->getClientScript()->registerPackage('jqgrid');
         App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . "listsurvey.js");
         if (count(getSurveyList(true)) == 0)
         {

diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -271,11 +271,9 @@ function browse($iSurveyId, $limit = 50, $start = 0, $order = false, $searchstri
             self::_newtokentable($iSurveyId);
         }
         // Javascript
+        App()->getClientScript()->registerPackage('jqgrid');
         App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . "tokens.js");
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . "jquery/jquery.multiselect.min.js");
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . "jquery/jquery-ui-timepicker-addon.js");
         // CSS
-        App()->getClientScript()->registerCssFile(Yii::app()->getConfig('generalscripts') . "jquery/jqGrid/css/jquery.ui.datepicker.css");
         App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "displayParticipants.css");
         App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "jquery-ui/jquery-timepicker.css");
 

diff --git a/application/views/admin/super/header.php b/application/views/admin/super/header.php
@@ -5,10 +5,7 @@
         App()->getClientScript()->registerPackage('jqueryui');
         App()->getClientScript()->registerPackage('jquery-cookie');
         App()->getClientScript()->registerPackage('jquery-superfish');
-        App()->getClientScript()->registerPackage('jqgrid');
         App()->getClientScript()->registerPackage('qTip2');
-        //App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('third_party') . 'jquery-qtip/jquery.qtip-1.0.0-rc3.min.js');
-        //App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . "admin_core.js");
         App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "jquery-ui/jquery-ui.css" );
         App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "superfish.css" );
         App()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . 'jquery.multiselect.css');
@@ -22,10 +19,6 @@
 
     <?php echo $datepickerlang;?>
     <title><?php echo $sitename;?></title>
-    <?php
-
-
-            ?>
     <link rel="shortcut icon" href="<?php echo $baseurl;?>styles/favicon.ico" type="image/x-icon" />
     <link rel="icon" href="<?php echo $baseurl;?>styles/favicon.ico" type="image/x-icon" />
     <?php echo $firebug ?>

diff --git a/application/views/layouts/main.php b/application/views/layouts/main.php
@@ -12,22 +12,16 @@
             App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "printablestyle.css", 'print');
             App()->getClientScript()->registerCssFile(Yii::app()->getConfig('styleurl') . "adminstyle.css" );
             App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "adminstyle.css" );
-            App()->getClientScript()->registerPackage('jqgrid');
-
             App()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . 'jquery.multiselect.css');
             App()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . 'jquery.multiselect.filter.css');
             App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') .  "displayParticipants.css");
 
         ?>
-
-
-
         <link rel="shortcut icon" href="<?php echo App()->baseUrl; ?>styles/favicon.ico" type="image/x-icon" />
         <link rel="icon" href="<?php echo App()->baseUrl; ?>styles/favicon.ico" type="image/x-icon" />
         <?php $this->widget('ext.LimeScript.LimeScript'); ?>
         <?php $this->widget('ext.LimeDebug.LimeDebug'); ?>
         <title>Limesurvey Administration</title>
-
     </head>
     <body>
         <div class="wrapper">