From 0459cc4d9eee213aaf0900b09a18f29adfc7bb8b Mon Sep 17 00:00:00 2001 From: David Mudrak Date: Mon, 7 Jun 2010 09:56:33 +0000 Subject: [PATCH] MDL-21695 Replaced grade/hidetotalifhiddenitems.html AMOS BEGIN HLP grade/hidetotalifhiddenitems.html,[hidetotalifhiddenitems_help,core_grades] AMOS END --- grade/report/overview/lib.php | 2 +- grade/report/overview/settings.php | 2 +- grade/report/user/lib.php | 2 +- grade/report/user/settings.php | 4 ++-- lang/en/grades.php | 1 - lang/en/help/grade/hidetotalifhiddenitems.html | 4 ---- 6 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 lang/en/help/grade/hidetotalifhiddenitems.html diff --git a/grade/report/overview/lib.php b/grade/report/overview/lib.php index c68d1767d2c..d05b2f0aaeb 100644 --- a/grade/report/overview/lib.php +++ b/grade/report/overview/lib.php @@ -227,7 +227,7 @@ function grade_report_overview_settings_definition(&$mform) { } $mform->addElement('select', 'report_overview_showtotalsifcontainhidden', get_string('hidetotalifhiddenitems', 'grades'), $options); - $mform->setHelpButton('report_overview_showtotalsifcontainhidden', array('hidetotalifhiddenitems', get_string('hidetotalifhiddenitems', 'grades'), 'grade')); + $mform->addHelpButton('report_overview_showtotalsifcontainhidden', 'hidetotalifhiddenitems', 'grades'); } diff --git a/grade/report/overview/settings.php b/grade/report/overview/settings.php index e3d7984137f..1d84f24d8ac 100644 --- a/grade/report/overview/settings.php +++ b/grade/report/overview/settings.php @@ -20,7 +20,7 @@ $settings->add(new admin_setting_configcheckbox('grade_report_overview_showrank', get_string('showrank', 'grades'), get_string('configshowrank', 'grades'), 0, PARAM_INT)); $settings->add(new admin_setting_configselect('grade_report_overview_showtotalsifcontainhidden', get_string('hidetotalifhiddenitems', 'grades'), - get_string('hidetotalifhiddenitemsdescription', 'grades'), GRADE_REPORT_HIDE_TOTAL_IF_CONTAINS_HIDDEN, + get_string('hidetotalifhiddenitems_help', 'grades'), GRADE_REPORT_HIDE_TOTAL_IF_CONTAINS_HIDDEN, array(GRADE_REPORT_HIDE_TOTAL_IF_CONTAINS_HIDDEN => get_string('hide'), GRADE_REPORT_SHOW_TOTAL_IF_CONTAINS_HIDDEN => get_string('hidetotalshowexhiddenitems', 'grades'), GRADE_REPORT_SHOW_REAL_TOTAL_IF_CONTAINS_HIDDEN => get_string('hidetotalshowinchiddenitems', 'grades') ))); diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php index a7433d6c30e..6d7eb83af02 100644 --- a/grade/report/user/lib.php +++ b/grade/report/user/lib.php @@ -478,7 +478,7 @@ function grade_report_user_settings_definition(&$mform) { } $mform->addElement('select', 'report_user_showtotalsifcontainhidden', get_string('hidetotalifhiddenitems', 'grades'), $options); - $mform->setHelpButton('report_user_showtotalsifcontainhidden', array('hidetotalifhiddenitems', get_string('hidetotalifhiddenitems', 'grades'), 'grade')); + $mform->addHelpButton('report_user_showtotalsifcontainhidden', 'hidetotalifhiddenitems', 'grades'); } function grade_report_user_profilereport($course, $user) { diff --git a/grade/report/user/settings.php b/grade/report/user/settings.php index cff9dcb8cf4..fa466523a19 100644 --- a/grade/report/user/settings.php +++ b/grade/report/user/settings.php @@ -26,7 +26,7 @@ $options = array(0 => get_string('shownohidden', 'grades'), $settings->add(new admin_setting_configselect('grade_report_user_showhiddenitems', get_string('showhiddenitems', 'grades'), get_string('configshowhiddenitems', 'grades'), 1, $options)); $settings->add(new admin_setting_configselect('grade_report_user_showtotalsifcontainhidden', get_string('hidetotalifhiddenitems', 'grades'), - get_string('hidetotalifhiddenitemsdescription', 'grades'), GRADE_REPORT_HIDE_TOTAL_IF_CONTAINS_HIDDEN, + get_string('hidetotalifhiddenitems_help', 'grades'), GRADE_REPORT_HIDE_TOTAL_IF_CONTAINS_HIDDEN, array(GRADE_REPORT_HIDE_TOTAL_IF_CONTAINS_HIDDEN => get_string('hide'), GRADE_REPORT_SHOW_TOTAL_IF_CONTAINS_HIDDEN => get_string('hidetotalshowexhiddenitems', 'grades'), - GRADE_REPORT_SHOW_REAL_TOTAL_IF_CONTAINS_HIDDEN => get_string('hidetotalshowinchiddenitems', 'grades')))); \ No newline at end of file + GRADE_REPORT_SHOW_REAL_TOTAL_IF_CONTAINS_HIDDEN => get_string('hidetotalshowinchiddenitems', 'grades')))); diff --git a/lang/en/grades.php b/lang/en/grades.php index 5fd60b1f00b..f359de62b4e 100755 --- a/lang/en/grades.php +++ b/lang/en/grades.php @@ -337,7 +337,6 @@ $string['hidetotalifhiddenitems'] = 'Hide totals if they contain hidden items'; $string['hidetotalifhiddenitems_help'] = 'This setting specifies whether totals which contain hidden grade items are shown to students or replaced with a hyphen (-). If shown, the total may be calculated either excluding or including hidden items. If hidden items are excluded, the total will be different to the total seen by the teacher in the grader report, since the teacher always sees totals calculated from all items, hidden or unhidden. If hidden items are included, students may be able to calculate the hidden items.'; -$string['hidetotalifhiddenitemsdescription'] = 'Whether totals which contain hidden grade items are shown to students (calculated either excluding or including hidden items) or replaced with a hyphen.'; $string['hidetotalshowexhiddenitems'] = 'Show totals excluding hidden items'; $string['hidetotalshowinchiddenitems'] = 'Show totals including hidden items'; $string['hideverbose'] = 'Hide {$a->category} {$a->itemmodule} {$a->itemname}'; diff --git a/lang/en/help/grade/hidetotalifhiddenitems.html b/lang/en/help/grade/hidetotalifhiddenitems.html deleted file mode 100644 index b9cf6fa3d1a..00000000000 --- a/lang/en/help/grade/hidetotalifhiddenitems.html +++ /dev/null @@ -1,4 +0,0 @@ -

Hide totals if they contain hidden items

-

This setting specifies whether totals which contain hidden grade items are shown to students or replaced with a hyphen (-). If shown, the total may be calculated either excluding or including hidden items.

-

If hidden items are excluded, the total will be different to the total seen by the teacher in the grader report, since the teacher always sees totals calculated from all items, hidden or unhidden.

-

If hidden items are included, students may be able to calculate the hidden items.