Fixed issue 8137: Relevance equation cannot be edited for unknown rea…

…sons
LimeSurvey · Sep 23, 2013 · de373cd · de373cd · Shnoulle · Sep 24, 2013
1 parent 3ebae0a
commit de373cd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/application/views/admin/survey/Question/editQuestion_view.php b/application/views/admin/survey/Question/editQuestion_view.php
@@ -227,11 +227,10 @@
                 </li>
                 <li>
                     <label for='relevance'><?php $clang->eT("Relevance equation:"); ?></label>
-                    <textarea cols='50' rows='1' id='relevance' name='relevance' 
-                    <?php if($eqrow['conditions_number']){ ?> 
-                    readonly='readonly' title='<?php $clang->eT("This question has one or more conditions. Delete them before edit the equation relevance."); ?>' 
-                    <?php } ?>
-                    ><?php echo $eqrow['relevance']; ?></textarea>
+                    <textarea cols='50' rows='1' id='relevance' name='relevance' <?php if ($eqrow['conditions_number']) {?> readonly='readonly'<?php } ?>><?php echo $eqrow['relevance']; ?></textarea>
+                     <?php if ($eqrow['conditions_number']) {?>
+                        <span class='annotation'> <?php $clang->eT("Note: You can't edit the relevance equation because there are currently conditions set for this question."); ?></span>
+                     <?php } ?>
                 </li>
 
                 <li id='Validation'>

diff --git a/styles/blobblueish/adminstyle.css b/styles/blobblueish/adminstyle.css
@@ -385,6 +385,7 @@ input[disabled], textarea[disabled], select[disabled], button[disabled] {
 .annotation {
     font-size: 10px;
     color: #E00;
+    vertical-align: top;
 }
 
 .errortitle {

diff --git a/styles/gringegreen/adminstyle.css b/styles/gringegreen/adminstyle.css
@@ -395,6 +395,7 @@ textarea {
 .annotation {
     font-size: 10px;
     color: #FF9D00;
+    vertical-align: top;    
 }
 
 .errortitle {