Dev: multiplechoice_with_comments alignments

LimeSurvey · Apr 14, 2016 · 71d2ba1 · 71d2ba1
1 parent cb38acf
commit 71d2ba1
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 15 deletions.
diff --git a/application/views/survey/questions/multiplechoice/rows/answer_row_other.php b/application/views/survey/questions/multiplechoice/rows/answer_row_other.php
@@ -41,7 +41,7 @@ class="checkbox other-checkbox dontread"
                   This field is related to the input thanks to attribute aria-labelledby
              -->
              <div class="label-text label-clickable" id="label-<?php echo $myfname;?>cbox">
-                     <?php echo $othertext; ?> &nbsp;
+                     <?php echo $othertext; ?>
              </div>
         </div>
 

diff --git a/application/views/survey/questions/multiplechoice_with_comments/answer.php b/application/views/survey/questions/multiplechoice_with_comments/answer.php
@@ -12,10 +12,10 @@
 
 <!-- answer -->
 <input type='hidden' name='<?php echo $name; ?>' value='<?php echo $value;?>' />
-    <ul class="list-unstyled subquestion-list questions-list checkbox-text-list">
-        <?php
-            // rows/answer_row.php
-            echo $sRows;
-        ?>
-    </ul>
+<table class="multiple-choice-with-comment list-unstyled subquestion-list questions-list checkbox-text-list no-more-tables table table-condensed table-hover">
+    <?php
+        // rows/answer_row.php
+        echo $sRows;
+    ?>
+</table>
 <!-- end of answer -->
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
@@ -24,9 +24,11 @@
  */
 ?>
 <!-- answer_row -->
-<li class='<?php echo $liclasses;?>'>
-    <!-- Checkbox and label -->
-    <div class="option col-xs-12 form-group checkbox" <?php echo $sDisplayStyle ;?> >
+<tr class='<?php echo $liclasses;?>'>
+
+    <!-- Checkbox + label -->
+    <!-- <div class="pull-left othertext-label-checkox-container checkbox"  <?php // echo $sDisplayStyle ;?>> -->
+    <td class="checkbox"  <?php echo $sDisplayStyle ;?>>
         <input
             class="checkbox <?php echo $classes; echo $kpclass; ?>"
             title="<?php echo $title;?>"
@@ -60,23 +62,25 @@ class="checkbox <?php echo $classes; echo $kpclass; ?>"
             <?php echo $checked;?>
             />
         <?php endif;?>
-    </div>
+    </td>
 
     <!-- Comment -->
-    <div class="comment col-xs-12 form-group" <?php echo $sDisplayStyle; ?>>
+    <!-- <div class="pull-left"  <?php // echo $sDisplayStyle; ?>> -->
+    <td <?php echo $sDisplayStyle; ?> class="comment-container">
+    <!-- <div class="comment col-xs-12 form-group" <?php // echo $sDisplayStyle; ?>> -->
         <label for='<?php echo $inputCommentId;?>' class="answer-comment hide control-label">
             <?php echo $commentLabelText;?>
         </label>
 
         <input
-            class='form-control text <?php echo $kpclass; ?>'
+            class='form-control text input-sm <?php echo $kpclass; ?>'
             type='text'
             size='40'
             id='<?php echo $inputCommentId;?>'
             name='<?php echo $inputCommentName; ?>'
             value='<?php echo $inputCOmmentValue; ?>'
             onkeyup='<?php echo $checkconditionFunctionComment;?>'
         />
-    </div>
-</li>
+    </td>
+</tr>
 <!-- end of answer_row -->
diff --git a/templates/default/css/template.css b/templates/default/css/template.css
@@ -766,4 +766,23 @@ table.numbers-only th, table.numbers-only input {
 
 .othertext-label-checkox-container {
     padding-top: 5px;
+    margin-right: 5px;
+}
+
+.multiple-choice-with-comment.table{
+    table-layout: auto;
+    width: initial;
+}
+ .multiple-choice-with-comment.table > tbody > tr > td {
+     padding-left: 18px;
+     vertical-align: middle;
+ }
+
+ /* alignment for small screens*/
+ .multiple-choice-with-comment.table > tbody > tr > td.comment-container {
+     padding-left: 14px;
+ }
+.checkbox input[type="checkbox"] {
+    position: static;
+    margin-left: 0px;
 }