Dev: #10103 some id in double + some space between attribute

Dev: Currently : in demo survey : col count VS th count in array dual need fix
LimeSurvey · Nov 14, 2016 · 0d7843a · 0d7843a
1 parent 3ee885e
commit 0d7843a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/application/views/survey/questions/5pointchoice/rows/item_row.php b/application/views/survey/questions/5pointchoice/rows/item_row.php
@@ -13,14 +13,13 @@
 ?>
 
 <!-- item_row -->
-<li id="javatbd<?php echo $name; ?>" class="form-group answer-item radio-item <?php echo $itemExtraClass; ?>">
+<li id="javatbd<?php echo $name.$value; ?>" class="form-group answer-item radio-item <?php echo $itemExtraClass; ?>">
     <input
         type="radio"
         name="<?php echo $name; ?>"
         id="answer<?php echo $id; ?>"
         value="<?php echo $value;?>"
         <?php echo $checkedState; ?>
-        onclick="<?php echo $checkconditionFunction; ?>(this.value, this.name, this.type)"
     />
     <label for="answer<?php echo $id; ?>" class="control-label radio-label"><?php echo $labelText; ?></label>
 </li>

diff --git a/application/views/survey/questions/arrays/10point/rows/answer_row.php b/application/views/survey/questions/arrays/10point/rows/answer_row.php
@@ -12,7 +12,7 @@
 
 <!-- answer_row -->
 <tr id="javatbd<?php echo $myfname;?>" class="answers-list radio-list form-group <?php echo ($odd) ? "ls-odd" : "ls-even"; ?> <?php echo ($error) ? " has-error" : ""; ?>"  <?php echo $sDisplayStyle; ?>  role="radiogroup"  aria-labelledby="answertext<?php echo $myfname;?>">
-    <th id="answertext<?php echo $myfname;?>"class="answertext control-label">
+    <th id="answertext<?php echo $myfname;?>" class="answertext control-label">
         <?php echo $answertext;?>
         <input name="java<?php echo $myfname;?>" id="java<?php echo $myfname;?>" value="<?php echo $value;?>" type="hidden">
     </th>

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="answers-list radio-list form-group <?php echo ($odd) ? "ls-odd" : "ls-even"; ?><?php echo ($error) ? " has-error" : ""; ?>" <?php echo $sDisplayStyle; ?>  role="radiogroup"  aria-labelledby="answertext<?php echo $myfname;?>">
-    <th id="answertext<?php echo $myfname;?>"class="answertext control-label">
+    <th id="answertext<?php echo $myfname;?>" class="answertext control-label">
         <?php echo $answertext;?>
         <input name="java<?php echo $myfname;?>" id="java<?php echo $myfname;?>" value="<?php echo $value;?>" type="hidden">
     </th>

diff --git a/application/views/survey/questions/list_dropdown/rows/option.php b/application/views/survey/questions/list_dropdown/rows/option.php
@@ -9,7 +9,7 @@
 ?>
 
 <!-- option -->
-<option value='<?php echo $value?>' id='answer<?php echo $name.$value ?>' <?php echo $opt_select;?> <?php if(isset($classes)):?> class="<?php echo $classes;?>" <?php endif;?> >
+<option value='<?php echo $value?>' <?php echo $opt_select;?> <?php if(isset($classes)):?> class="<?php echo $classes;?>" <?php endif;?> >
     <?php echo $answer;?>
 </option>
 <!-- end of option -->
diff --git a/application/views/survey/questions/list_with_comment/list/rows/answer_row.php b/application/views/survey/questions/list_with_comment/list/rows/answer_row.php
@@ -12,7 +12,7 @@
  */
 ?>
 <!-- answer_row -->
-<li id='javatbd<?php echo $name; ?>' class="form-group <?php echo $li_classes; ?>">
+<li id='javatbd<?php echo $name.$value; ?>' class="form-group <?php echo $li_classes; ?>">
     <input
         type="radio"
         name="<?php echo $name; ?>"

diff --git a/application/views/survey/questions/multiplechoice_with_comments/rows/answer_row.php b/application/views/survey/questions/multiplechoice_with_comments/rows/answer_row.php
@@ -46,7 +46,6 @@ class="<?php echo $classes; echo $kpclass; ?>"
                 name='<?php echo $javaname?>'
                 id='<?php echo $javaname?>'
                 value='<?php echo $javavalue;?>'
-                <?php echo $checked;?>
                 />
             <?php endif;?>
         </div>
@@ -61,7 +60,7 @@ class='form-control <?php echo $kpclass; ?>'
                 id='<?php echo $inputCommentId;?>'
                 name='<?php echo $inputCommentName; ?>'
                 value='<?php echo $inputCOmmentValue; ?>'
-                aria-labelled='label-<?php echo $id;?>'
+                aria-labelledby='label-<?php echo $id;?>'
             />
         </div>
     </div>