Fixed issue #05744: EM introduces in-line .css changes

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@12287 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Feb 1, 2012 · d60e05e · d60e05e
1 parent 6796ae9
commit d60e05e
Show file tree

Hide file tree

Showing 12 changed files with 874 additions and 14 deletions.
diff --git a/classes/eval/LimeExpressionManager.php b/classes/eval/LimeExpressionManager.php
@@ -4936,9 +4936,9 @@ static function GetRelevanceAndTailoringJavaScript()
                     $validationJS = $LEM->em->GetJavaScriptEquivalentOfExpression();
 
                     $jsParts[] = "\n  if(" . $validationJS . "){\n";
-                    $jsParts[] = "    $('#" . $_veq['subqValidSelector'] . "').css('background-color','');\n";
+                    $jsParts[] = "    $('#" . $_veq['subqValidSelector'] . "').addClass('em_sq_validation').removeClass('error').addClass('good');;\n";
                     $jsParts[] = "  }\n  else {\n";
-                    $jsParts[] = "    $('#" . $_veq['subqValidSelector'] . "').css('background-color','pink');\n";
+                    $jsParts[] = "    $('#" . $_veq['subqValidSelector'] . "').addClass('em_sq_validation').removeClass('good').addClass('error');\n";
                     $jsParts[] = "  }\n";
                 }
 
@@ -4968,9 +4968,9 @@ static function GetRelevanceAndTailoringJavaScript()
                         $_validationJS = $LEM->em->GetJavaScriptEquivalentOfExpression();
 
                         $jsParts[] = "\n  if(" . $_validationJS . "){\n";
-                        $jsParts[] = "    $('#" . $arg['qid'] . "_vmsg_" . $vclass . "').css('color','green');\n";
+                        $jsParts[] = "    $('#" . $arg['qid'] . "_vmsg_" . $vclass . "').removeClass('error').addClass('good');\n";
                         $jsParts[] = "  }\n  else {\n";
-                        $jsParts[] = "    $('#" . $arg['qid'] . "_vmsg_" . $vclass ."').css('color','red').show();\n";
+                        $jsParts[] = "    $('#" . $arg['qid'] . "_vmsg_" . $vclass ."').removeClass('good').addClass('error');\n";
                         switch ($vclass)
                         {
                             case 'sum_range':
@@ -4990,11 +4990,9 @@ static function GetRelevanceAndTailoringJavaScript()
                     }
 
                     $jsParts[] = "\n  if(isValidSum" . $arg['qid'] . "){\n";
-                    $jsParts[] = "    $('#totalvalue_" . $arg['qid'] . "').css('color','green').css('font-weight','bold').css('background-color','#d3d3d3');\n";
-                    $jsParts[] = "    $('#remainingvalue_" . $arg['qid'] . "').css('background-color','#d3d3d3');\n";
+                    $jsParts[] = "    $('#totalvalue_" . $arg['qid'] . "').removeClass('error').addClass('good');\n";
                     $jsParts[] = "  }\n  else {\n";
-                    $jsParts[] = "    $('#totalvalue_" . $arg['qid'] . "').css('color','red').css('font-weight','bold').css('background-color','#d3d3d3');\n";
-                    $jsParts[] = "    $('#remainingvalue_" . $arg['qid'] . "').css('background-color','#d3d3d3');\n";
+                    $jsParts[] = "    $('#totalvalue_" . $arg['qid'] . "').removeClass('good').addClass('error');\n";
                     $jsParts[] = "  }\n";
 
                     // color-code single-entry fields as needed
@@ -5005,20 +5003,20 @@ static function GetRelevanceAndTailoringJavaScript()
                         case 'T':
                         case 'U':
                             $jsParts[] = "\n  if(isValidOther" . $arg['qid'] . "){\n";
-                            $jsParts[] = "    $('#question" . $arg['qid'] . " :input').css('background-color','');\n";
+                            $jsParts[] = "    $('#question" . $arg['qid'] . " :input').addClass('em_sq_validation').removeClass('error').addClass('good');\n";
                             $jsParts[] = "  }\n  else {\n";
-                            $jsParts[] = "    $('#question" . $arg['qid'] . " :input').css('background-color','pink');\n";
+                            $jsParts[] = "    $('#question" . $arg['qid'] . " :input').addClass('em_sq_validation').removeClass('good').addClass('error');\n";
                             $jsParts[] = "  }\n";
                             break;
                         default:
                             break;
                     }
 
                     $jsParts[] = "\n  if(isValidOther" . $arg['qid'] ." && isValidSum" . $arg['qid'] . "){\n";
-                    $jsParts[]= "    $('#" . $arg['qid'] . "_vmsg').css('color','green');\n";
+                    $jsParts[]= "    $('#" . $arg['qid'] . "_vmsg').removeClass('error').addClass('good');\n";
                     $jsParts[]= "    $('#question" . $arg['qid'] . "').removeClass('input-error');\n";
                     $jsParts[] = "  }\n  else {\n";
-                    $jsParts[]= "    $('#" . $arg['qid'] . "_vmsg').css('color','red').show();\n";
+                    $jsParts[]= "    $('#" . $arg['qid'] . "_vmsg').removeClass('good').addClass('error');\n";
                     $jsParts[]= "    $('#question" . $arg['qid'] . "').addClass('input-error');\n";
                     $jsParts[] = "  }\n";
                 }

diff --git a/qanda.php b/qanda.php
@@ -3767,14 +3767,14 @@ function do_multiplenumeric($ia)
             {
                 $answer_main .= "\t<li class='multiplenumerichelp'>\n"
                     . "<label for=\"remainingvalue_{$ia[0]}\">".$clang->gT('Remaining: ')."</label>\n"
-                    . "<span id=\"remainingvalue_{$ia[0]}\">$prefix\n"
+                    . "<span id=\"remainingvalue_{$ia[0]}\" class=\"dynamic_remaining\">$prefix\n"
                     . "{" . $qinfo['sumRemainingEqn'] . "}\n"
                     . "$suffix</span>\n"
                     . "\t</li>\n";
             }
             $answer_main .= "\t<li class='multiplenumerichelp'>\n"
                 . "<label for=\"totalvalue_{$ia[0]}\">".$clang->gT('Total: ')."</label>\n"
-                . "<span id=\"totalvalue_{$ia[0]}\">$prefix\n"
+                . "<span id=\"totalvalue_{$ia[0]}\" class=\"dynamic_sum\">$prefix\n"
                 . "{" . $qinfo['sumEqn'] . "}\n"
                 . "$suffix</span>\n"
                 . "\t</li>\n";

diff --git a/templates/basic/template.css b/templates/basic/template.css
@@ -999,3 +999,90 @@ div.questionTitle {
 #index .container .row.current { background: #000; color: #fff; }
 #index .container .row.missing { background: #CC0000; color: #fff; }
 #index .container input { margin: 1em; }
+
+
+/* Tips / Validation Messages */
+div.em_num_answers.good {
+ color: green;
+}
+
+div.em_num_answers.error {
+  color: red;
+  display: block;
+}
+
+div.em_value_range.good {
+  color: green;
+}
+div.em_value_range.error {
+  color: red;
+  display: block;
+}
+
+div.em_sum_range.good {
+  color: green;
+}
+div.em_sum_range.error {
+  color: red;
+  display: block;
+}
+
+div.em_regex_validation {
+  display: none;
+}
+div.em_regex_validation.good {
+  color: green;
+}
+div.em_regex_validation.error {
+  color: red;
+}
+
+div.em_q_fn_validation {
+  display: none;
+}
+div.em_q_fn_validation.good {
+  color: green;
+}
+div.em_q_fn_validation.error {
+  color: red;
+}
+
+div.em_sq_fn_validation {
+  display: none;
+}
+div.em_sq_fn_validation.good {
+  color: green;
+}
+div.em_sq_fn_validation.error {
+  color: red;
+}
+
+input.em_sq_validation.good {
+}
+
+input.em_sq_validation.error {
+  color: black;
+  background-color:  pink;
+}
+
+span.dynamic_sum {
+  font-weight: bold;
+  background-color: #d3d3d3;
+}
+span.dynamic_sum.good {
+  color: green;
+}
+span.dynamic_sum.error {
+  color: red;
+}
+
+span.dynamic_remaining {
+  font-weight: bold;
+  background-color: #d3d3d3;
+}
+span.dyanamic_remaining.good {
+  color: green;
+}
+span.dynamic_remaining.error {
+  color: red;
+}
diff --git a/templates/bluengrey/template.css b/templates/bluengrey/template.css
@@ -1330,3 +1330,89 @@ table.assessments th{
 #index .container .row.current { background: #444; color: #fff; }
 #index .container .row.missing { background: #CC0000; color: #fff; }
 #index .container input { margin: 1em; }
+
+/* Tips / Validation Messages */
+div.em_num_answers.good {
+ color: green;
+}
+
+div.em_num_answers.error {
+  color: red;
+  display: block;
+}
+
+div.em_value_range.good {
+  color: green;
+}
+div.em_value_range.error {
+  color: red;
+  display: block;
+}
+
+div.em_sum_range.good {
+  color: green;
+}
+div.em_sum_range.error {
+  color: red;
+  display: block;
+}
+
+div.em_regex_validation {
+  display: none;
+}
+div.em_regex_validation.good {
+  color: green;
+}
+div.em_regex_validation.error {
+  color: red;
+}
+
+div.em_q_fn_validation {
+  display: none;
+}
+div.em_q_fn_validation.good {
+  color: green;
+}
+div.em_q_fn_validation.error {
+  color: red;
+}
+
+div.em_sq_fn_validation {
+  display: none;
+}
+div.em_sq_fn_validation.good {
+  color: green;
+}
+div.em_sq_fn_validation.error {
+  color: red;
+}
+
+input.em_sq_validation.good {
+}
+
+input.em_sq_validation.error {
+  color: black;
+  background-color:  pink;
+}
+
+span.dynamic_sum {
+  font-weight: bold;
+  background-color: #d3d3d3;
+}
+span.dynamic_sum.good {
+  color: green;
+}
+span.dynamic_sum.error {
+  color: red;
+}
+
+span.dynamic_remaining {
+  font-weight: bold;
+  background-color: #d3d3d3;
+}
+span.dyanamic_remaining.good {
+  color: green;
+}
+span.dynamic_remaining.error {
+  color: red;
+}
diff --git a/templates/citronade/template.css b/templates/citronade/template.css
@@ -1002,3 +1002,89 @@ input.text,textarea{
 .gender {}
 */
 
+
+/* Tips / Validation Messages */
+div.em_num_answers.good {
+ color: green;
+}
+
+div.em_num_answers.error {
+  color: red;
+  display: block;
+}
+
+div.em_value_range.good {
+  color: green;
+}
+div.em_value_range.error {
+  color: red;
+  display: block;
+}
+
+div.em_sum_range.good {
+  color: green;
+}
+div.em_sum_range.error {
+  color: red;
+  display: block;
+}
+
+div.em_regex_validation {
+  display: none;
+}
+div.em_regex_validation.good {
+  color: green;
+}
+div.em_regex_validation.error {
+  color: red;
+}
+
+div.em_q_fn_validation {
+  display: none;
+}
+div.em_q_fn_validation.good {
+  color: green;
+}
+div.em_q_fn_validation.error {
+  color: red;
+}
+
+div.em_sq_fn_validation {
+  display: none;
+}
+div.em_sq_fn_validation.good {
+  color: green;
+}
+div.em_sq_fn_validation.error {
+  color: red;
+}
+
+input.em_sq_validation.good {
+}
+
+input.em_sq_validation.error {
+  color: black;
+  background-color:  pink;
+}
+
+span.dynamic_sum {
+  font-weight: bold;
+  background-color: #d3d3d3;
+}
+span.dynamic_sum.good {
+  color: green;
+}
+span.dynamic_sum.error {
+  color: red;
+}
+
+span.dynamic_remaining {
+  font-weight: bold;
+  background-color: #d3d3d3;
+}
+span.dyanamic_remaining.good {
+  color: green;
+}
+span.dynamic_remaining.error {
+  color: red;
+}