Merge remote-tracking branch 'origin/master' into cint

LimeSurvey · Aug 24, 2016 · 0faddb5 · 0faddb5
2 parents d6596c6 + 3d409aa
commit 0faddb5
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 12 deletions.
diff --git a/application/helpers/admin/export/ExcelWriter.php b/application/helpers/admin/export/ExcelWriter.php
@@ -39,7 +39,7 @@ public function init(SurveyObj $survey, $sLanguageCode, FormattingOptions $oOpti
         $this->workbook = new XLSXWriter();
         $this->workbook->setTempDir(Yii::app()->getConfig('tempdir'));
         $worksheetName = $survey->languageSettings['surveyls_title'];
-        $worksheetName=substr(str_replace(array('*', ':', '/', '\\', '?', '[', ']'),array(' '),$worksheetName),0,31); // Remove invalid characters
+        $worksheetName=mb_substr(str_replace(array('*', ':', '/', '\\', '?', '[', ']'),array(' '),$worksheetName),0,31,'utf-8'); // Remove invalid characters
         if ($worksheetName=='')
         {
             $worksheetName='survey_'.$survey->id;

diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
@@ -3903,7 +3903,7 @@ function do_array_5point($ia)
     }
     else
     {
-        $answerwidth = 50;
+        $answerwidth = 25;
     }
     $cellwidth  = 5; // number of columns
 
@@ -3912,7 +3912,7 @@ function do_array_5point($ia)
         ++$cellwidth; // add another column
     }
 
-    $cellwidth  = round((( 100 - $answerwidth ) / $cellwidth) , 1); // convert number of columns to percentage of table width
+    $cellwidth  = round((( 100 - ($answerwidth*2) ) / $cellwidth) , 1); // convert number of columns to percentage of table width
 
     if ($aQuestionAttributes['random_order']==1)
     {
@@ -3939,7 +3939,6 @@ function do_array_5point($ia)
             $right_exists  = true;
         }
     }
-
     for ($xc=1; $xc<=5; $xc++)
     {
         $sColumns  .= doRender('/survey/questions/arrays/5point/columns/col', array('cellwidth'=>$cellwidth), true);
@@ -3953,7 +3952,7 @@ function do_array_5point($ia)
     // Column for suffix
     if ($right_exists)
     {
-        $sColumns  .= doRender('/survey/questions/arrays/5point/columns/col', array('cellwidth'=>$cellwidth), true);
+        $sColumns  .= doRender('/survey/questions/arrays/5point/columns/col', array('cellwidth'=>$answerwidth), true);
     }
 
     for ($xc=1; $xc<=5; $xc++)
@@ -4020,20 +4019,23 @@ function do_array_5point($ia)
 
         // Suffix
         $answertext2   = $ansrow['question'];
+        $textAlignClass = "";
         if (strpos($answertext2,'|'))
         {
             $answertext2=substr($answertext2,strpos($answertext2,'|')+1);
             $answer_tds .= doRender('/survey/questions/arrays/5point/rows/cells/answer_td_answertext', array(
                 'answerwidth'=>$answerwidth,
                 'answertext2'=>$answertext2,
             ), true);
+             $textAlignClass = "text-right";
         }
         elseif ($right_exists)
         {
             $answer_tds .= doRender('/survey/questions/arrays/5point/rows/cells/answer_td_answertext', array(
                 'answerwidth'=>$answerwidth,
                 'answertext2'=>'&nbsp;',
             ), true);
+             $textAlignClass = "text-right";
         }
 
         // ==>tds
@@ -4054,6 +4056,7 @@ function do_array_5point($ia)
                     'answer_tds'    => $answer_tds,
                     'myfname'       => $myfname,
                     'answerwidth'   => $answerwidth,
+                    'textAlignClass'=> $textAlignClass,
                     'answertext'    => $answertext,
                     'value'         => $value,
                     'error'         => $error,

diff --git a/application/views/survey/questions/arrays/5point/rows/answer_row.php b/application/views/survey/questions/arrays/5point/rows/answer_row.php
@@ -12,7 +12,7 @@
 
 <!-- answer_row -->
 <tr id="javatbd<?php echo $myfname;?>" class="well answers-list radio-list array<?php echo $zebra; ?>"  <?php echo $sDisplayStyle; ?>>
-    <th class="answertext" style="width: <?php echo $answerwidth;?>%;">
+    <th class="answertext <?php echo $textAlignClass;?>" style="width: <?php echo $answerwidth;?>%;">
         <?php if($error): ?>
             <div class="label label-danger" role="alert">
                 <?php echo $answertext;?>

diff --git a/templates/default/css/template-rtl.css b/templates/default/css/template-rtl.css
diff --git a/templates/default/css/template.css b/templates/default/css/template.css
@@ -523,9 +523,14 @@ table > tbody > tr > td.ddprefix {
         display: block;
     }
 
+    .no-more-tables tbody th,
+    .no-more-tables tbody td,
+    .no-more-tables tbody tr {
+        width: 100% !important;
+    }
+
     .no-more-tables tr {
         display: inline-block;
-        width: 100%;
     }
 
     .no-more-tables tbody {

diff --git a/templates/news_paper/css/template-rtl.css b/templates/news_paper/css/template-rtl.css
diff --git a/templates/news_paper/css/template.css b/templates/news_paper/css/template.css
@@ -523,9 +523,14 @@ table > tbody > tr > td.ddprefix {
         display: block;
     }
 
+    .no-more-tables tbody th,
+    .no-more-tables tbody td,
+    .no-more-tables tbody tr {
+        width: 100% !important;
+    }
+
     .no-more-tables tr {
         display: inline-block;
-        width: 100%;
     }
 
     .no-more-tables tbody {

diff --git a/templates/ubuntu_orange/css/template-rtl.css b/templates/ubuntu_orange/css/template-rtl.css
diff --git a/templates/ubuntu_orange/css/template.css b/templates/ubuntu_orange/css/template.css
@@ -523,9 +523,14 @@ table > tbody > tr > td.ddprefix {
         display: block;
     }
 
+    .no-more-tables tbody th,
+    .no-more-tables tbody td,
+    .no-more-tables tbody tr {
+        width: 100% !important;
+    }
+
     .no-more-tables tr {
         display: inline-block;
-        width: 100%;
     }
 
     .no-more-tables tbody {