moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

enrol MDL-19795 Upgraded print_header and build_navigation calls to OUTPUT/PAGE equivilants

Browse source
This commit is contained in:
samhemelryk 2009-09-04 06:29:26 +00:00
parent 15ca5e5e0d
commit 01d082fa17
7 changed files with 52 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

14
enrol/authorize/enrol.php
View file

@ -29,8 +29,7 @@ class enrolment_plugin_authorize
*/ */
public function print_entry($course) public function print_entry($course)
{ {
global $CFG, $USER, $OUTPUT; global $CFG, $USER, $OUTPUT, $PAGE, $form;
global $form;
$zerocost = zero_cost($course); $zerocost = zero_cost($course);
if ($zerocost) { if ($zerocost) {
@ -58,12 +57,11 @@ class enrolment_plugin_authorize
$strcourses = get_string('courses'); $strcourses = get_string('courses');
$strloginto = get_string('loginto', '', $course->shortname); $strloginto = get_string('loginto', '', $course->shortname);
$navlinks = array(); $PAGE->navbar->add($strcourses, new moodle_url($CFG->wwwroot.'/course/'));
$navlinks[] = array('name' => $strcourses, 'link' => "$CFG->wwwroot/course/", 'type' => 'misc'); $PAGE->navbar->add($strloginto);
$navlinks[] = array('name' => $strloginto, 'link' => null, 'type' => 'misc'); $PAGE->set_title($strloginto);
$navigation = build_navigation($navlinks); $PAGE->set_heading($course->fullname);
echo $OUTPUT->header();
print_header($strloginto, $course->fullname, $navigation);
print_course($course, '80%'); print_course($course, '80%');
if ($course->password) { if ($course->password) {

30
enrol/authorize/locallib.php
View file

@ -77,13 +77,15 @@ function authorize_print_orders($courseid, $userid) {
$popupmenu .= $OUTPUT->checkbox($checkbox, 'showonlymy'); $popupmenu .= $OUTPUT->checkbox($checkbox, 'showonlymy');
} }
$navlinks = array();
if (SITEID != $courseid) { if (SITEID != $courseid) {
$navlinks[] = array('name' => $course->shortname, 'link' => "$CFG->wwwroot/course/view.php?id=".$course->id, 'type' => 'misc'); $PAGE->navbar->add($course->shortname, new moodle_url($CFG->wwwroot.'/course/view.php', array('id'=>$course->id)));
} }
$navlinks[] = array('name' => $authstrs->paymentmanagement, 'link' => 'index.php', 'type' => 'misc'); $PAGE->navbar->add($authstrs->paymentmanagement, 'index.php');
$navigation = build_navigation($navlinks); $PAGE->set_title("$course->shortname: $authstrs->paymentmanagement");
print_header("$course->shortname: $authstrs->paymentmanagement", $authstrs->paymentmanagement, $navigation, '', '', false, $buttons, $popupmenu); $PAGE->set_heading($authstrs->paymentmanagement);
$PAGE->set_headingmenu($popupmenu);
$PAGE->set_button($buttons);
echo $OUTPUT->header();
$table = new flexible_table('enrol-authorize'); $table = new flexible_table('enrol-authorize');
$table->set_attribute('width', '100%'); $table->set_attribute('width', '100%');
@ -221,7 +223,7 @@ function authorize_print_orders($courseid, $userid) {
*/ */
function authorize_print_order($orderid) function authorize_print_order($orderid)
{ {
global $CFG, $USER, $DB, $OUTPUT; global $CFG, $USER, $DB, $OUTPUT, $PAGE;
global $strs, $authstrs; global $strs, $authstrs;
$do = optional_param('do', '', PARAM_ALPHA); $do = optional_param('do', '', PARAM_ALPHA);
@ -265,14 +267,16 @@ function authorize_print_order($orderid)
} }
} }
$navlinks = array(); if (SITEID != $courseid) {
if (SITEID != $course->id) { $PAGE->navbar->add($course->shortname, new moodle_url($CFG->wwwroot.'/course/view.php', array('id'=>$course->id)));
$navlinks[] = array('name' => $course->shortname, 'link' => "$CFG->wwwroot/course/view.php?id=".$course->id, 'type' => 'misc');
} }
$navlinks[] = array('name' => $authstrs->paymentmanagement, 'link' => 'index.php?course='.$course->id, 'type' => 'misc'); $PAGE->navbar->add($authstrs->paymentmanagement, 'index.php?course='.$course->id);
$navlinks[] = array('name' => $authstrs->orderid . ': ' . $orderid, 'link' => '', 'type' => 'misc'); $PAGE->navbar->add($authstrs->orderid . ': ' . $orderid, 'index.php');
$navigation = build_navigation($navlinks); $PAGE->set_title("$course->shortname: $authstrs->paymentmanagement");
print_header("$course->shortname: $authstrs->paymentmanagement", $authstrs->orderdetails, $navigation, '', '', false, $buttons); $PAGE->set_heading($authstrs->orderdetails);
$PAGE->set_cacheable(false);
$PAGE->set_button($buttons);
echo $OUTPUT->header();
$table = new html_table(); $table = new html_table();
$table->width = '100%'; $table->width = '100%';

12
enrol/authorize/uploadcsv.php
View file

@ -13,14 +13,14 @@
/// Print header /// Print header
$struploadcsv = get_string('uploadcsv', 'enrol_authorize'); $struploadcsv = get_string('uploadcsv', 'enrol_authorize');
$navlinks = array();
$navlinks[] = array('name' => get_string('paymentmanagement', 'enrol_authorize'), 'link' => 'index.php', 'type' => 'misc');
$navlinks[] = array('name' => $struploadcsv, 'link' => "uploadcsv.php", 'type' => 'misc');
$navigation = build_navigation($navlinks);
$managebutton = "<form method='get' action='index.php'><div><input type='submit' value='".get_string('paymentmanagement', 'enrol_authorize')."' /></div></form>"; $managebutton = "<form method='get' action='index.php'><div><input type='submit' value='".get_string('paymentmanagement', 'enrol_authorize')."' /></div></form>";
print_header_simple($struploadcsv, '', $navigation, '', '', false, $managebutton); $PAGE->navbar->add(get_string('paymentmanagement', 'enrol_authorize'), 'index.php');
$PAGE->navbar->add($struploadcsv, 'uploadcsv.php');
$PAGE->set_title($struploadcsv);
$PAGE->set_cacheable(false);
$PAGE->set_button($managebutton);
echo $OUTPUT->header();
print_heading_with_help($struploadcsv, 'authorize/uploadcsv', 'enrol'); print_heading_with_help($struploadcsv, 'authorize/uploadcsv', 'enrol');
/// Handle CSV file /// Handle CSV file

12
enrol/imsenterprise/importnow.php
View file

@ -9,13 +9,13 @@ if (!$site = get_site()) {
/// get language strings /// get language strings
$str = get_strings(array('enrolments', 'users', 'administration', 'settings')); $str = get_strings(array('enrolments', 'users', 'administration', 'settings'));
$navlinks = array();
$navlinks[] = array('name' => $str->administration, 'link' => "../../$CFG->admin/index.php", 'type' => 'misc');
$navlinks[] = array('name' => $str->enrolments, 'link' => null, 'type' => 'misc');
$navlinks[] = array('name' => 'IMS import', 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header("$site->shortname: $str->enrolments", $site->fullname, $navigation); $PAGE->set_title("$site->shortname: $str->enrolments");
$PAGE->set_heading($site->fullname);
$PAGE->navbar->add($str->administration, new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/index.php'));
$PAGE->navbar->add($str->enrolments);
$PAGE->navbar->add('IMS import');
echo $OUTPUT->header();
require_once('enrol.php'); require_once('enrol.php');

18
enrol/manual/enrol.php
View file

@ -48,7 +48,7 @@ var $errormsg;
* @param course current course object * @param course current course object
*/ */
function print_entry($course) { function print_entry($course) {
global $CFG, $USER, $SESSION, $THEME, $OUTPUT; global $CFG, $USER, $SESSION, $THEME, $OUTPUT, $PAGE;
$strloginto = get_string('loginto', '', $course->shortname); $strloginto = get_string('loginto', '', $course->shortname);
$strcourses = get_string('courses'); $strcourses = get_string('courses');
@ -57,10 +57,8 @@ function print_entry($course) {
$context = get_context_instance(CONTEXT_SYSTEM); $context = get_context_instance(CONTEXT_SYSTEM);
$navlinks = array(); $PAGE->navbar->add($strcourses);
$navlinks[] = array('name' => $strcourses, 'link' => ".", 'type' => 'misc'); $PAGE->navbar->add($strloginto);
$navlinks[] = array('name' => $strloginto, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
if ($course->password == '') { // no password, so enrol if ($course->password == '') { // no password, so enrol
@ -68,8 +66,9 @@ function print_entry($course) {
add_to_log($course->id, 'course', 'guest', 'view.php?id='.$course->id, getremoteaddr()); add_to_log($course->id, 'course', 'guest', 'view.php?id='.$course->id, getremoteaddr());
} else if (empty($_GET['confirm']) && empty($_GET['cancel'])) { } else if (empty($_GET['confirm']) && empty($_GET['cancel'])) {
$PAGE->set_title($strloginto);
print_header($strloginto, $course->fullname, $navigation); $PAGE->set_heading($course->fullname);
echo $OUTPUT->header();
echo '<br />'; echo '<br />';
echo $OUTPUT->confirm(get_string('enrolmentconfirmation'), "enrol.php?id=$course->id&confirm=1", "enrol.php?id=$course->id&cancel=1"); echo $OUTPUT->confirm(get_string('enrolmentconfirmation'), "enrol.php?id=$course->id&confirm=1", "enrol.php?id=$course->id&cancel=1");
echo $OUTPUT->footer(); echo $OUTPUT->footer();
@ -110,7 +109,10 @@ function print_entry($course) {
$password = ''; $password = '';
} }
print_header($strloginto, $course->fullname, $navigation, "form.password"); $PAGE->set_title($strloginto);
$PAGE->set_heading($course->fullname);
$PAGE->set_focuscontrol('form.password');
echo $OUTPUT->header();
print_course($course, "80%"); print_course($course, "80%");

13
enrol/paypal/enrol.php
View file

@ -9,7 +9,7 @@ class enrolment_plugin_paypal {
/// Override the base print_entry() function /// Override the base print_entry() function
function print_entry($course) { function print_entry($course) {
global $CFG, $USER, $OUTPUT; global $CFG, $USER, $OUTPUT, $PAGE;
$strloginto = get_string("loginto", "", $course->shortname); $strloginto = get_string("loginto", "", $course->shortname);
@ -29,12 +29,11 @@ function print_entry($course) {
$manual->print_entry($course); $manual->print_entry($course);
} else { } else {
$navlinks = array(); $PAGE->navbar->add($strcourses, new moodle_url($CFG->wwwroot.'/course/'));
$navlinks[] = array('name' => $strcourses, 'link' => "$CFG->wwwroot/course", 'type' => 'misc'); $PAGE->navbar->add($strloginto);
$navlinks[] = array('name' => $strloginto, 'link' => null, 'type' => 'misc'); $PAGE->set_title($strloginto);
$navigation = build_navigation($navlinks); $PAGE->set_heading($course->fullname);
echo $OUTPUT->header();
print_header($strloginto, $course->fullname, $navigation);
print_course($course, "80%"); print_course($course, "80%");
if ($course->password) { // Presenting two options if ($course->password) { // Presenting two options

2
enrol/paypal/return.php
View file

@ -29,7 +29,7 @@
redirect($destination, get_string('paymentthanks', '', $course->fullname)); redirect($destination, get_string('paymentthanks', '', $course->fullname));
} else { /// Somehow they aren't enrolled yet! :-( } else { /// Somehow they aren't enrolled yet! :-(
print_header(); echo $OUTPUT->header();
notice(get_string('paymentsorry', '', get_string('defaultcourseteacher')), $destination); notice(get_string('paymentsorry', '', get_string('defaultcourseteacher')), $destination);
} }