mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-16 14:02:32 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-40687' of git://github.com/rwijaya/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2013-09-11 09:47:41 +12:00
commit b3602b3e5e
16 changed files with 50 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/feedback/analysis.php
View File

@ -80,6 +80,7 @@ $PAGE->navbar->add(get_string('analysis', 'feedback'));
$PAGE->set_heading(format_string($course->fullname));
$PAGE->set_title(format_string($feedback->name));
echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($feedback->name));
/// print the tabs
require('tabs.php');
@ -157,7 +158,7 @@ if ($check_anonymously) {
} else {
echo $OUTPUT->heading_with_help(get_string('insufficient_responses_for_this_group', 'feedback'),
'insufficient_responses',
'feedback');
'feedback', '', '', 3);
}
echo '</td></tr></table></div>';
echo $OUTPUT->box_end();

18
mod/feedback/complete.php
View File

@ -181,11 +181,10 @@ $feedback_is_closed = ($feedback->timeopen > $checktime) OR
$feedback->timeclose > 0);
if ($feedback_is_closed) {
echo $OUTPUT->heading(format_string($feedback->name));
echo $OUTPUT->box_start('generalbox boxaligncenter');
echo '<h2><font color="red">';
echo get_string('feedback_is_not_open', 'feedback');
echo '</font></h2>';
echo $OUTPUT->continue_button($CFG->wwwroot.'/course/view.php?id='.$course->id);
echo $OUTPUT->notification(get_string('feedback_is_not_open', 'feedback'));
echo $OUTPUT->continue_button($CFG->wwwroot.'/course/view.php?id='.$course->id);
echo $OUTPUT->box_end();
echo $OUTPUT->footer();
exit;
@ -356,7 +355,7 @@ if ($feedback_can_submit) {
if ($courseid > 0) {
$analysisurl->param('courseid', $courseid);
}
echo $OUTPUT->heading(format_text($feedback->name));
echo $OUTPUT->heading(format_string($feedback->name));
if ( (intval($feedback->publish_stats) == 1) AND
( has_capability('mod/feedback:viewanalysepage', $context)) AND
@ -591,13 +590,10 @@ if ($feedback_can_submit) {
}
}
} else {
echo $OUTPUT->heading(format_string($feedback->name));
echo $OUTPUT->box_start('generalbox boxaligncenter');
echo '<h2>';
echo '<font color="red">';
echo get_string('this_feedback_is_already_submitted', 'feedback');
echo '</font>';
echo '</h2>';
echo $OUTPUT->continue_button($CFG->wwwroot.'/course/view.php?id='.$course->id);
echo $OUTPUT->notification(get_string('this_feedback_is_already_submitted', 'feedback'));
echo $OUTPUT->continue_button($CFG->wwwroot.'/course/view.php?id='.$course->id);
echo $OUTPUT->box_end();
}
/// Finish the page

12
mod/feedback/complete_guest.php
View File

@ -183,10 +183,8 @@ $feedback_is_closed = ($feedback->timeopen > $checktime) OR
if ($feedback_is_closed) {
echo $OUTPUT->box_start('generalbox boxaligncenter');
echo '<h2><font color="red">';
echo get_string('feedback_is_not_open', 'feedback');
echo '</font></h2>';
echo $OUTPUT->continue_button($CFG->wwwroot.'/course/view.php?id='.$course->id);
echo $OUTPUT->notification(get_string('feedback_is_not_open', 'feedback'));
echo $OUTPUT->continue_button($CFG->wwwroot.'/course/view.php?id='.$course->id);
echo $OUTPUT->box_end();
echo $OUTPUT->footer();
exit;
@ -528,10 +526,8 @@ if ($feedback_can_submit) {
}
} else {
echo $OUTPUT->box_start('generalbox boxaligncenter');
echo '<h2><font color="red">';
echo get_string('this_feedback_is_already_submitted', 'feedback');
echo '</font></h2>';
echo $OUTPUT->continue_button($CFG->wwwroot.'/course/view.php?id='.$course->id);
echo $OUTPUT->notification(get_string('this_feedback_is_already_submitted', 'feedback'));
echo $OUTPUT->continue_button($CFG->wwwroot.'/course/view.php?id='.$course->id);
echo $OUTPUT->box_end();
}
/// Finish the page

4
mod/feedback/delete_completed.php
View File

@ -104,9 +104,9 @@ echo $OUTPUT->header();
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
echo $OUTPUT->heading(format_text($feedback->name));
echo $OUTPUT->heading(format_string($feedback->name));
echo $OUTPUT->box_start('generalbox errorboxcontent boxaligncenter boxwidthnormal');
echo $OUTPUT->heading(get_string('confirmdeleteentry', 'feedback'));
echo html_writer::tag('p', get_string('confirmdeleteentry', 'feedback'), array('class' => 'bold'));
$mform->display();
echo $OUTPUT->box_end();

4
mod/feedback/delete_item.php
View File

@ -79,9 +79,9 @@ echo $OUTPUT->header();
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
echo $OUTPUT->heading(format_text($feedback->name));
echo $OUTPUT->heading(format_string($feedback->name));
echo $OUTPUT->box_start('generalbox errorboxcontent boxaligncenter boxwidthnormal');
echo $OUTPUT->heading(get_string('confirmdeleteitem', 'feedback'));
echo html_writer::tag('p', get_string('confirmdeleteitem', 'feedback'), array('class' => 'bold'));
print_string('relateditemsdeleted', 'feedback');
$mform->display();
echo $OUTPUT->box_end();

10
mod/feedback/delete_template.php
View File

@ -110,7 +110,7 @@ $strdeletefeedback = get_string('delete_template', 'feedback');
$PAGE->set_heading(format_string($course->fullname));
$PAGE->set_title(format_string($feedback->name));
echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($feedback->name));
/// print the tabs
require('tabs.php');
@ -118,11 +118,11 @@ require('tabs.php');
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
echo $OUTPUT->heading($strdeletefeedback);
echo $OUTPUT->heading($strdeletefeedback, 3);
if ($shoulddelete == 1) {
echo $OUTPUT->box_start('generalbox errorboxcontent boxaligncenter boxwidthnormal');
echo $OUTPUT->heading(get_string('confirmdeletetemplate', 'feedback'));
echo html_writer::tag('p', get_string('confirmdeletetemplate', 'feedback'), array('class' => 'bold'));
$mform->display();
echo $OUTPUT->box_end();
} else {
@ -132,7 +132,7 @@ if ($shoulddelete == 1) {
echo $OUTPUT->box(get_string('no_templates_available_yet', 'feedback'),
'generalbox boxaligncenter');
} else {
echo $OUTPUT->heading(get_string('course'), 3);
echo $OUTPUT->heading(get_string('course'), 4);
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal');
$tablecolumns = array('template', 'action');
$tableheaders = array(get_string('template', 'feedback'), '');
@ -172,7 +172,7 @@ if ($shoulddelete == 1) {
echo $OUTPUT->box(get_string('no_templates_available_yet', 'feedback'),
'generalbox boxaligncenter');
} else {
echo $OUTPUT->heading(get_string('public', 'feedback'), 3);
echo $OUTPUT->heading(get_string('public', 'feedback'), 4);
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal');
$tablecolumns = array('template', 'action');
$tableheaders = array(get_string('template', 'feedback'), '');

3
mod/feedback/edit.php
View File

@ -172,6 +172,7 @@ if (count($feedbackitems) > 1) {
}
echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($feedback->name));
/// print the tabs
require('tabs.php');
@ -245,7 +246,7 @@ if ($do_show == 'edit') {
$helpbutton = $OUTPUT->help_icon('preview', 'feedback');
echo $OUTPUT->heading($helpbutton . get_string('preview', 'feedback'));
echo $OUTPUT->heading(get_string('preview', 'feedback').$helpbutton, 3);
if (isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->shouldmoving == 1) {
$anker = '<a href="edit.php?id='.$id.'">';
$anker .= get_string('cancel_moving', 'feedback');

7
mod/feedback/edit_item.php
View File

@ -125,10 +125,13 @@ if ($item->id) {
$PAGE->set_heading(format_string($course->fullname));
$PAGE->set_title(format_string($feedback->name));
echo $OUTPUT->header();
// Print the main part of the page.
echo $OUTPUT->heading(format_string($feedback->name));
/// print the tabs
require('tabs.php');
/// Print the main part of the page
echo $OUTPUT->heading(format_text($feedback->name));
//print errormsg
if (isset($error)) {
echo $error;

4
mod/feedback/import.php
View File

@ -95,7 +95,7 @@ $strfeedback = get_string("modulename", "feedback");
$PAGE->set_heading(format_string($course->fullname));
$PAGE->set_title(format_string($feedback->name));
echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($feedback->name));
/// print the tabs
require('tabs.php');
@ -103,7 +103,7 @@ require('tabs.php');
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
echo $OUTPUT->heading(get_string('import_questions', 'feedback'));
echo $OUTPUT->heading(get_string('import_questions', 'feedback'), 3);
if (isset($importerror->msg) AND is_array($importerror->msg)) {
echo $OUTPUT->box_start('generalbox errorboxcontent boxaligncenter');

1
mod/feedback/index.php
View File

@ -51,6 +51,7 @@ $PAGE->navbar->add($strfeedbacks);
$PAGE->set_heading(format_string($course->fullname));
$PAGE->set_title(get_string('modulename', 'feedback').' '.get_string('activities'));
echo $OUTPUT->header();
echo $OUTPUT->heading($strfeedbacks);
/// Get all the appropriate data

3
mod/feedback/mapcourse.php
View File

@ -87,6 +87,7 @@ $strfeedback = get_string("modulename", "feedback");
$PAGE->set_heading(format_string($course->fullname));
$PAGE->set_title(format_string($feedback->name));
echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($feedback->name));
require('tabs.php');
@ -144,7 +145,7 @@ if ($coursemap = feedback_get_courses_from_sitecourse_map($feedback->id)) {
$table->print_html();
} else {
echo '<h3>'.get_string('mapcoursenone', 'feedback').'</h3>';
echo $OUTPUT->heading(get_string('mapcoursenone', 'feedback'), 3);
}

1
mod/feedback/show_entries.php
View File

@ -92,6 +92,7 @@ $strfeedback = get_string("modulename", "feedback");
$PAGE->set_heading(format_string($course->fullname));
$PAGE->set_title(format_string($feedback->name));
echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($feedback->name));
require('tabs.php');

3
mod/feedback/show_entries_anonym.php
View File

@ -65,6 +65,7 @@ $strfeedback = get_string("modulename", "feedback");
$PAGE->set_heading(format_string($course->fullname));
$PAGE->set_title(format_string($feedback->name));
echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($feedback->name));
/// Print the main part of the page
///////////////////////////////////////////////////////////////////////////
@ -72,8 +73,6 @@ echo $OUTPUT->header();
///////////////////////////////////////////////////////////////////////////
require('tabs.php');
echo $OUTPUT->heading(format_text($feedback->name));
//print the list with anonymous completeds
if (!$showcompleted) {

4
mod/feedback/use_templ.php
View File

@ -90,10 +90,10 @@ echo $OUTPUT->header();
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
echo $OUTPUT->heading(format_text($feedback->name));
echo $OUTPUT->heading(format_string($feedback->name));
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal');
echo $OUTPUT->heading(get_string('confirmusetemplate', 'feedback'));
echo $OUTPUT->heading(get_string('confirmusetemplate', 'feedback'), 3);
$mform->display();

2
mod/feedback/use_templ_form.php
View File

@ -33,7 +33,7 @@ class mod_feedback_use_templ_form extends moodleform {
$mform =& $this->_form;
//headline
$mform->addElement('header', 'general', '');
$mform->addElement('header', 'general', get_string('general', 'form'));
// visible elements
$mform->addElement('radio', 'deleteolditems', '1)', get_string('delete_old_items', 'feedback'), 1);

23
mod/feedback/view.php
View File

@ -132,13 +132,14 @@ if ((empty($cm->visible) and !$cap_viewhiddenactivities) AND $courseid == SITEID
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
/// print the tabs
require('tabs.php');
$previewimg = $OUTPUT->pix_icon('t/preview', get_string('preview'));
$previewlnk = '<a href="'.$CFG->wwwroot.'/mod/feedback/print.php?id='.$id.'">'.$previewimg.'</a>';
$previewlnk = new moodle_url('/mod/feedback/print.php', array('id' => $id));
$preview = html_writer::link($previewlnk, $previewimg);
echo $OUTPUT->heading(format_text($feedback->name.' '.$previewlnk));
echo $OUTPUT->heading(format_string($feedback->name) . $preview);
// Print the tabs.
require('tabs.php');
//show some infos to the feedback
if (has_capability('mod/feedback:edititems', $context)) {
@ -193,9 +194,9 @@ if (has_capability('mod/feedback:edititems', $context)) {
}
if (has_capability('mod/feedback:edititems', $context)) {
echo $OUTPUT->heading(get_string('description', 'feedback'), 4);
echo $OUTPUT->heading(get_string('description', 'feedback'), 3);
}
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
echo $OUTPUT->box_start('generalbox boxwidthwide');
$options = (object)array('noclean'=>true);
echo format_module_intro('feedback', $feedback, $cm->id);
echo $OUTPUT->box_end();
@ -210,7 +211,7 @@ if (has_capability('mod/feedback:edititems', $context)) {
'page_after_submit',
0);
echo $OUTPUT->heading(get_string("page_after_submit", "feedback"), 4);
echo $OUTPUT->heading(get_string("page_after_submit", "feedback"), 3);
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
echo format_text($page_after_submit_output,
$feedback->page_after_submitformat,
@ -261,7 +262,7 @@ if ($feedback_complete_cap) {
if (($feedback->timeopen > $checktime) OR
($feedback->timeclose < $checktime AND $feedback->timeclose > 0)) {
echo '<h2><font color="red">'.get_string('feedback_is_not_open', 'feedback').'</font></h2>';
echo $OUTPUT->notification(get_string('feedback_is_not_open', 'feedback'));
echo $OUTPUT->continue_button($CFG->wwwroot.'/course/view.php?id='.$course->id);
echo $OUTPUT->box_end();
echo $OUTPUT->footer();
@ -297,9 +298,7 @@ if ($feedback_complete_cap) {
echo '<a href="'.$completeurl->out().'">'.get_string('complete_the_form', 'feedback').'</a>';
}
} else {
echo '<h2><font color="red">';
echo get_string('this_feedback_is_already_submitted', 'feedback');
echo '</font></h2>';
echo $OUTPUT->notification(get_string('this_feedback_is_already_submitted', 'feedback'));
if ($courseid) {
echo $OUTPUT->continue_button($CFG->wwwroot.'/course/view.php?id='.$courseid);
} else {