From 846cebe5b397b587ef32800d6f378d06b6371e25 Mon Sep 17 00:00:00 2001 From: Rossiani Wijaya Date: Mon, 2 Sep 2013 16:07:27 +0800 Subject: [PATCH] MDL-40687 Feedback: improve page heading levels and layouts --- mod/feedback/analysis.php | 3 ++- mod/feedback/complete.php | 18 +++++++----------- mod/feedback/complete_guest.php | 12 ++++-------- mod/feedback/delete_completed.php | 4 ++-- mod/feedback/delete_item.php | 4 ++-- mod/feedback/delete_template.php | 10 +++++----- mod/feedback/edit.php | 3 ++- mod/feedback/edit_item.php | 7 +++++-- mod/feedback/import.php | 4 ++-- mod/feedback/index.php | 1 + mod/feedback/mapcourse.php | 3 ++- mod/feedback/show_entries.php | 1 + mod/feedback/show_entries_anonym.php | 3 +-- mod/feedback/use_templ.php | 4 ++-- mod/feedback/use_templ_form.php | 2 +- mod/feedback/view.php | 23 +++++++++++------------ 16 files changed, 50 insertions(+), 52 deletions(-) diff --git a/mod/feedback/analysis.php b/mod/feedback/analysis.php index 02a8d39f3da..32f8504734d 100644 --- a/mod/feedback/analysis.php +++ b/mod/feedback/analysis.php @@ -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 ''; echo $OUTPUT->box_end(); diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php index d4dc00b0014..0d57c66cbe2 100644 --- a/mod/feedback/complete.php +++ b/mod/feedback/complete.php @@ -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 '

'; - echo get_string('feedback_is_not_open', 'feedback'); - echo '

'; - 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 '

'; - echo ''; - echo get_string('this_feedback_is_already_submitted', 'feedback'); - echo ''; - echo '

'; - 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 diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php index 695cf413330..8dd15713638 100644 --- a/mod/feedback/complete_guest.php +++ b/mod/feedback/complete_guest.php @@ -183,10 +183,8 @@ $feedback_is_closed = ($feedback->timeopen > $checktime) OR if ($feedback_is_closed) { echo $OUTPUT->box_start('generalbox boxaligncenter'); - echo '

'; - echo get_string('feedback_is_not_open', 'feedback'); - echo '

'; - 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 '

'; - echo get_string('this_feedback_is_already_submitted', 'feedback'); - echo '

'; - 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 diff --git a/mod/feedback/delete_completed.php b/mod/feedback/delete_completed.php index d5eacb43a7f..c35b8f7fe08 100644 --- a/mod/feedback/delete_completed.php +++ b/mod/feedback/delete_completed.php @@ -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(); diff --git a/mod/feedback/delete_item.php b/mod/feedback/delete_item.php index d0840fb17b4..7ecf9866428 100644 --- a/mod/feedback/delete_item.php +++ b/mod/feedback/delete_item.php @@ -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(); diff --git a/mod/feedback/delete_template.php b/mod/feedback/delete_template.php index de240d81cdf..b68c5c56eaf 100644 --- a/mod/feedback/delete_template.php +++ b/mod/feedback/delete_template.php @@ -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'), ''); diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php index f8af903bb90..0b0921312cc 100644 --- a/mod/feedback/edit.php +++ b/mod/feedback/edit.php @@ -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 = ''; $anker .= get_string('cancel_moving', 'feedback'); diff --git a/mod/feedback/edit_item.php b/mod/feedback/edit_item.php index 8a7a3048e84..20425c4413a 100644 --- a/mod/feedback/edit_item.php +++ b/mod/feedback/edit_item.php @@ -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; diff --git a/mod/feedback/import.php b/mod/feedback/import.php index 5678f98e1be..cbc3f251e78 100644 --- a/mod/feedback/import.php +++ b/mod/feedback/import.php @@ -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'); diff --git a/mod/feedback/index.php b/mod/feedback/index.php index a1a42ff9cbb..5262d9c7e38 100644 --- a/mod/feedback/index.php +++ b/mod/feedback/index.php @@ -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 diff --git a/mod/feedback/mapcourse.php b/mod/feedback/mapcourse.php index ba33874b9cd..57bf2662ceb 100644 --- a/mod/feedback/mapcourse.php +++ b/mod/feedback/mapcourse.php @@ -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 '

'.get_string('mapcoursenone', 'feedback').'

'; + echo $OUTPUT->heading(get_string('mapcoursenone', 'feedback'), 3); } diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php index dceb7fb52c6..b698c3709ea 100644 --- a/mod/feedback/show_entries.php +++ b/mod/feedback/show_entries.php @@ -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'); diff --git a/mod/feedback/show_entries_anonym.php b/mod/feedback/show_entries_anonym.php index bf69bf39268..8f21ac16bde 100644 --- a/mod/feedback/show_entries_anonym.php +++ b/mod/feedback/show_entries_anonym.php @@ -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) { diff --git a/mod/feedback/use_templ.php b/mod/feedback/use_templ.php index 12f62cea3ac..be562f5cd69 100644 --- a/mod/feedback/use_templ.php +++ b/mod/feedback/use_templ.php @@ -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(); diff --git a/mod/feedback/use_templ_form.php b/mod/feedback/use_templ_form.php index c4839914ef2..30ee9c41ce1 100644 --- a/mod/feedback/use_templ_form.php +++ b/mod/feedback/use_templ_form.php @@ -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); diff --git a/mod/feedback/view.php b/mod/feedback/view.php index c16fdcdd17e..bffc6f40849 100644 --- a/mod/feedback/view.php +++ b/mod/feedback/view.php @@ -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 = ''.$previewimg.''; +$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 '

'.get_string('feedback_is_not_open', 'feedback').'

'; + 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 ''.get_string('complete_the_form', 'feedback').''; } } else { - echo '

'; - echo get_string('this_feedback_is_already_submitted', 'feedback'); - echo '

'; + 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 {