Permalink
Browse files

Merge branch 'MDL-46107_26' of https://github.com/totara/openbadges i…

…nto MOODLE_26_STABLE
  • Loading branch information...
danpoltawski committed Jul 1, 2014
2 parents db1cf75 + 3e9dfd7 commit e666c72330e99d311233c1075758907412b9a5cb
Showing with 21 additions and 1 deletion.
  1. +10 −1 badges/badge.php
  2. +8 −0 badges/external.php
  3. +3 −0 theme/bootstrapbase/renderers/core_renderer.php
View
@@ -52,7 +52,16 @@
if (isloggedin()) {
$PAGE->set_heading($badge->badgeclass['name']);
$PAGE->navbar->add($badge->badgeclass['name']);
$url = new moodle_url('/badges/mybadges.php');
if ($badge->recipient->id == $USER->id) {
$url = new moodle_url('/badges/mybadges.php');
} else {
$url = new moodle_url($CFG->wwwroot);
}
navigation_node::override_active_url($url);
} else {
$PAGE->set_heading($badge->badgeclass['name']);
$PAGE->navbar->add($badge->badgeclass['name']);
$url = new moodle_url($CFG->wwwroot);
navigation_node::override_active_url($url);
}
View
@@ -82,6 +82,14 @@
$PAGE->set_pagelayout('base');
$PAGE->set_title(get_string('issuedbadge', 'badges'));
$PAGE->set_heading(s($badge->issued->assertion->badge->name));
$PAGE->navbar->add(s($badge->issued->assertion->badge->name));
if (isloggedin() && $USER->id == $userid) {
$url = new moodle_url('/badges/mybadges.php');
} else {
$url = new moodle_url($CFG->wwwroot);
}
navigation_node::override_active_url($url);
echo $OUTPUT->header();
@@ -56,6 +56,9 @@ public function notification($message, $classes = 'notifyproblem') {
*/
public function navbar() {
$items = $this->page->navbar->get_items();
if (empty($items)) {
return '';
}
$breadcrumbs = array();
foreach ($items as $item) {
$item->hideicon = true;

0 comments on commit e666c72

Please sign in to comment.