From b37760fcf84cf7b24d465049475e7e2bddc300f2 Mon Sep 17 00:00:00 2001
From: David Mudrak <david.mudrak@gmail.com>
Date: Mon, 24 May 2010 15:41:05 +0000
Subject: [PATCH] MDL-21695 Replaced grade/droplow.html

AMOS BEGIN
 HLP grade/droplow.html,[droplow_help,core_grades]
AMOS END
---
 admin/settings/grades.php         | 2 +-
 grade/edit/tree/category_form.php | 2 +-
 grade/edit/tree/lib.php           | 2 +-
 lang/en/grades.php                | 1 -
 lang/en/help/grade/droplow.html   | 2 --
 5 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 lang/en/help/grade/droplow.html

diff --git a/admin/settings/grades.php b/admin/settings/grades.php
index 8d93c3fede9..ddab8bdcee3 100644
--- a/admin/settings/grades.php
+++ b/admin/settings/grades.php
@@ -115,7 +115,7 @@ if (has_capability('moodle/grade:manage', $systemcontext)
                     get_string('keephighhelp', 'grades'), $defaults, $options));
         $defaults['forced'] = false;
         $temp->add(new admin_setting_gradecat_combo('grade_droplow', get_string('droplow', 'grades'),
-                    get_string('droplowhelp', 'grades'), $defaults, $options));
+                    get_string('droplow_help', 'grades'), $defaults, $options));
     }
     $ADMIN->add('grades', $temp);
 
diff --git a/grade/edit/tree/category_form.php b/grade/edit/tree/category_form.php
index 7091209a62c..a24bcf3cec8 100644
--- a/grade/edit/tree/category_form.php
+++ b/grade/edit/tree/category_form.php
@@ -91,7 +91,7 @@ class edit_category_form extends moodleform {
         }
 
         $mform->addElement('select', 'droplow', get_string('droplow', 'grades'), $options);
-        $mform->setHelpButton('droplow', array('droplow', get_string('droplow', 'grades'), 'grade'), true);
+        $mform->addHelpButton('droplow', 'droplow', 'grades');
         $mform->disabledIf('droplow', 'keephigh', 'noteq', 0);
         if ((int)$CFG->grade_droplow_flag & 2) {
             $mform->setAdvanced('droplow');
diff --git a/grade/edit/tree/lib.php b/grade/edit/tree/lib.php
index 8e1dd4260ba..60c84d0c89e 100755
--- a/grade/edit/tree/lib.php
+++ b/grade/edit/tree/lib.php
@@ -935,7 +935,7 @@ class grade_edit_tree_column_droplow extends grade_edit_tree_column_category {
     public function get_header_cell() {
         global $OUTPUT;
         $headercell = clone($this->headercell);
-        $headercell->text = get_string('droplow', 'grades').$OUTPUT->old_help_icon('droplow', 'droplow', 'grade');
+        $headercell->text = get_string('droplow', 'grades').$OUTPUT->help_icon('droplow', 'grades');
         return $headercell;
     }
 
diff --git a/lang/en/grades.php b/lang/en/grades.php
index 6bf76b08634..7eac2b192a8 100755
--- a/lang/en/grades.php
+++ b/lang/en/grades.php
@@ -186,7 +186,6 @@ $string['displayweighted'] = 'Display weighted grades';
 $string['dropdown'] = 'Dropdown menu';
 $string['droplow'] = 'Drop the lowest';
 $string['droplow_help'] = 'This setting enables a specified number of the lowest grades to be excluded from the aggregation.';
-$string['droplowhelp'] = 'If set, this option will drop the X lowest grades, X being the selected value for this option.';
 $string['dropped'] = 'Dropped';
 $string['dropxlowest'] = 'Drop X lowest';
 $string['dropxlowestwarning'] = 'Note: If you use drop x lowest the grading assumes that all items in the category have the same point value. If point values differ results will be unpredictable';
diff --git a/lang/en/help/grade/droplow.html b/lang/en/help/grade/droplow.html
deleted file mode 100644
index 136d99915bf..00000000000
--- a/lang/en/help/grade/droplow.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>Drop the lowest</h1>
-<p>If set, this option will drop the X lowest grades, X being the selected value for this option.</p>