Merge branch 'master' into olle_tmp

LimeSurvey · May 5, 2016 · faba5ef · faba5ef
2 parents 08c6cac + 862abcc
commit faba5ef
Show file tree

Hide file tree

Showing 34 changed files with 323 additions and 380 deletions.
diff --git a/application/controllers/admin/conditionsaction.php b/application/controllers/admin/conditionsaction.php
@@ -1747,7 +1747,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
             ."</div>\n";
 
             // Source token Tab
-            $aViewUrls['output'] .= "<div id='SRCTOKENATTRS' class='tab-pane fade in'><select class='form-control' name='csrctoken' id='csrctoken' size='".($qcount+1)."' >\n";
+            $aViewUrls['output'] .= "<div id='SRCTOKENATTRS' class='tab-pane fade in'><select class='form-control' name='csrctoken' id='csrctoken' >\n";
             foreach (getTokenFieldsAndNames($iSurveyID) as $tokenattr => $tokenattrName)
             {
                 // Check to select

diff --git a/application/controllers/admin/responses.php b/application/controllers/admin/responses.php
@@ -410,7 +410,7 @@ public function browse($iSurveyId)
             'width'=>'100',
             'resizable' => true,
             'align'=>'right',
-            'label'=>viewHelper::getFieldText($fields['id']),
+            'title'=>viewHelper::getFieldText($fields['id']),
             'hidedlg'=>true,
         );
         $column_model[] = array(
@@ -421,7 +421,7 @@ public function browse($iSurveyId)
             'width'=>'100',
             'resizable' => true,// Strangely : don't work
             'align'=>'right',
-            'label'=>viewHelper::getFieldText($fields['lastpage']),
+            'title'=>viewHelper::getFieldText($fields['lastpage']),
         );
 
         $bHidden=false;
@@ -446,7 +446,7 @@ public function browse($iSurveyId)
             'hidden'=>$bHidden,
             'width'=>'100',
             'align'=>'left',
-            'label' => gT("Completed"),
+            'title' => gT("Completed"),
         );
 
         // defaultSearch is the default search done before send request in json. Actually : completed and token only. Can be extended ( js is ready) ?
@@ -472,7 +472,7 @@ public function browse($iSurveyId)
                 'sorttype'=>'string',
                 'sortable'=>true, 'width'=>'150',
                 'align'=>'left',
-                'label'=>gT('Token')
+                'title'=>gT('Token')
             );
             $column_model[] = array(
                 'name'=>'firstname',
@@ -481,7 +481,7 @@ public function browse($iSurveyId)
                 'sortable'=>true,
                 'width'=>'150',
                 'align'=>'left',
-                'label'=>gT('First name'),
+                'title'=>gT('First name'),
             );
             $column_model[] = array(
                 'name'=>'lastname',
@@ -490,7 +490,7 @@ public function browse($iSurveyId)
                 'sortable'=>true,
                 'width'=>'150',
                 'align'=>'left',
-                'label'=>gT('Last Name'),
+                'title'=>gT('Last Name'),
             );
             $column_model[] = array(
                 'name'=>'email',
@@ -499,7 +499,7 @@ public function browse($iSurveyId)
                 'sortable'=>true,
                 'width'=>'150',
                 'align'=>'left',
-                'label'=>gT('Email')
+                'title'=>gT('Email')
             );
             // If token exist, test if token is set in params, add it to defaultSearch
             if($sTokenSearch= Yii::app()->request->getQuery('token'))
@@ -515,7 +515,7 @@ public function browse($iSurveyId)
             'width'=>'50',
             'resizable' => true,// Strangely : don't work
             'align'=>'left',
-            'label'=>viewHelper::getFieldText($fields['startlanguage']),
+            'title'=>viewHelper::getFieldText($fields['startlanguage']),
         );
 
         // All other columns are based on the questions.
@@ -1525,6 +1525,8 @@ private function _zipFiles($iSurveyID, $responseIds, $zipfilename)
     protected function _renderWrappedTemplate($sAction='', $aViewUrls = array(), $aData = array())
     {
         $this->registerScriptFile( 'ADMIN_SCRIPT_PATH', 'browse.js');
+        App()->getClientScript()->registerCssFile(Yii::app()->getConfig('styleurl') . 'browse.css');// Don't find the way to register a css file in /styles/ (global css)
+
         $iSurveyId = $aData['iSurveyId'];
         $aData['display']['menu_bars'] = false;
         $aData['display']['menu_bars']['browse'] = gT('Browse responses'); // browse is independent of the above