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

MDL-19792 Applied Sam's patch

Browse source
This commit is contained in:
nicolasconnault 2009-09-07 10:01:26 +00:00
parent 84f797db5d
commit e640790eb6
5 changed files with 14 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

16
blog/edit.php
View file

@ -99,7 +99,9 @@ if ($action === 'delete'){
} else { } else {
$optionsyes = array('id'=>$id, 'action'=>'delete', 'confirm'=>1, 'sesskey'=>sesskey(), 'courseid'=>$courseid); $optionsyes = array('id'=>$id, 'action'=>'delete', 'confirm'=>1, 'sesskey'=>sesskey(), 'courseid'=>$courseid);
$optionsno = array('userid'=>$existing->userid, 'courseid'=>$courseid); $optionsno = array('userid'=>$existing->userid, 'courseid'=>$courseid);
print_header("$SITE->shortname: $strblogs", $SITE->fullname); $PAGE->set_title("$SITE->shortname: $strblogs");
$PAGE->set_heading($SITE->fullname);
echo $OUTPUT->header();
//blog_print_entry($existing); //blog_print_entry($existing);
$existing->print_html(); $existing->print_html();
echo '<br />'; echo '<br />';
@ -226,19 +228,9 @@ if (!$user = $DB->get_record('user', array('id'=>$userid))) {
$blog_headers = blog_get_headers(); $blog_headers = blog_get_headers();
$navigation = build_navigation($blog_headers['navlinks'], $blog_headers['cm']);
/*
$navlinks = array();
$navlinks[] = array('name' => fullname($user), 'link' => "$CFG->wwwroot/user/view.php?id=$userid", 'type' => 'misc');
$navlinks[] = array('name' => $strblogs, 'link' => "$CFG->wwwroot/blog/index.php?userid=$userid", 'type' => 'misc');
$navlinks[] = array('name' => $strformheading, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
*/
$PAGE->requires->js('blog/edit_form.js'); $PAGE->requires->js('blog/edit_form.js');
$PAGE->set_title($blog_headers['title']);
$PAGE->set_heading($blog_headers['title']);
echo $OUTPUT->header($navigation); echo $OUTPUT->header();
$blogeditform->set_data($entry); $blogeditform->set_data($entry);
$blogeditform->display(); $blogeditform->display();

11
blog/external.php
View file

@ -113,16 +113,13 @@ if ($externalblogform->is_cancelled()){
redirect($returnurl); redirect($returnurl);
} }
$navlinks = array(); $PAGE->navbar->add(fullname($user), new moodle_url($CFG->wwwroot.'/user/view.php', array('id'=>$user->id)));
$navlinks[] = array('name' => fullname($user), 'link' => "$CFG->wwwroot/user/view.php?id=$user->id", 'type' => 'misc'); $PAGE->navbar->add($strblogs, new moodle_url($CFG->wwwroot.'/blog/index.php', array('userid'=>$user->id)));
$navlinks[] = array('name' => $strblogs, 'link' => "$CFG->wwwroot/blog/index.php?userid=$user->id", 'type' => 'misc'); $PAGE->navbar->add($strformheading);
$navlinks[] = array('name' => $strformheading, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
$PAGE->set_heading("$SITE->shortname: $strblogs: $strexternalblogs", $SITE->fullname); $PAGE->set_heading("$SITE->shortname: $strblogs: $strexternalblogs", $SITE->fullname);
$PAGE->set_title("$SITE->shortname: $strblogs: $strexternalblogs"); $PAGE->set_title("$SITE->shortname: $strblogs: $strexternalblogs");
echo $OUTPUT->header($navigation); echo $OUTPUT->header();
echo $OUTPUT->heading($strformheading, 2); echo $OUTPUT->heading($strformheading, 2);
$external->returnurl = $returnurl; $external->returnurl = $returnurl;

6
blog/header.php
View file

@ -99,12 +99,6 @@ if (!empty($search_link)) {
$blog_headers = blog_get_headers(); $blog_headers = blog_get_headers();
if (isset($cm)) {
$navigation = build_navigation($blog_headers['navlinks'], $cm);
} else {
$navigation = build_navigation($blog_headers['navlinks']);
}
// prints the tabs // prints the tabs
$showroles = !empty($userid); $showroles = !empty($userid);
$currenttab = 'blogs'; $currenttab = 'blogs';

2
blog/lib.php
View file

@ -518,7 +518,7 @@ function blog_get_headers() {
$action = optional_param('action', null, PARAM_ALPHA); $action = optional_param('action', null, PARAM_ALPHA);
$confirm = optional_param('confirm', false, PARAM_BOOL); $confirm = optional_param('confirm', false, PARAM_BOOL);
$headers = array('navlinks' => array(), 'title' => '', 'heading' => '', 'cm' => null); $headers = array('title' => '', 'heading' => '', 'cm' => null);
$blog_url = new moodle_url($CFG->wwwroot . '/blog/index.php'); $blog_url = new moodle_url($CFG->wwwroot . '/blog/index.php');
$site = $DB->get_record('course', array('id' => SITEID)); $site = $DB->get_record('course', array('id' => SITEID));

7
blog/preferences.php
View file

@ -67,15 +67,14 @@ $site = get_site();
$strpreferences = get_string('preferences'); $strpreferences = get_string('preferences');
$strblogs = get_string('blogs', 'blog'); $strblogs = get_string('blogs', 'blog');
$navlinks = array(array('name' => $strblogs, 'link' => "$CFG->wwwroot/blog/", 'type' => 'misc'));
$navlinks[] = array('name' => $strpreferences, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
$title = "$site->shortname: $strblogs : $strpreferences"; $title = "$site->shortname: $strblogs : $strpreferences";
$PAGE->set_title($title); $PAGE->set_title($title);
$PAGE->set_heading($title); $PAGE->set_heading($title);
$PAGE->navbar->add($strblogs, new moodle_url($CFG->wwwroot.'/blog/'));
$PAGE->navbar->add($strpreferences);
echo $OUTPUT->header($navigation); echo $OUTPUT->header();
echo $OUTPUT->heading("$strblogs : $strpreferences", 2); echo $OUTPUT->heading("$strblogs : $strpreferences", 2);