Dev: removed diplayParticpants from header, now using a package in co…

…ntrollers
LimeSurvey · Sep 28, 2015 · 72a211d · 72a211d
1 parent 963ac1b
commit 72a211d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/application/controllers/admin/participantsaction.php b/application/controllers/admin/participantsaction.php
@@ -250,8 +250,7 @@ function displayParticipants()
             'aAttributes' => ParticipantAttributeName::model()->getAllAttributes()
         );
         App()->getClientScript()->registerPackage('jqgrid');
-        App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl')  . 'displayParticipants.css');
-
+        App()->getClientScript()->registerPackage('display-participants');
 
         // loads the participant panel view and display participant view
 

diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -284,7 +284,7 @@ function browse($iSurveyId, $limit = 50, $start = 0, $order = false, $searchstri
         App()->getClientScript()->registerPackage('jqgrid');
         App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . "tokens.js");
         // CSS
-        App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "displayParticipants.css");
+
         App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "jquery-ui/jquery-timepicker.css");
 
         Yii::app()->loadHelper('surveytranslator');
@@ -2647,6 +2647,8 @@ function _newtokentable($iSurveyId)
     */
     protected function _renderWrappedTemplate($sAction = 'token', $aViewUrls = array(), $aData = array())
     {
+        App()->getClientScript()->registerPackage('display-participants');        
+
         $aData['imageurl'] = Yii::app()->getConfig('adminimageurl');
         $aData['display']['menu_bars'] = false;
         parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);

diff --git a/application/views/admin/super/header.php b/application/views/admin/super/header.php
@@ -12,9 +12,6 @@
 
 //        App()->getClientScript()->registerCssFile( App()->getAssetManager()->publish( dirname(Yii::app()->request->scriptFile).'/styles/gringegreen/' . "adminstyle.css") );
 
-        // display participants : should rather be in the right contoller
-		App()->getClientScript()->registerPackage('display-participants');
-
         // Bootstrap
         App()->bootstrap->register();   
 		App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "../bootstrap/lime-icons2.css" );