Fixed issue #10530: HTML for radio button form items inconsistent

LimeSurvey · Mar 4, 2016 · d9ab5c6 · d9ab5c6
1 parent 4b436f8
commit d9ab5c6
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 38 deletions.
diff --git a/application/views/survey/questions/5pointchoice/item_noanswer_row.php b/application/views/survey/questions/5pointchoice/item_noanswer_row.php
@@ -9,16 +9,16 @@
 ?>
 <!-- 5 point choice no answer -->
 <div class="col-xs-2 answer-item radio-item noanswer-item">
-    <input
-        class="radio"
-        type="radio"
-        name="<?php echo $ia[1]; ?>"
-        id="answer<?php echo $ia[1]; ?>NANS"
-        value=""
-        <?php echo $checkedState; ?>
-        onclick="<?php echo $checkconditionFunction; ?>(this.value, this.name, this.type);"
-    />
-    <label for="answer<?php echo $ia[1];?>NANS" class="answertext">
+    <label for="answer<?php echo $ia[1];?>NANS" class="answertext radio-label">
+        <input
+            class="radio"
+            type="radio"
+            name="<?php echo $ia[1]; ?>"
+            id="answer<?php echo $ia[1]; ?>NANS"
+            value=""
+            <?php echo $checkedState; ?>
+            onclick="<?php echo $checkconditionFunction; ?>(this.value, this.name, this.type);"
+        />
         <?php echo gT('No answer'); ?>
     </label>
 </div>
diff --git a/application/views/survey/questions/5pointchoice/item_row.php b/application/views/survey/questions/5pointchoice/item_row.php
@@ -10,16 +10,16 @@
 ?>
 <!-- 5 point choice item -->
 <div class="col-xs-2 answer-item radio-item">
-    <input
-        class="radio"
-        type="radio"
-        name="<?php echo $ia[1]; ?>"
-        id="answer<?php echo $ia[1].$fp; ?>"
-        value="<?php echo $fp;?>"
-        <?php echo $checkedState; ?>
-        onclick="<?php echo $checkconditionFunction; ?>(this.value, this.name, this.type)"
-    />
-    <label for="answer<?php echo $ia[1].$fp; ?>" class="answertext">
+    <label for="answer<?php echo $ia[1].$fp; ?>" class="answertext radio-label">
+        <input
+            class="radio"
+            type="radio"
+            name="<?php echo $ia[1]; ?>"
+            id="answer<?php echo $ia[1].$fp; ?>"
+            value="<?php echo $fp;?>"
+            <?php echo $checkedState; ?>
+            onclick="<?php echo $checkconditionFunction; ?>(this.value, this.name, this.type)"
+        />
         <?php echo $fp; ?>
     </label>
 </div>
diff --git a/application/views/survey/questions/list_with_comment/list/item.php b/application/views/survey/questions/list_with_comment/list/item.php
@@ -11,17 +11,17 @@
  * @var $li_classes
  */
 ?>
-        <li class="answer-item radio-item <?php if(isset($li_classes)){echo $li_classes;}?>">
-            <input
-                type="radio"
-                name="<?php echo $name; ?>"
-                id="<?php echo $id; ?>"
-                value="<?php echo $value; ?>"
-                class="radio"
-                <?php $check_ans; ?>
-                onclick="<?php echo $checkconditionFunction; ?>"
-            />
-            <label for="<?php echo $id; ?>" class="answertext">
-                <?php echo $labeltext;?>
-            </label>
-        </li>
+<li class="answer-item radio-item <?php if(isset($li_classes)){echo $li_classes;}?>">
+    <label for="<?php echo $id; ?>" class="answertext radio-label">
+        <input
+            type="radio"
+            name="<?php echo $name; ?>"
+            id="<?php echo $id; ?>"
+            value="<?php echo $value; ?>"
+            class="radio"
+            <?php $check_ans; ?>
+            onclick="<?php echo $checkconditionFunction; ?>"
+        />
+        <?php echo $labeltext;?>
+    </label>
+</li>
diff --git a/application/views/survey/questions/listradio/item_row.php b/application/views/survey/questions/listradio/item_row.php
@@ -14,7 +14,7 @@
 ?>
 <div class="col-sm-12">
     <div id='javatbd<?php echo $myfname; ?>' class='form-group answer-item radio-item' <?php echo $sDisplayStyle; ?> >
-        <label for="answer<?php echo $ia[1].$ansrow['code']; ?>" class="control-label label-radio">
+        <label for="answer<?php echo $ia[1].$ansrow['code']; ?>" class="control-label radio-label">
             <input
                 class="radio"
                 type="radio"
@@ -24,9 +24,7 @@ class="radio"
                 <?php echo $checkedState;?>
                 onclick="if (document.getElementById('answer<?php echo $ia[1]; ?>othertext') != null) document.getElementById('answer<?php echo $ia[1]; ?>othertext').value='';checkconditions(this.value, this.name, this.type)"
              />
-             <span>
-                 <?php echo $ansrow['answer']; ?>
-            </span>
+             <?php echo $ansrow['answer']; ?>
         </label>
     </div>
 </div>