Fixed issue #10817: Testing 2.50 default template on mobile devices

Width for labels in array-numbers (multi-flexi) should follow Bootstrap column system if value is given.
LimeSurvey · Mar 24, 2016 · 0f7a788 · 0f7a788
1 parent f16021c
commit 0f7a788
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
@@ -5399,10 +5399,15 @@ function do_array_multiflexi($ia)
     if (trim($aQuestionAttributes['answer_width'])!='')
     {
         $answerwidth=$aQuestionAttributes['answer_width'];
+        $useAnswerWidth = true;
     }
     else
     {
         $answerwidth=20;
+
+        // If answerwidth is not given, we want to default to Bootstrap column.
+        // Otherwise bug on phone screen.
+        $useAnswerWidth = false;
     }
     $columnswidth=100-($answerwidth*2);
 
@@ -5557,8 +5562,15 @@ function do_array_multiflexi($ia)
             // table-in-qanda-7
             // $labelans
             //$answer .= "\t<th data-title=\" \" class=\"answertext\" width=\"$answerwidth%\">\n"
-            $answer .= "\t<th class=\"answertext\" style='width: $answerwidth%;'>\n"
-            . "$answertext\n"
+            if ($useAnswerWidth)
+            {
+                $answer .= "\t<th class=\"answertext\" style='width: $answerwidth%;'>\n";
+            }
+            else
+            {
+                $answer .= "\t<th class='answertext col-xs-12 col-sm-6'>\n";
+            }
+            $answer .= "$answertext\n"
             . $hiddenfield
             . "<input type=\"hidden\" name=\"java$myfname\" id=\"java$myfname\" value=\"";
             if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]))
@@ -5583,7 +5595,7 @@ function do_array_multiflexi($ia)
                         $myfname2_java_value = "";
                     }
                     $answer .= "\t<td data-title=\"{$labelans[$i]}\"  class=\"answer-cell-5 answer_cell_00$ld question-item answer-item {$answertypeclass}-item $extraclass\">\n"
-                    . "\t<label for=\"answer{$myfname2}\"><input type=\"hidden\" name=\"java{$myfname2}\" id=\"java{$myfname2}\" $myfname2_java_value />\n";
+                    . "\t<label for=\"answer{$myfname2}\" class='col-xs-12 col-sm-6'><input type=\"hidden\" name=\"java{$myfname2}\" id=\"java{$myfname2}\" $myfname2_java_value />\n";
                     //. "<label class=\"hidden-sm hidden-md hidden-lg read\" for=\"answer{$myfname2}\">{$labelans[$thiskey]}</label>\n";
                     $sSeparator = getRadixPointData($thissurvey['surveyls_numberformat']);
                     $sSeparator = $sSeparator['separator'];

diff --git a/templates/default/css/template.css b/templates/default/css/template.css
@@ -923,6 +923,15 @@ table {
         display: none;
     }
 
+    /* Need some more space on phone */
+    .array-multi-flexi .answertext {
+        padding-bottom: 0.5em;
+    }
+
+    .array-multi-flexi .answer-item label {
+        padding-bottom: 0.5em;
+    }
+
 }
 
 /** On small phones, leave some more space */