MDL-45046 output: reviewed standard/base layouts and converted where a better option was available

This commit is contained in:
Sam Hemelryk 2014-04-06 15:57:32 +12:00
parent b576ff3914
commit 8758bd7ccc
17 changed files with 18 additions and 19 deletions

View file

@ -12,7 +12,7 @@ list($context, $course, $cm) = get_context_info_array($contextid);
navigation_node::override_active_url(new moodle_url('/backup/restorefile.php', array('contextid'=>$contextid))); navigation_node::override_active_url(new moodle_url('/backup/restorefile.php', array('contextid'=>$contextid)));
$PAGE->set_url(new moodle_url('/backup/restore.php', array('contextid'=>$contextid))); $PAGE->set_url(new moodle_url('/backup/restore.php', array('contextid'=>$contextid)));
$PAGE->set_context($context); $PAGE->set_context($context);
$PAGE->set_pagelayout('standard'); $PAGE->set_pagelayout('admin');
require_login($course, null, $cm); require_login($course, null, $cm);
require_capability('moodle/restore:restorecourse', $context); require_capability('moodle/restore:restorecourse', $context);

View file

@ -59,7 +59,7 @@ $currenturl = new moodle_url('/badges/edit.php', array('id' => $badge->id, 'acti
$PAGE->set_context($context); $PAGE->set_context($context);
$PAGE->set_url($currenturl); $PAGE->set_url($currenturl);
$PAGE->set_pagelayout('standard'); $PAGE->set_pagelayout('admin');
$PAGE->set_heading($badge->name); $PAGE->set_heading($badge->name);
$PAGE->set_title($badge->name); $PAGE->set_title($badge->name);

View file

@ -76,7 +76,7 @@ $page = get_string('completionprogressdetails', 'block_completionstatus');
$title = format_string($course->fullname) . ': ' . $page; $title = format_string($course->fullname) . ': ' . $page;
$PAGE->navbar->add($page); $PAGE->navbar->add($page);
$PAGE->set_pagelayout('standard'); $PAGE->set_pagelayout('report');
$PAGE->set_url('/blocks/completionstatus/details.php', array('course' => $course->id, 'user' => $user->id)); $PAGE->set_url('/blocks/completionstatus/details.php', array('course' => $course->id, 'user' => $user->id));
$PAGE->set_title(get_string('course') . ': ' . $course->fullname); $PAGE->set_title(get_string('course') . ': ' . $course->fullname);
$PAGE->set_heading($title); $PAGE->set_heading($title);

View file

@ -177,7 +177,7 @@ if ($returnurl) {
$managefeeds = new moodle_url('/blocks/rss_client/managefeeds.php', $urlparams); $managefeeds = new moodle_url('/blocks/rss_client/managefeeds.php', $urlparams);
$PAGE->set_url('/blocks/rss_client/editfeed.php', $urlparams); $PAGE->set_url('/blocks/rss_client/editfeed.php', $urlparams);
$PAGE->set_pagelayout('standard'); $PAGE->set_pagelayout('admin');
if ($rssid) { if ($rssid) {
$isadding = false; $isadding = false;

View file

@ -44,7 +44,7 @@ if ($id !== null) {
} }
$PAGE->set_url($url); $PAGE->set_url($url);
$PAGE->set_context($context); $PAGE->set_context($context);
$PAGE->set_pagelayout('standard'); $PAGE->set_pagelayout('admin');
$returnurl = new moodle_url('/blog/external_blogs.php'); $returnurl = new moodle_url('/blog/external_blogs.php');

View file

@ -53,7 +53,7 @@ if ($groupid !== null) {
} }
$PAGE->set_url($url); $PAGE->set_url($url);
$PAGE->set_pagelayout('standard'); $PAGE->set_pagelayout('admin');
$sitecontext = context_system::instance(); $sitecontext = context_system::instance();
$PAGE->set_context($sitecontext); $PAGE->set_context($sitecontext);

View file

@ -78,7 +78,7 @@ if ($cal_d !== 0) {
$url->param('cal_d', $cal_d); $url->param('cal_d', $cal_d);
} }
$PAGE->set_url($url); $PAGE->set_url($url);
$PAGE->set_pagelayout('standard'); $PAGE->set_pagelayout('admin');
if ($courseid != SITEID && !empty($courseid)) { if ($courseid != SITEID && !empty($courseid)) {
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST); $course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);

View file

@ -41,7 +41,7 @@ if ($courseid != SITEID) {
} }
navigation_node::override_active_url(new moodle_url('/calendar/view.php', array('view' => 'month'))); navigation_node::override_active_url(new moodle_url('/calendar/view.php', array('view' => 'month')));
$PAGE->set_url($url); $PAGE->set_url($url);
$PAGE->set_pagelayout('standard'); $PAGE->set_pagelayout('admin');
$PAGE->navbar->add(get_string('managesubscriptions', 'calendar')); $PAGE->navbar->add(get_string('managesubscriptions', 'calendar'));
if ($courseid != SITEID && !empty($courseid)) { if ($courseid != SITEID && !empty($courseid)) {

View file

@ -65,7 +65,7 @@ $PAGE->set_course($course);
$PAGE->set_url('/course/completion.php', array('id' => $course->id)); $PAGE->set_url('/course/completion.php', array('id' => $course->id));
$PAGE->set_title($course->shortname); $PAGE->set_title($course->shortname);
$PAGE->set_heading($course->fullname); $PAGE->set_heading($course->fullname);
$PAGE->set_pagelayout('standard'); $PAGE->set_pagelayout('admin');
// Create the settings form instance. // Create the settings form instance.
$form = new course_completion_form('completion.php?id='.$id, array('course' => $course)); $form = new course_completion_form('completion.php?id='.$id, array('course' => $course));

View file

@ -122,7 +122,7 @@ $straddgroupstogroupings = get_string('addgroupstogroupings', 'group');
$groupingname = format_string($grouping->name); $groupingname = format_string($grouping->name);
navigation_node::override_active_url(new moodle_url('/group/index.php', array('id'=>$course->id))); navigation_node::override_active_url(new moodle_url('/group/index.php', array('id'=>$course->id)));
$PAGE->set_pagelayout('standard'); $PAGE->set_pagelayout('admin');
$PAGE->navbar->add($strparticipants, new moodle_url('/user/index.php', array('id'=>$courseid))); $PAGE->navbar->add($strparticipants, new moodle_url('/user/index.php', array('id'=>$courseid)));
$PAGE->navbar->add($strgroups, new moodle_url('/group/index.php', array('id'=>$courseid))); $PAGE->navbar->add($strgroups, new moodle_url('/group/index.php', array('id'=>$courseid)));

View file

@ -52,7 +52,7 @@ $strautocreategroups = get_string('autocreategroups', 'group');
$PAGE->set_title($strgroups); $PAGE->set_title($strgroups);
$PAGE->set_heading($course->fullname. ': '.$strgroups); $PAGE->set_heading($course->fullname. ': '.$strgroups);
$PAGE->set_pagelayout('standard'); $PAGE->set_pagelayout('admin');
navigation_node::override_active_url(new moodle_url('/group/index.php', array('id' => $courseid))); navigation_node::override_active_url(new moodle_url('/group/index.php', array('id' => $courseid)));
// Print the page and form // Print the page and form

View file

@ -77,7 +77,7 @@ require_capability('moodle/course:managegroups', $context);
$strgroups = get_string('groups'); $strgroups = get_string('groups');
$PAGE->set_title($strgroups); $PAGE->set_title($strgroups);
$PAGE->set_heading($course->fullname . ': '.$strgroups); $PAGE->set_heading($course->fullname . ': '.$strgroups);
$PAGE->set_pagelayout('standard'); $PAGE->set_pagelayout('admin');
navigation_node::override_active_url(new moodle_url('/group/index.php', array('id' => $course->id))); navigation_node::override_active_url(new moodle_url('/group/index.php', array('id' => $course->id)));
$returnurl = $CFG->wwwroot.'/group/index.php?id='.$course->id.'&group='.$id; $returnurl = $CFG->wwwroot.'/group/index.php?id='.$course->id.'&group='.$id;

View file

@ -69,7 +69,7 @@ require_capability('moodle/course:managegroups', $context);
$strgroupings = get_string('groupings', 'group'); $strgroupings = get_string('groupings', 'group');
$PAGE->set_title($strgroupings); $PAGE->set_title($strgroupings);
$PAGE->set_heading($course->fullname. ': '.$strgroupings); $PAGE->set_heading($course->fullname. ': '.$strgroupings);
$PAGE->set_pagelayout('standard'); $PAGE->set_pagelayout('admin');
navigation_node::override_active_url(new moodle_url('/group/index.php', array('id' => $course->id))); navigation_node::override_active_url(new moodle_url('/group/index.php', array('id' => $course->id)));
$returnurl = $CFG->wwwroot.'/group/groupings.php?id='.$course->id; $returnurl = $CFG->wwwroot.'/group/groupings.php?id='.$course->id;

View file

@ -45,7 +45,7 @@ $PAGE->navbar->add($strimportgroups);
navigation_node::override_active_url(new moodle_url('/group/index.php', array('id' => $course->id))); navigation_node::override_active_url(new moodle_url('/group/index.php', array('id' => $course->id)));
$PAGE->set_title("$course->shortname: $strimportgroups"); $PAGE->set_title("$course->shortname: $strimportgroups");
$PAGE->set_heading($course->fullname); $PAGE->set_heading($course->fullname);
$PAGE->set_pagelayout('standard'); $PAGE->set_pagelayout('admin');
$returnurl = new moodle_url('/group/index.php', array('id'=>$id)); $returnurl = new moodle_url('/group/index.php', array('id'=>$id));

View file

@ -35,7 +35,7 @@ $PAGE->set_context($usercontext);
$PAGE->set_url('/user/managetoken.php'); $PAGE->set_url('/user/managetoken.php');
$PAGE->set_title(get_string('securitykeys', 'webservice')); $PAGE->set_title(get_string('securitykeys', 'webservice'));
$PAGE->set_heading(get_string('securitykeys', 'webservice')); $PAGE->set_heading(get_string('securitykeys', 'webservice'));
$PAGE->set_pagelayout('standard'); $PAGE->set_pagelayout('admin');
$rsstokenboxhtml = $webservicetokenboxhtml = ''; $rsstokenboxhtml = $webservicetokenboxhtml = '';
/// Manage user web service tokens /// Manage user web service tokens

View file

@ -64,7 +64,7 @@ $PAGE->set_url($url);
$PAGE->set_context(context_user::instance($user->id)); $PAGE->set_context(context_user::instance($user->id));
$PAGE->set_title("$course->fullname: $fullname: $strportfolios"); $PAGE->set_title("$course->fullname: $fullname: $strportfolios");
$PAGE->set_heading($course->fullname); $PAGE->set_heading($course->fullname);
$PAGE->set_pagelayout('standard'); $PAGE->set_pagelayout('admin');
echo $OUTPUT->header(); echo $OUTPUT->header();
$showroles = 1; $showroles = 1;
@ -124,4 +124,3 @@ if ($display) {
echo $OUTPUT->box_end(); echo $OUTPUT->box_end();
} }
echo $OUTPUT->footer(); echo $OUTPUT->footer();

View file

@ -61,7 +61,7 @@ $PAGE->set_url($url);
$PAGE->set_title("$course->fullname: $fullname: $strportfolios"); $PAGE->set_title("$course->fullname: $fullname: $strportfolios");
$PAGE->set_heading($course->fullname); $PAGE->set_heading($course->fullname);
$PAGE->set_context(context_user::instance($user->id)); $PAGE->set_context(context_user::instance($user->id));
$PAGE->set_pagelayout('standard'); $PAGE->set_pagelayout('report');
echo $OUTPUT->header(); echo $OUTPUT->header();