Merge branch 'answers_html' of https://github.com/LimeSurvey/LimeSurvey…

… into answers_html # Conflicts: # application/views/survey/questions/arrays/dualscale/answer.php
LimeSurvey · Nov 3, 2016 · e5b8e79 · e5b8e79
2 parents 6da8ccd + b3069c1
commit e5b8e79
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 21 deletions.
diff --git a/application/views/survey/questions/arrays/dualscale/answer.php b/application/views/survey/questions/arrays/dualscale/answer.php
@@ -24,7 +24,7 @@
         </colgroup>
     <?php endif; ?>
     <?php if ($shownoanswer || $rightexists): ?>
-        <col class="separator right_separator" style="width: <?php echo $rightwidth; ?>">
+        <col class="separator rigth_separator" style="width: <?php echo $rigthwidth; ?>%">
     <?php endif; ?>
     <?php if ($shownoanswer): ?>
         <col class="col-no-answer"  style="width: <?php echo $cellwidth; ?>%;" />
@@ -34,15 +34,14 @@
         <?php if ($leftheader != '' || $rightheader !=''): ?>
             <tr class="ls-heading groups header_row">
                 <th class="header_answer_text"></th>
-                <th colspan="<?php echo count($labelans0); ?>" class="dsheader text-center"><?php echo $leftheader; ?></th>
-
+                <th colspan="<?php echo count($labelans0); ?>" class="dsheader"><?php echo $leftheader; ?></th>
                 <?php if (count($labelans1) > 0): ?>
                     <td class="header_separator"></td>  <!-- // Separator -->
-                    <th colspan="<?php echo count($labelans1); ?>" class="dsheader text-center"><?php echo $rightheader; ?></th>
+                    <th colspan="<?php echo count($labelans1); ?>" class="dsheader"><?php echo $rightheader; ?></th>
                 <?php endif; ?>
 
                 <?php if($shownoanswer || $rightexists): ?>
-                    <td class="header_separator <?php echo $rightclass; ?>"></td>
+                    <td class="header_separator <?php echo $rigthclass; ?>"></td>
                     <?php if($shownoanswer): ?>
                         <th class="header_no_answer"></th>
                     <?php endif; ?>
@@ -90,7 +89,7 @@
             <?php endif; ?>
 
             <!-- tr -->
-            <tr id="" role="group" aria-describedby="answertext<?php echo $ansrow['myfname']; ?>"
+            <tr id="javatbd<?php echo $ansrow['myfname']; ?>" role="group" aria-describedby="answertext<?php echo $ansrow['myfname']; ?>"
                 class="answers-list radio-list <?php echo ($ansrow['odd']) ? "ls-odd" : "ls-even"; ?><?php echo ($ansrow['showmandatoryviolation']) ? " has-error" : ""; ?>"
             >
             <th class="answertext control-label" id="answertext<?php echo $ansrow['myfname']; ?>">
@@ -112,7 +111,7 @@ class="answers-list radio-list <?php echo ($ansrow['odd']) ? "ls-odd" : "ls-even
             <!-- First label set -->
             <?php foreach ($labelcode0 as $j => $ld): ?>
                 <?php if ($j === 0 && $leftheader != ''): ?>
-                    <td class='visible-xs leftheader'><?php echo $leftheader; ?></td>
+                    <td class='visible-xs leftheader'><?php echo $leftheader; ?></td><!-- this break column count : no visual issue, but HTML issue : A table row was X columns wide and exceeded the column count established using column markup. -->
                 <?php endif; ?>
                 <td class="answer_cell_1_<?php echo $ld; ?> answer-item <?php echo $answertypeclass; ?>-item">
                     <input
@@ -149,7 +148,7 @@ class="answers-list radio-list <?php echo ($ansrow['odd']) ? "ls-odd" : "ls-even
                 <!-- Second label set -->
                 <?php foreach ($labelcode1 as $k => $ld): ?>
                     <?php if ($k === 0 && $rightheader != ''): ?>
-                        <td class='visible-xs rightheader'><?php echo $rightheader; ?></td>
+                        <td class='visible-xs rightheader'><?php echo $rightheader; ?></td><!-- this break column count : no visual issue, but HTML issue : A table row was X columns wide and exceeded the column count established using column markup. -->
                     <?php endif; ?>
                     <td class="answer_cell_2_<?php echo $ld; ?> answer-item radio-item">
                         <input
@@ -173,7 +172,7 @@ class="answers-list radio-list <?php echo ($ansrow['odd']) ? "ls-odd" : "ls-even
 
             <!-- No answer column -->
             <?php if ($shownoanswer): ?>
-                <td class="dual_scale_no_answer answer-item radio-item noanswer-item">
+                <td class="answer-item radio-item noanswer-item">
                     <?php if (count($labelans1) > 0): ?>
                             <input
                                 type='radio'

diff --git a/application/views/survey/questions/arrays/dualscale/answer_header.php b/application/views/survey/questions/arrays/dualscale/answer_header.php
@@ -11,25 +11,18 @@
 
 ?>
 <tr class="ls-heading header_row <?php echo $class; ?>" aria-hidden="true">
-
-    <td class="header_answer_text">&nbsp;</td>
-
+    <td class="header_answer_text"></td>
     <?php foreach ($labelans0 as $ld): ?>
         <th class=''><?php echo $ld; ?></th>
     <?php endforeach; ?>
-
     <?php if (count($labelans1) > 0): ?>
-
-        <td class="header_separator">&nbsp;</td>  <!-- Separator : and No answer for accessibility for first colgroup -->
-
+        <td class="header_separator"></td>  <!-- Separator : and No answer for accessibility for first colgroup -->
         <?php foreach ($labelans1 as $ld): ?>
             <th  class=''><?php echo $ld; ?></th>
         <?php endforeach; ?>
-
     <?php endif; ?>
-
     <?php if ($shownoanswer || $rightexists): ?>
-        <td class="header_separator rigth_separator">&nbsp;</td>
+        <td class="header_separator rigth_separator"></td>
     <?php endif; ?>
     <?php if ($shownoanswer): ?>
         <th class="header_no_answer"><?php eT('No answer'); ?></th>

diff --git a/application/views/survey/system/actionButton/clearAll.php b/application/views/survey/system/actionButton/clearAll.php
@@ -11,7 +11,7 @@
 echo CHtml::openTag("div",array("class"=>"form-inline ls-{$name}-form"));
     echo CHtml::htmlButton(gT("Exit and clear survey"),array(
         'type'=>'submit',
-        'id'=>false,
+        'id'=>null,
         'value'=>$value,
         'name'=>$name,
         'class'=>"$class btn btn-link",
@@ -20,7 +20,7 @@
         'aria-label'=>gT("This action need confirmation with the next checkbox."), /* ? must be reviewed */
     ));
     echo CHtml::openTag("label",array("class"=>"form-group ls-js-hidden"));
-        echo CHtml::checkBox($confirmedby,false,array('value'=>$confirmvalue));
+        echo CHtml::checkBox($confirmedby,false,array('id'=>null,'value'=>$confirmvalue));
         echo CHtml::tag("span",array('class'=>'control-label'),gT("Are you sure you want to clear all your responses?"));
     echo CHtml::closeTag("label");
 echo CHtml::closeTag("div");