More fixes for the help on required fields

diff --git a/lang/en_utf8/form.php b/lang/en_utf8/form.php
index b230ebbb4fb1f990b672bd53f1af34d033f8d888..5985d5722c67b97f5bfc2b2208c40522bca311c0 100644 (file)
--- a/lang/en_utf8/form.php
+++ b/lang/en_utf8/form.php
@@ -1,6 +1,7 @@
 <?PHP // $Id$
 
-$string['denotesreq'] = '$a denotes required field.';
+$string['somefieldsrequired'] = 'There are required fields in this form';
+$string['requiredfield'] = 'This is a required field';
 $string['err_alphanumeric']='You must enter only letters or numbers here.';
 $string['err_email']='You must enter a valid email address here.';
 $string['err_lettersonly']='You must enter only letters here.';
@@ -31,4 +32,4 @@ $string['showadvanced']='Show Advanced';
 $string['timing'] = 'Timing';
 $string['security'] = 'Security';
 $string['display'] = 'Display';
-?>
\ No newline at end of file
+?>

diff --git a/lang/en_utf8/help/requiredelement.html b/lang/en_utf8/help/requiredelement.html
index 491fa714c0f6542cdab7e86a22d80b2b54a4b0a5..672df58bcac5fa80850521f0c483172c6a57c743 100644 (file)
--- a/lang/en_utf8/help/requiredelement.html
+++ b/lang/en_utf8/help/requiredelement.html
@@ -1,5 +1,3 @@
-<p align="center"><strong>Required Element</strong></p>
+<h1>Required Element</h1>
 
-
-
-<p>You need to enter something valid in all fields marked with <img src='<?php echo $CFG->wwwroot ?>/lib/form/req.gif' alt='Required field' />.</p>
+<p>You need to enter something valid in all fields marked as a required field.</p>

diff --git a/lib/formslib.php b/lib/formslib.php
index 246f0333b6acf2b5d95f62dde9b70ded6b8c6ae6..ce4891c16f13b45f070439a7c871212ef107387b 100644 (file)
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -630,12 +630,10 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
         }else {
             $this->updateAttributes(array('class'=>'mform'));
         }
-        $this->_reqHTML = '<img alt="'.get_string('requiredelement', 'form').'" src="'.FORM_REQIMAGEURL.'" />';
-        $this->_advancedHTML = '<img alt="'.get_string('advancedelement', 'form').'" src="'.FORM_ADVANCEDIMAGEURL.'" />';
-        $this->setRequiredNote(get_string('denotesreq', 'form',
-            helpbutton('requiredelement', get_string('requiredelement', 'form'),'moodle',
-                 true, false, '', true, '<img alt="'.get_string('requiredelement', 'form').'" src="'.
-            FORM_REQIMAGEURL.'" />')));
+        $this->_reqHTML = '<img class="req" alt="'.get_string('requiredelement', 'form').'" src="'.FORM_REQIMAGEURL.'" />';
+        $this->_advancedHTML = '<img class="adv" alt="'.get_string('advancedelement', 'form').'" src="'.FORM_ADVANCEDIMAGEURL.'" />';
+        $this->setRequiredNote(get_string('somefieldsrequired', 'form').
+            helpbutton('requiredelement', get_string('requiredelement', 'form'), 'moodle', true, false, '', true));
     }
 
     /**
@@ -1353,7 +1351,7 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
     * @access   private
     */
     var $_requiredNoteTemplate =
-        "\n\t\t<div class=\"fdescription\">{requiredNote}</div>";
+        "\n\t\t<div class=\"fdescription required\">{requiredNote}</div>";
 
     var $_advancedElements = array();
 

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 8b5f0bbf0a3d468b7be09cf9ed8a92e74689cd9f..167861202549536fb142bab59172100cb13ba7b7 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -446,13 +446,16 @@ form#adminsettings div.htmlarea {
   padding-top: 5px;
 }
 
-form.mform .required img {
+form.mform .required img.req {
   display:none;
 }
 
 form.mform .required label {
   color:#a00;
 }
+form.mform .fdescription.required {
+  color:#a00;
+}
 
 
 /***