Skip to content

Commit

Permalink
MDL-42317 output: reviewed standard/base layouts and converted where …
Browse files Browse the repository at this point in the history
…a better option was available
  • Loading branch information
Sam Hemelryk committed Apr 6, 2014
1 parent 20015af commit 566889a
Show file tree
Hide file tree
Showing 18 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion backup/restore.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
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_context($context);
$PAGE->set_pagelayout('standard');
$PAGE->set_pagelayout('admin');

require_login($course, null, $cm);
require_capability('moodle/restore:restorecourse', $context);
Expand Down
2 changes: 1 addition & 1 deletion badges/edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
}
require_login($badge->courseid);
$navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
$PAGE->set_pagelayout('standard');
$PAGE->set_pagelayout('course');
navigation_node::override_active_url($navurl);
} else {
$PAGE->set_pagelayout('admin');
Expand Down
2 changes: 1 addition & 1 deletion blocks/completionstatus/details.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
$title = format_string($course->fullname) . ': ' . $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_title(get_string('course') . ': ' . $course->fullname);
$PAGE->set_heading($title);
Expand Down
2 changes: 1 addition & 1 deletion blocks/rss_client/editfeed.php
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public static function autodiscover_feed_url($url){
$managefeeds = new moodle_url('/blocks/rss_client/managefeeds.php', $urlparams);

$PAGE->set_url('/blocks/rss_client/editfeed.php', $urlparams);
$PAGE->set_pagelayout('standard');
$PAGE->set_pagelayout('admin');

if ($rssid) {
$isadding = false;
Expand Down
2 changes: 1 addition & 1 deletion blog/external_blog_edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
}
$PAGE->set_url($url);
$PAGE->set_context($context);
$PAGE->set_pagelayout('standard');
$PAGE->set_pagelayout('admin');

$returnurl = new moodle_url('/blog/external_blogs.php');

Expand Down
2 changes: 1 addition & 1 deletion blog/preferences.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
}

$PAGE->set_url($url);
$PAGE->set_pagelayout('standard');
$PAGE->set_pagelayout('admin');

$sitecontext = context_system::instance();
$PAGE->set_context($sitecontext);
Expand Down
2 changes: 1 addition & 1 deletion calendar/event.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
}

$PAGE->set_url($url);
$PAGE->set_pagelayout('standard');
$PAGE->set_pagelayout('admin');

if ($courseid != SITEID && !empty($courseid)) {
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
Expand Down
2 changes: 1 addition & 1 deletion calendar/managesubscriptions.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
}
navigation_node::override_active_url(new moodle_url('/calendar/view.php', array('view' => 'month')));
$PAGE->set_url($url);
$PAGE->set_pagelayout('standard');
$PAGE->set_pagelayout('admin');
$PAGE->navbar->add(get_string('managesubscriptions', 'calendar'));

if ($courseid != SITEID && !empty($courseid)) {
Expand Down
2 changes: 1 addition & 1 deletion course/completion.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
$PAGE->set_url('/course/completion.php', array('id' => $course->id));
$PAGE->set_title($course->shortname);
$PAGE->set_heading($course->fullname);
$PAGE->set_pagelayout('standard');
$PAGE->set_pagelayout('admin');

// Create the settings form instance.
$form = new course_completion_form('completion.php?id='.$id, array('course' => $course));
Expand Down
2 changes: 1 addition & 1 deletion group/assign.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
$groupingname = format_string($grouping->name);

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($strgroups, new moodle_url('/group/index.php', array('id'=>$courseid)));
Expand Down
2 changes: 1 addition & 1 deletion group/autogroup.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

$PAGE->set_title($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)));

// Print the page and form
Expand Down
2 changes: 1 addition & 1 deletion group/group.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
$strgroups = get_string('groups');
$PAGE->set_title($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)));

$returnurl = $CFG->wwwroot.'/group/index.php?id='.$course->id.'&group='.$id;
Expand Down
2 changes: 1 addition & 1 deletion group/grouping.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
$strgroupings = get_string('groupings', 'group');
$PAGE->set_title($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)));

$returnurl = $CFG->wwwroot.'/group/groupings.php?id='.$course->id;
Expand Down
2 changes: 1 addition & 1 deletion group/import.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
navigation_node::override_active_url(new moodle_url('/group/index.php', array('id' => $course->id)));
$PAGE->set_title("$course->shortname: $strimportgroups");
$PAGE->set_heading($course->fullname);
$PAGE->set_pagelayout('standard');
$PAGE->set_pagelayout('admin');

$returnurl = new moodle_url('/group/index.php', array('id'=>$id));

Expand Down
2 changes: 1 addition & 1 deletion portfolio/add.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
require_login(); // this is selectively called again with $course later when we know for sure which one we're in.
$PAGE->set_context(context_system::instance());
$PAGE->set_url('/portfolio/add.php', array('id' => $dataid, 'sesskey' => sesskey()));
$PAGE->set_pagelayout('standard');
$PAGE->set_pagelayout('admin');
$exporter = null;

if ($postcontrol && $type && !$dataid) {
Expand Down
2 changes: 1 addition & 1 deletion user/managetoken.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
$PAGE->set_url('/user/managetoken.php');
$PAGE->set_title(get_string('securitykeys', 'webservice'));
$PAGE->set_heading(get_string('securitykeys', 'webservice'));
$PAGE->set_pagelayout('standard');
$PAGE->set_pagelayout('admin');

$rsstokenboxhtml = $webservicetokenboxhtml = '';
// Manage user web service tokens.
Expand Down
4 changes: 2 additions & 2 deletions user/portfolio.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
$PAGE->set_context(context_user::instance($user->id));
$PAGE->set_title("$course->fullname: $fullname: $strportfolios");
$PAGE->set_heading($course->fullname);
$PAGE->set_pagelayout('standard');
$PAGE->set_pagelayout('admin');

echo $OUTPUT->header();
$showroles = 1;
Expand Down Expand Up @@ -120,4 +120,4 @@
echo html_writer::table($table);
echo $OUTPUT->box_end();
}
echo $OUTPUT->footer();
echo $OUTPUT->footer();
2 changes: 1 addition & 1 deletion user/portfoliologs.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
$PAGE->set_title("$course->fullname: $fullname: $strportfolios");
$PAGE->set_heading($course->fullname);
$PAGE->set_context(context_user::instance($user->id));
$PAGE->set_pagelayout('standard');
$PAGE->set_pagelayout('report');

echo $OUTPUT->header();

Expand Down

0 comments on commit 566889a

Please sign in to comment.