MDL-21695 help/grade/aggregateonlygraded.html

AMOS BEGIN
 HLP grade/aggregateonlygraded.html,[aggregateonlygraded_help,core_grades]
AMOS END

admin/settings/grades.php

@@ -97,7 +97,7 @@ if (has_capability('moodle/grade:manage', $systemcontext)
 
         $defaults = array('value'=>1, 'forced'=>false, 'adv'=>true);
         $temp->add(new admin_setting_gradecat_combo('grade_aggregateonlygraded', get_string('aggregateonlygraded', 'grades'),
-                    get_string('aggregateonlygradedhelp', 'grades'), $defaults, $options));
+                    get_string('aggregateonlygraded_help', 'grades'), $defaults, $options));
         $defaults = array('value'=>0, 'forced'=>false, 'adv'=>true);
         $temp->add(new admin_setting_gradecat_combo('grade_aggregateoutcomes', get_string('aggregateoutcomes', 'grades'),
                     get_string('aggregateoutcomeshelp', 'grades'), $defaults, $options));

grade/edit/tree/category_form.php

@@ -53,7 +53,7 @@ class edit_category_form extends moodleform {
         }
 
         $mform->addElement('checkbox', 'aggregateonlygraded', get_string('aggregateonlygraded', 'grades'));
-        $mform->setHelpButton('aggregateonlygraded', array('aggregateonlygraded', get_string('aggregateonlygraded', 'grades'),'grade'), true);
+        $mform->addHelpButton('aggregateonlygraded', 'aggregateonlygraded', 'grades');
         $mform->disabledIf('aggregateonlygraded', 'aggregation', 'eq', GRADE_AGGREGATE_SUM);
 
         if ((int)$CFG->grade_aggregateonlygraded_flag & 2) {

grade/edit/tree/lib.php

@@ -814,7 +814,7 @@ class grade_edit_tree_column_aggregateonlygraded extends grade_edit_tree_column_
         $headercell = clone($this->headercell);
         $headercell->style .= 'width: 40px;';
         $headercell->text = get_string('aggregateonlygraded', 'grades')
-                . $OUTPUT->old_help_icon('aggregateonlygraded', 'aggregateonlygraded', 'grade');
+                . $OUTPUT->help_icon('aggregateonlygraded', 'grade');
         return $headercell;
     }
 

lang/en/grades.php

@@ -44,7 +44,6 @@ $string['aggregateonlygraded'] = 'Aggregate only non-empty grades';
 $string['aggregateonlygraded_help'] = 'An empty grade is a grade which is missing from the gradebook. It may be from an assignment submission which has not yet been graded or from a quiz which has not yet been attempted etc.
 
 This setting determines whether empty grades are not included in the aggregation or are counted as minimal grades, for example 0 for an assignment graded between 0 and 100.';
-$string['aggregateonlygradedhelp'] = 'Nonexistent grades are either treated as minimal grades or not included in aggregation.';
 $string['aggregateoutcomes'] = 'Include outcomes in aggregation';
 $string['aggregateoutcomes_help'] = 'If enabled, outcomes are included in the aggregation. This may result in an unexpected category total.';
 $string['aggregateoutcomeshelp'] = 'Including outcomes in aggregation may not lead to the desired overall grade, so you have the option to include or leave them out.';

lang/en/help/grade/aggregateonlygraded.html

@@ -1,2 +0,0 @@
-<h1>Aggregate only non-empty grades</h1>
-<p>Nonexistent grades are either treated as minimal grades or not included in aggregation.</p>