Permalink
Browse files

Merge branch 'MDL-63991-master' of git://github.com/crazyserver/moodle

  • Loading branch information...
dmonllao committed Nov 14, 2018
2 parents e15203d + f687f14 commit 03d9f4cda46ac30b19938cb8cf677ff2f64750bd
Showing with 8 additions and 5 deletions.
  1. +4 −0 badges/endorsement.php
  2. +4 −5 badges/renderer.php
@@ -63,6 +63,10 @@
$msg = optional_param('msg', '', PARAM_TEXT);
$emsg = optional_param('emsg', '', PARAM_TEXT);
if ($msg !== '') {
$msg = get_string($msg, 'badges');
}
echo $OUTPUT->header();
echo $OUTPUT->heading(print_badge_image($badge, $context, 'small') . ' ' . $badge->name);
@@ -150,8 +150,7 @@ public function print_badge_overview($badge, $context) {
$dl[get_string('description', 'badges')] = $badge->description;
$dl[get_string('createdon', 'search')] = userdate($badge->timecreated);
$dl[get_string('badgeimage', 'badges')] = print_badge_image($badge, $context, 'large');
$dl[get_string('imageauthorname', 'badges')] =
html_writer::link($badge->imageauthorname, $badge->imageauthorname, array('target' => '_blank'));
$dl[get_string('imageauthorname', 'badges')] = $badge->imageauthorname;
$dl[get_string('imageauthoremail', 'badges')] =
html_writer::tag('a', $badge->imageauthoremail, array('href' => 'mailto:' . $badge->imageauthoremail));
$dl[get_string('imageauthorurl', 'badges')] =
@@ -352,8 +351,7 @@ protected function render_issued_badge(issued_badge $ibadge) {
$dl[get_string('version', 'badges')] = $badge->version;
$dl[get_string('language')] = $languages[$badge->language];
$dl[get_string('description', 'badges')] = $badge->description;
$dl[get_string('imageauthorname', 'badges')] =
html_writer::link($badge->imageauthorname, $badge->imageauthorname, array('target' => '_blank'));
$dl[get_string('imageauthorname', 'badges')] = $badge->imageauthorname;
$dl[get_string('imageauthoremail', 'badges')] =
html_writer::tag('a', $badge->imageauthoremail, array('href' => 'mailto:' . $badge->imageauthoremail));
$dl[get_string('imageauthorurl', 'badges')] =
@@ -1048,7 +1046,8 @@ protected function print_badge_endorsement(badge $badge) {
$output .= $this->heading(get_string('endorsement', 'badges'), 3);
if (!empty($endorsement)) {
$dl[get_string('issuername', 'badges')] = $endorsement->issuername;
$dl[get_string('issueremail', 'badges')] = $endorsement->issueremail;
$dl[get_string('issueremail', 'badges')] =
html_writer::tag('a', $endorsement->issueremail, array('href' => 'mailto:' . $endorsement->issueremail));
$dl[get_string('issuerurl', 'badges')] = html_writer::link($endorsement->issuerurl, $endorsement->issuerurl,
array('target' => '_blank'));
$dl[get_string('dateawarded', 'badges')] = date('c', $endorsement->dateissued);

0 comments on commit 03d9f4c

Please sign in to comment.