From e66841b9e6bebbc1650fab01902bd65bcf3c519c Mon Sep 17 00:00:00 2001 From: David Mudrak Date: Thu, 29 Apr 2010 23:12:13 +0000 Subject: [PATCH] MDL-21695 Assignment module now uses new help strings AMOS BEGIN HLP assignment/allowdeleting.html,[allowdeleting_help,mod_assignment] HLP assignment/allowmaxfiles.html,[allowmaxfiles_help,mod_assignment] HLP assignment/allownotes.html,[allownotes_help,mod_assignment] HLP assignment/commentinline.html,[commentinline_help,mod_assignment] HLP assignment/emailnotification.html,[enableemailnotification_help,mod_assignment] HLP assignment/emailteachers.html,[emailteachers_help,mod_assignment] HLP assignment/hideintro.html,[hideintro_help,mod_assignment] HLP assignment/mods.html,[modulename_help,mod_assignment] HLP assignment/pagesize.html,[pagesize_help,mod_assignment] HLP assignment/quickgrade.html,[quickgrade_help,mod_assignment] HLP assignment/resubmit.html,[allowresubmit_help,mod_assignment] HLP assignment/trackdrafts.html,[trackdrafts_help,mod_assignment] AMOS END --- lang/en/help/assignment/pagesize.html | 6 ----- mod/assignment/lang/en/assignment.php | 3 ++- mod/assignment/lib.php | 8 +++---- .../type/online/assignment.class.php | 12 +++++----- .../type/upload/assignment.class.php | 24 +++++++++---------- .../type/uploadsingle/assignment.class.php | 8 +++---- 6 files changed, 28 insertions(+), 33 deletions(-) delete mode 100644 lang/en/help/assignment/pagesize.html diff --git a/lang/en/help/assignment/pagesize.html b/lang/en/help/assignment/pagesize.html deleted file mode 100644 index 11614034e6e..00000000000 --- a/lang/en/help/assignment/pagesize.html +++ /dev/null @@ -1,6 +0,0 @@ -

Page size

- -

Enter a number to specify how many submissions you want to see on one page.

- -

Your preference is saved and will apply to all assignments in all courses.

- diff --git a/mod/assignment/lang/en/assignment.php b/mod/assignment/lang/en/assignment.php index 57acbce1f41..e81c11b21b2 100644 --- a/mod/assignment/lang/en/assignment.php +++ b/mod/assignment/lang/en/assignment.php @@ -129,8 +129,8 @@ $string['maximumgrade'] = 'Maximum grade'; $string['maximumsize'] = 'Maximum size'; $string['maxpublishstate'] = 'Maximum visibility for blog entry before due date'; $string['modulename'] = 'Assignment'; +$string['modulename_help'] = 'Assignments enable the teacher to specify a task either on or offline which can then be graded.'; $string['modulenameplural'] = 'Assignments'; -$string['modulenameplural_help'] = 'Assignments enable the teacher to specify a task either on or offline which can then be graded.'; $string['newsubmissions'] = 'Assignments submitted'; $string['noassignments'] = 'There are no assignments yet'; $string['noattempts'] = 'No attempts have been made on this assignment'; @@ -148,6 +148,7 @@ $string['notsubmittedyet'] = 'Not submitted yet'; $string['onceassignmentsent'] = 'Once the assignment is sent for marking, you will no longer be able to delete or attach file(s). Do you want to continue?'; $string['overwritewarning'] = 'Warning: uploading again will REPLACE your current submission'; $string['pagesize'] = 'Submissions shown per page'; +$string['pagesize_help'] = 'Enter a number to specify how many submissions you want to see on one page. Your preference is saved and will apply to all assignments in all courses.'; $string['preventlate'] = 'Prevent late submissions'; $string['quickgrade'] = 'Allow quick grading'; $string['quickgrade_help'] = 'If enabled, multiple assignments can be graded on one page. Add grades and comments then click the "Save all my feedback" button to save all changes for that page.'; diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index 152e256d198..424f3941c90 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -1404,7 +1404,7 @@ class assignment_base { echo ''; echo ''; echo ''; - echo $OUTPUT->old_help_icon('emailnotification', get_string('enableemailnotification', 'assignment'), 'assignment').'

'; + echo $OUTPUT->help_icon('enableemailnotification', 'assignment').'

'; echo ''; echo '
'; echo ''; @@ -1422,7 +1422,7 @@ class assignment_base { echo ''; echo ''; echo ''; - echo $OUTPUT->old_help_icon('pagesize', get_string('pagesize','assignment'), 'assignment'); + echo $OUTPUT->help_icon('pagesize', 'assignment'); echo ''; echo ''; echo ''; @@ -1430,7 +1430,7 @@ class assignment_base { echo ''; $checked = $quickgrade ? 'checked="checked"' : ''; echo ''; - echo $OUTPUT->old_help_icon('quickgrade', get_string('quickgrade', 'assignment'), 'assignment').'

'; + echo $OUTPUT->help_icon('quickgrade', 'assignment').'

'; echo ''; echo ''; echo ''; @@ -3467,4 +3467,4 @@ function assignment_get_file_info($browser, $areas, $course, $cm, $context, $fil $fs = get_file_storage(); $files = $fs->get_area_files($context->id, $filearea); return $files; -} \ No newline at end of file +} diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php index 236bcbf4230..9f8a932a370 100644 --- a/mod/assignment/type/online/assignment.class.php +++ b/mod/assignment/type/online/assignment.class.php @@ -263,16 +263,16 @@ class assignment_online extends assignment_base { $ynoptions = array( 0 => get_string('no'), 1 => get_string('yes')); - $mform->addElement('select', 'resubmit', get_string("allowresubmit", "assignment"), $ynoptions); - $mform->setHelpButton('resubmit', array('resubmit', get_string('allowresubmit', 'assignment'), 'assignment')); + $mform->addElement('select', 'resubmit', get_string('allowresubmit', 'assignment'), $ynoptions); + $mform->addHelpButton('resubmit', 'allowresubmit', 'assignment'); $mform->setDefault('resubmit', 0); - $mform->addElement('select', 'emailteachers', get_string("emailteachers", "assignment"), $ynoptions); - $mform->setHelpButton('emailteachers', array('emailteachers', get_string('emailteachers', 'assignment'), 'assignment')); + $mform->addElement('select', 'emailteachers', get_string('emailteachers', 'assignment'), $ynoptions); + $mform->addHelpButton('emailteachers', 'emailteachers', 'assignment'); $mform->setDefault('emailteachers', 0); - $mform->addElement('select', 'var1', get_string("commentinline", "assignment"), $ynoptions); - $mform->setHelpButton('var1', array('commentinline', get_string('commentinline', 'assignment'), 'assignment')); + $mform->addElement('select', 'var1', get_string('commentinline', 'assignment'), $ynoptions); + $mform->addHelpButton('var1', 'commentinline', 'assignment'); $mform->setDefault('var1', 0); } diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php index 82319e71b57..0aff87e43ec 100644 --- a/mod/assignment/type/upload/assignment.class.php +++ b/mod/assignment/type/upload/assignment.class.php @@ -1032,32 +1032,32 @@ class assignment_upload extends assignment_base { $mform->addElement('select', 'maxbytes', get_string('maximumsize', 'assignment'), $choices); $mform->setDefault('maxbytes', $CFG->assignment_maxbytes); - $mform->addElement('select', 'resubmit', get_string("allowdeleting", "assignment"), $ynoptions); - $mform->setHelpButton('resubmit', array('allowdeleting', get_string('allowdeleting', 'assignment'), 'assignment')); + $mform->addElement('select', 'resubmit', get_string('allowdeleting', 'assignment'), $ynoptions); + $mform->addHelpButton('resubmit', 'allowdeleting', 'assignment'); $mform->setDefault('resubmit', 1); $options = array(); for($i = 1; $i <= 20; $i++) { $options[$i] = $i; } - $mform->addElement('select', 'var1', get_string("allowmaxfiles", "assignment"), $options); - $mform->setHelpButton('var1', array('allowmaxfiles', get_string('allowmaxfiles', 'assignment'), 'assignment')); + $mform->addElement('select', 'var1', get_string('allowmaxfiles', 'assignment'), $options); + $mform->addHelpButton('var1', 'allowmaxfiles', 'assignment'); $mform->setDefault('var1', 3); - $mform->addElement('select', 'var2', get_string("allownotes", "assignment"), $ynoptions); - $mform->setHelpButton('var2', array('allownotes', get_string('allownotes', 'assignment'), 'assignment')); + $mform->addElement('select', 'var2', get_string('allownotes', 'assignment'), $ynoptions); + $mform->addHelpButton('var2', 'allownotes', 'assignment'); $mform->setDefault('var2', 0); - $mform->addElement('select', 'var3', get_string("hideintro", "assignment"), $ynoptions); - $mform->setHelpButton('var3', array('hideintro', get_string('hideintro', 'assignment'), 'assignment')); + $mform->addElement('select', 'var3', get_string('hideintro', 'assignment'), $ynoptions); + $mform->addHelpButton('var3', 'hideintro', 'assignment'); $mform->setDefault('var3', 0); - $mform->addElement('select', 'emailteachers', get_string("emailteachers", "assignment"), $ynoptions); - $mform->setHelpButton('emailteachers', array('emailteachers', get_string('emailteachers', 'assignment'), 'assignment')); + $mform->addElement('select', 'emailteachers', get_string('emailteachers', 'assignment'), $ynoptions); + $mform->addHelpButton('emailteachers', 'emailteachers', 'assignment'); $mform->setDefault('emailteachers', 0); - $mform->addElement('select', 'var4', get_string("trackdrafts", "assignment"), $ynoptions); - $mform->setHelpButton('var4', array('trackdrafts', get_string('trackdrafts', 'assignment'), 'assignment')); + $mform->addElement('select', 'var4', get_string('trackdrafts', 'assignment'), $ynoptions); + $mform->addHelpButton('var4', 'trackdrafts', 'assignment'); $mform->setDefault('var4', 1); } diff --git a/mod/assignment/type/uploadsingle/assignment.class.php b/mod/assignment/type/uploadsingle/assignment.class.php index 5b4eac8f297..f738763978c 100644 --- a/mod/assignment/type/uploadsingle/assignment.class.php +++ b/mod/assignment/type/uploadsingle/assignment.class.php @@ -140,12 +140,12 @@ class assignment_uploadsingle extends assignment_base { $ynoptions = array( 0 => get_string('no'), 1 => get_string('yes')); - $mform->addElement('select', 'resubmit', get_string("allowresubmit", "assignment"), $ynoptions); - $mform->setHelpButton('resubmit', array('resubmit', get_string('allowresubmit', 'assignment'), 'assignment')); + $mform->addElement('select', 'resubmit', get_string('allowresubmit', 'assignment'), $ynoptions); + $mform->addHelpButton('resubmit', 'allowresubmit', 'assignment'); $mform->setDefault('resubmit', 0); - $mform->addElement('select', 'emailteachers', get_string("emailteachers", "assignment"), $ynoptions); - $mform->setHelpButton('emailteachers', array('emailteachers', get_string('emailteachers', 'assignment'), 'assignment')); + $mform->addElement('select', 'emailteachers', get_string('emailteachers', 'assignment'), $ynoptions); + $mform->addHelpButton('emailteachers', 'emailteachers', 'assignment'); $mform->setDefault('emailteachers', 0); $choices = get_max_upload_sizes($CFG->maxbytes, $COURSE->maxbytes);