L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-39265-master-int' of git://github.com/FMCorz/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2013-04-30 15:49:41 +01:00
parent 1af49024a5 9b108a8606
commit 21a6714fc9
3 changed files with 23 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/feedback/lang/en/feedback.php
+11 -20
View File
@@ -26,7 +26,7 @@ $string['add_item'] = 'Add question to activity';
$string['add_items'] = 'Add question to activity';
$string['add_pagebreak'] = 'Add a page break';
$string['adjustment'] = 'Adjustment';
$string['after_submit'] = 'After submitting';
$string['after_submit'] = 'After submission';
$string['allowfullanonymous'] = 'Allow full anonymous';
$string['analysis'] = 'Analysis';
$string['anonymous'] = 'Anonymous';
@@ -34,7 +34,7 @@ $string['anonymous_edit'] = 'Record user names';
$string['anonymous_entries'] = 'Anonymous entries';
$string['anonymous_user'] = 'Anonymous user';
$string['append_new_items'] = 'Append new items';
$string['autonumbering'] = 'Automated numbers';
$string['autonumbering'] = 'Auto number questions';
$string['autonumbering_help'] = 'Enables or disables automated numbers for each question';
$string['average'] = 'Average';
$string['bold'] = 'Bold';
@@ -92,8 +92,7 @@ $string['drop_feedback'] = 'Remove from this course';
$string['edit_item'] = 'Edit question';
$string['edit_items'] = 'Edit questions';
$string['email_notification'] = 'Send e-mail notifications';
$string['emailnotification'] = 'emailnotifications';
$string['emailnotification_help'] = 'If enabled, administrators receive email notification of feedback submissions.';
$string['email_notification_help'] = 'If enabled, administrators receive email notification of feedback submissions.';
$string['emailteachermail'] = '{$a->username} has completed feedback activity : \'{$a->feedback}\'
You can view it here:
@@ -105,8 +104,7 @@ $string['entries_saved'] = 'Your answers have been saved. Thank you.';
$string['export_questions'] = 'Export questions';
$string['export_to_excel'] = 'Export to Excel';
$string['feedback:addinstance'] = 'Add a new feedback';
$string['feedbackclose'] = 'Close the feedback at';
$string['feedbackcloses'] = 'Feedback closes';
$string['feedbackclose'] = 'Allow answers to';
$string['feedback:complete'] = 'Complete a feedback';
$string['feedback:createprivatetemplate'] = 'Create private template';
$string['feedback:createpublictemplate'] = 'Create public template';
@@ -116,9 +114,7 @@ $string['feedback:edititems'] = 'Edit items';
$string['feedback_is_not_for_anonymous'] = 'feedback is not for anonymous';
$string['feedback_is_not_open'] = 'The feedback is not open';
$string['feedback:mapcourse'] = 'Map courses to global feedbacks';
$string['feedbackopen'] = 'Open the feedback at';
$string['feedbackopens'] = 'Feedback opens';
$string['feedback_options'] = 'Feedback options';
$string['feedbackopen'] = 'Allow answers from';
$string['feedback:receivemail'] = 'Receive email notification';
$string['feedback:view'] = 'View a feedback';
$string['feedback:viewanalysepage'] = 'View the analysis page after submit';
@@ -183,8 +179,7 @@ $string['multichoice'] = 'Multiple choice';
$string['multichoicerated'] = 'Multiple choice (rated)';
$string['multichoicetype'] = 'Multiple choice type';
$string['multichoice_values'] = 'Multiple choice values';
$string['multiple_submit'] = 'Multiple submissions';
$string['multiplesubmit'] = 'Multiple submissions';
$string['multiplesubmit'] = 'Allow multiple submissions';
$string['multiplesubmit_help'] = 'If enabled for anonymous surveys, users can submit feedback an unlimited number of times.';
$string['name'] = 'Name';
$string['name_required'] = 'Name required';
@@ -211,7 +206,7 @@ $string['only_one_captcha_allowed'] = 'Only one captcha is allowed in a feedback
$string['overview'] = 'Overview';
$string['page'] = 'Page';
$string['page-mod-feedback-x'] = 'Any feedback module page';
$string['page_after_submit'] = 'Page after submit';
$string['page_after_submit'] = 'Completion message';
$string['pagebreak'] = 'Page break';
$string['parameters_missing'] = 'Parameters missing from';
$string['picture'] = 'Picture';
@@ -225,6 +220,7 @@ $string['preview_help'] = 'In the preview you can change the order of questions.
$string['previous_page'] = 'Previous page';
$string['public'] = 'Public';
$string['question'] = 'Question';
$string['questionandsubmission'] = 'Question and submission settings';
$string['questions'] = 'Questions';
$string['radio'] = 'Multiple choice - single answer';
$string['radiobutton'] = 'Multiple choice - single answer allowed (radio buttons)';
@@ -254,7 +250,7 @@ $string['send_message'] = 'send message';
$string['separator_decimal'] = '.';
$string['separator_thousand'] = ',';
$string['show_all'] = 'Show all';
$string['show_analysepage_after_submit'] = 'Show analysis page after submit';
$string['show_analysepage_after_submit'] = 'Show analysis page';
$string['show_entries'] = 'Show responses';
$string['show_entry'] = 'Show response';
$string['show_nonrespondents'] = 'Show non-respondents';
@@ -278,15 +274,10 @@ $string['textfield_maxlength'] = 'Maximum characters accepted';
$string['textfield_size'] = 'Textfield width';
$string['there_are_no_settings_for_recaptcha'] = 'There are no settings for captcha';
$string['this_feedback_is_already_submitted'] = 'You\'ve already completed this activity.';
$string['timeclose'] = 'Time to close';
$string['timeclose_help'] = 'You can specify times when the feedback is accessible for people to answer the questions. If the checkbox is not ticked there is no limit defined.';
$string['timeopen'] = 'Time to open';
$string['timeopen_help'] = 'You can specify times when the feedback is accessible for people to answer the questions. If the checkbox is not ticked there is no limit defined.';
$string['typemissing'] = 'missing value "type"';
$string['update_item'] = 'Save changes to question';
$string['url_for_continue'] = 'URL for continue-button';
$string['url_for_continue_help'] = 'By default after a feedback is submitted the target of the continue button is the course page. You can define here another target URL for this continue button.';
$string['url_for_continue_button'] = 'URL for continue button';
$string['url_for_continue'] = 'Link to next activity';
$string['url_for_continue_help'] = 'After submitting the feedback, a continue button is displayed, which links to the course page. Alternatively, it may link to the next activity if the URL of the activity is entered here.';
$string['use_one_line_for_each_value'] = '<br />Use one line for each answer!';
$string['use_this_template'] = 'Use this template';
$string['using_templates'] = 'Use a template';
mod/feedback/mod_form.php
+11 -17
View File
@@ -48,7 +48,7 @@ class mod_feedback_mod_form extends moodleform_mod {
$this->add_intro_editor(true, get_string('description', 'feedback'));
//-------------------------------------------------------------------------------
$mform->addElement('header', 'timinghdr', get_string('timing', 'form'));
$mform->addElement('header', 'timinghdr', get_string('availability'));
$enableopengroup = array();
$enableopengroup[] =& $mform->createElement('checkbox',
@@ -62,7 +62,6 @@ class mod_feedback_mod_form extends moodleform_mod {
' ',
false);
$mform->addHelpButton('enableopengroup', 'timeopen', 'feedback');
$mform->disabledIf('enableopengroup', 'openenable', 'notchecked');
$enableclosegroup = array();
@@ -77,11 +76,10 @@ class mod_feedback_mod_form extends moodleform_mod {
' ',
false);
$mform->addHelpButton('enableclosegroup', 'timeclose', 'feedback');
$mform->disabledIf('enableclosegroup', 'closeenable', 'notchecked');
//-------------------------------------------------------------------------------
$mform->addElement('header', 'feedbackhdr', get_string('feedback_options', 'feedback'));
$mform->addElement('header', 'feedbackhdr', get_string('questionandsubmission', 'feedback'));
$options=array();
$options[1] = get_string('anonymous', 'feedback');
@@ -91,16 +89,6 @@ class mod_feedback_mod_form extends moodleform_mod {
get_string('anonymous_edit', 'feedback'),
$options);
$mform->addElement('selectyesno',
'publish_stats',
get_string('show_analysepage_after_submit', 'feedback'));
$mform->addElement('selectyesno',
'email_notification',
get_string('email_notification', 'feedback'));
$mform->addHelpButton('email_notification', 'emailnotification', 'feedback');
// check if there is existing responses to this feedback
if (is_numeric($this->_instance) AND
$this->_instance AND
@@ -115,7 +103,7 @@ class mod_feedback_mod_form extends moodleform_mod {
$multiple_submit_value = $feedback->multiple_submit ? get_string('yes') : get_string('no');
$mform->addElement('text',
'multiple_submit_static',
get_string('multiple_submit', 'feedback'),
get_string('multiplesubmit', 'feedback'),
array('size'=>'4',
'disabled'=>'disabled',
'value'=>$multiple_submit_value));
@@ -126,16 +114,22 @@ class mod_feedback_mod_form extends moodleform_mod {
} else {
$mform->addElement('selectyesno',
'multiple_submit',
get_string('multiple_submit', 'feedback'));
get_string('multiplesubmit', 'feedback'));
$mform->addHelpButton('multiple_submit', 'multiplesubmit', 'feedback');
}
$mform->addElement('selectyesno', 'email_notification', get_string('email_notification', 'feedback'));
$mform->addHelpButton('email_notification', 'email_notification', 'feedback');
$mform->addElement('selectyesno', 'autonumbering', get_string('autonumbering', 'feedback'));
$mform->addHelpButton('autonumbering', 'autonumbering', 'feedback');
//-------------------------------------------------------------------------------
$mform->addElement('header', 'aftersubmithdr', get_string('after_submit', 'feedback'));
$mform->addElement('selectyesno', 'publish_stats', get_string('show_analysepage_after_submit', 'feedback'));
$mform->addElement('editor',
'page_after_submit_editor',
get_string("page_after_submit", "feedback"),
@@ -146,7 +140,7 @@ class mod_feedback_mod_form extends moodleform_mod {
$mform->addElement('text',
'site_after_submit',
get_string('url_for_continue_button', 'feedback'),
get_string('url_for_continue', 'feedback'),
array('size'=>'64', 'maxlength'=>'255'));
$mform->setType('site_after_submit', PARAM_TEXT);
mod/feedback/view.php
+1 -1
View File
@@ -182,7 +182,7 @@ if (has_capability('mod/feedback:edititems', $context)) {
if ($feedback->timeclose) {
echo $OUTPUT->box_start('feedback_info');
echo '<span class="feedback_info">';
echo get_string('timeclose', 'feedback').': ';
echo get_string('feedbackclose', 'feedback').': ';
echo '</span>';
echo '<span class="feedback_info_value">';
echo userdate($feedback->timeclose);