Fixed issue #10844: Various issues using the LS 2.50 default template

Dev: Use Bootstrap label class for sum and remaining.
LimeSurvey · Apr 7, 2016 · d664491 · d664491
1 parent 26ac2b4
commit d664491
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 18 deletions.
diff --git a/application/views/survey/questions/multiplenumeric/answer.php b/application/views/survey/questions/multiplenumeric/answer.php
@@ -24,28 +24,32 @@
         ?>
 
         <?php if($equals_num_value):?>
-            <p class='multiplenumerichelp help-item text-info'>
-                <span class="label">
-                    <?php eT('Remaining: ');?>
-                </span>
-                <span id="remainingvalue_<?php echo $id; ?>" class="dynamic_remaining">
-                    <?php echo $prefix; ?>
-                    {<?php echo $sumRemainingEqn;?>}
-                </span>
-            </p>
+            <div class='multiplenumerichelp help-block'>
+                <div class='label label-default'>
+                    <label>
+                        <?php eT('Remaining: ');?>
+                    </label>
+                    <span id="remainingvalue_<?php echo $id; ?>" class="dynamic_remaining">
+                        <?php echo $prefix; ?>
+                        {<?php echo $sumRemainingEqn;?>}
+                    </span>
+                </div>
+            </div>
         <?php endif; ?>
 
         <?php if($displaytotal):?>
 
-            <li class='multiplenumerichelp  help-item'>
-                <span class="label"><?php eT('Total: '); ?></span>
-                <span id="totalvalue_<?php echo $id; ?>" class="dynamic_sum">
-                    <?php echo $prefix; ?>
-                    <?php // NO SPACE AFTER BRACKET !!!! ?>
-                    {<?php echo $sumEqn; ?>}
-                    <?php echo $suffix; ?>
-                </span>
-            </li>
+            <div class='multiplenumerichelp help-block'>
+                <div class='label label-default'>
+                    <label class=""><?php eT('Total: '); ?></label>
+                    <span id="totalvalue_<?php echo $id; ?>" class="">
+                        <?php echo $prefix; ?>
+                        <?php // NO SPACE AFTER BRACKET !!!! ?>
+                        {<?php echo $sumEqn; ?>}
+                        <?php echo $suffix; ?>
+                    </span>
+                </div>
+            </div>
 
         <?php endif; ?>
 </div>

diff --git a/templates/default/css/template.css b/templates/default/css/template.css
@@ -843,6 +843,10 @@ table.question.subquestion-list.questions-list tr th.answertext {
     right: 1em;
 }
 
+.label {
+    font-size: 90%;
+}
+
 /**
  * No more tables
  * OBS: Media specific CSS should be last in this file.