Fixed issue #10388: hide tip parameter for questions

LimeSurvey · Feb 11, 2016 · 32ffbb4 · 32ffbb4
1 parent 3a51ac6
commit 32ffbb4
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 15 deletions.
diff --git a/templates/default/css/template.css b/templates/default/css/template.css
@@ -765,3 +765,8 @@ table.question.subquestion-list.questions-list tr.answers-list th
      display: inline-block;
      padding: 0.2em;
  }
+
+ .hide-tip
+ {
+     display: none;
+ }
diff --git a/templates/default/scripts/template.js b/templates/default/scripts/template.js
@@ -162,25 +162,39 @@ $(document).ready(function(){
         $('.emtip').each(function(){
             if($(this).hasClass('error'))
             {
-                $(this).parent().removeClass('alert-info').addClass('alert-danger');
+                $(this).parents('div.alert.questionhelp').removeClass('alert-info').addClass('alert-danger');
                 $(this).addClass('strong');
             }
         });
 
         // On em change
         $('.emtip').each(function(){
+
             $(this).on('classChangeError', function() {
-                $parent = $(this).parent();
-                $parent.removeClass('alert-info');
+                $parent = $(this).parent('div.alert.questionhelp');
+                $parent.removeClass('alert').removeClass('alert-info',1);
+                $parent.addClass('alert-danger',1).addClass('alert');
+
+                if ($parent.hasClass('hide-tip'))
+                {
+                    $parent.removeClass('hide-tip',1);
+                    $parent.addClass('tip-was-hidden',1);
+                }
+
                 $(this).addClass('strong');
-                $parent.addClass('alert-danger');
+
 
             });
+
             $(this).on('classChangeGood', function() {
-                $parent = $(this).parent();
+                $parent = $(this).parents('div.alert.questionhelp');
                 $parent.removeClass('alert-danger');
                 $(this).removeClass('strong');
                 $parent.addClass('alert-info');
+                if ($parent.hasClass('tip-was-hidden'))
+                {
+                    $parent.removeClass('tip-was-hidden').addClass('hide-tip');
+                }
 
             });
 

diff --git a/templates/news_paper/css/template.css b/templates/news_paper/css/template.css
@@ -765,3 +765,8 @@ table.question.subquestion-list.questions-list tr.answers-list th
      display: inline-block;
      padding: 0.2em;
  }
+
+ .hide-tip
+ {
+     display: none;
+ }
diff --git a/templates/news_paper/scripts/template.js b/templates/news_paper/scripts/template.js
@@ -162,25 +162,39 @@ $(document).ready(function(){
         $('.emtip').each(function(){
             if($(this).hasClass('error'))
             {
-                $(this).parent().removeClass('alert-info').addClass('alert-danger');
+                $(this).parents('div.alert.questionhelp').removeClass('alert-info').addClass('alert-danger');
                 $(this).addClass('strong');
             }
         });
 
         // On em change
         $('.emtip').each(function(){
+
             $(this).on('classChangeError', function() {
-                $parent = $(this).parent();
-                $parent.removeClass('alert-info');
+                $parent = $(this).parent('div.alert.questionhelp');
+                $parent.removeClass('alert').removeClass('alert-info',1);
+                $parent.addClass('alert-danger',1).addClass('alert');
+
+                if ($parent.hasClass('hide-tip'))
+                {
+                    $parent.removeClass('hide-tip',1);
+                    $parent.addClass('tip-was-hidden',1);
+                }
+
                 $(this).addClass('strong');
-                $parent.addClass('alert-danger');
+
 
             });
+
             $(this).on('classChangeGood', function() {
-                $parent = $(this).parent();
+                $parent = $(this).parents('div.alert.questionhelp');
                 $parent.removeClass('alert-danger');
                 $(this).removeClass('strong');
                 $parent.addClass('alert-info');
+                if ($parent.hasClass('tip-was-hidden'))
+                {
+                    $parent.removeClass('tip-was-hidden').addClass('hide-tip');
+                }
 
             });
 

diff --git a/templates/ubuntu_orange/css/template.css b/templates/ubuntu_orange/css/template.css
@@ -765,3 +765,8 @@ table.question.subquestion-list.questions-list tr.answers-list th
      display: inline-block;
      padding: 0.2em;
  }
+
+ .hide-tip
+ {
+     display: none;
+ }
diff --git a/templates/ubuntu_orange/scripts/template.js b/templates/ubuntu_orange/scripts/template.js
@@ -162,25 +162,39 @@ $(document).ready(function(){
         $('.emtip').each(function(){
             if($(this).hasClass('error'))
             {
-                $(this).parent().removeClass('alert-info').addClass('alert-danger');
+                $(this).parents('div.alert.questionhelp').removeClass('alert-info').addClass('alert-danger');
                 $(this).addClass('strong');
             }
         });
 
         // On em change
         $('.emtip').each(function(){
+
             $(this).on('classChangeError', function() {
-                $parent = $(this).parent();
-                $parent.removeClass('alert-info');
+                $parent = $(this).parent('div.alert.questionhelp');
+                $parent.removeClass('alert').removeClass('alert-info',1);
+                $parent.addClass('alert-danger',1).addClass('alert');
+
+                if ($parent.hasClass('hide-tip'))
+                {
+                    $parent.removeClass('hide-tip',1);
+                    $parent.addClass('tip-was-hidden',1);
+                }
+
                 $(this).addClass('strong');
-                $parent.addClass('alert-danger');
+
 
             });
+
             $(this).on('classChangeGood', function() {
-                $parent = $(this).parent();
+                $parent = $(this).parents('div.alert.questionhelp');
                 $parent.removeClass('alert-danger');
                 $(this).removeClass('strong');
                 $parent.addClass('alert-info');
+                if ($parent.hasClass('tip-was-hidden'))
+                {
+                    $parent.removeClass('tip-was-hidden').addClass('hide-tip');
+                }
 
             });