Fixed issue #8320: Faulty hint text with sliders

Dev This time for real
LimeSurvey · Oct 30, 2013 · 907b1e1 · 907b1e1
1 parent 467eead
commit 907b1e1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -2881,7 +2881,14 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
                         $qtips['default']=$this->gT("Only numbers may be entered in this field.");
                         break;
                     case 'K':
-                        $qtips['default']=$this->gT("Only numbers may be entered in these fields.");
+                        if ($qattr['slider_layout'])
+                        {
+                            $qtips['default']=$this->gT('Please click and drag the slider handles to enter your answer.'); 
+                        }
+                        else
+                        {
+                            $qtips['default']=$this->gT("Only numbers may be entered in these fields.");
+                        }
                         break;
                     case 'R':
                         $qtips['default']=$this->gT("All your answers must be different.");

diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
@@ -3250,22 +3250,6 @@ function do_multiplenumeric($ia)
             $fn++;
             $inputnames[]=$myfname;
         }
-        $question_tip = '';
-        if($hidetip == 0)
-        {
-            $question_tip .= '<p class="tip">';
-            if ($slider_layout)
-            {
-                $question_tip .= $clang->gT('Only numbers may be entered in these fields');    
-            }
-            else
-            {
-                $question_tip .= $clang->gT('Please click and drag the slider handles to enter your answer.');    
-            }
-            $question_tip .= "</p>\n";    
-
-        }
-
         if (trim($aQuestionAttributes['equals_num_value']) != ''
         || trim($aQuestionAttributes['min_num_value']) != ''
         || trim($aQuestionAttributes['max_num_value']) != ''
@@ -3289,7 +3273,7 @@ function do_multiplenumeric($ia)
             . "$suffix</span>\n"
             . "\t</li>\n";
         }
-        $answer .= $question_tip."<ul class=\"subquestions-list questions-list text-list {$prefixclass}-list\">\n".$answer_main."</ul>\n";
+        $answer .= "<ul class=\"subquestions-list questions-list text-list {$prefixclass}-list\">\n".$answer_main."</ul>\n";
     }
 
     if($aQuestionAttributes['slider_layout']==1)