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

Merge branch 'MDL-48115_master' of https://github.com/totara/openbadges

Browse source
This commit is contained in:
Sam Hemelryk 2014-11-17 14:37:49 +13:00
commit 1f4039d84f
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
badges/criteria/award_criteria.php
View file

@ -223,7 +223,7 @@ abstract class award_criteria {
if (!empty($this->params)) { if (!empty($this->params)) {
if (count($this->params) > 1) { if (count($this->params) > 1) {
echo $OUTPUT->box(get_string('criteria_descr_' . $this->criteriatype, 'badges', echo $OUTPUT->box(get_string('criteria_descr_' . $this->criteriatype, 'badges',
strtoupper($agg[$data->get_aggregation_method($this->criteriatype)])), array('clearfix')); core_text::strtoupper($agg[$data->get_aggregation_method($this->criteriatype)])), array('clearfix'));
} else { } else {
echo $OUTPUT->box(get_string('criteria_descr_single_' . $this->criteriatype , 'badges'), array('clearfix')); echo $OUTPUT->box(get_string('criteria_descr_single_' . $this->criteriatype , 'badges'), array('clearfix'));
} }

2
badges/criteria/award_criteria_overall.php
View file

@ -60,7 +60,7 @@ class award_criteria_overall extends award_criteria {
echo html_writer::table($table); echo html_writer::table($table);
} else { } else {
echo $OUTPUT->box(get_string('criteria_descr_' . $this->criteriatype, 'badges', echo $OUTPUT->box(get_string('criteria_descr_' . $this->criteriatype, 'badges',
strtoupper($agg[$data->get_aggregation_method()])), 'clearfix'); core_text::strtoupper($agg[$data->get_aggregation_method()])), 'clearfix');
} }
echo $OUTPUT->box_end(); echo $OUTPUT->box_end();
} }

6
badges/renderer.php
View file

@ -362,7 +362,7 @@ class core_badges_renderer extends plugin_renderer_base {
$items[] = get_string('criteria_descr_single_' . $type , 'badges') . $c->get_details(); $items[] = get_string('criteria_descr_single_' . $type , 'badges') . $c->get_details();
} else { } else {
$items[] = get_string('criteria_descr_' . $type , 'badges', $items[] = get_string('criteria_descr_' . $type , 'badges',
strtoupper($agg[$badge->get_aggregation_method($type)])) . $c->get_details(); core_text::strtoupper($agg[$badge->get_aggregation_method($type)])) . $c->get_details();
} }
} }
} }
@ -716,7 +716,7 @@ class core_badges_renderer extends plugin_renderer_base {
} }
} else { } else {
$output .= get_string('criteria_descr_' . $short . BADGE_CRITERIA_TYPE_OVERALL, 'badges', $output .= get_string('criteria_descr_' . $short . BADGE_CRITERIA_TYPE_OVERALL, 'badges',
strtoupper($agg[$badge->get_aggregation_method()])); core_text::strtoupper($agg[$badge->get_aggregation_method()]));
} }
$items = array(); $items = array();
unset($badge->criteria[BADGE_CRITERIA_TYPE_OVERALL]); unset($badge->criteria[BADGE_CRITERIA_TYPE_OVERALL]);
@ -725,7 +725,7 @@ class core_badges_renderer extends plugin_renderer_base {
$items[] = get_string('criteria_descr_single_' . $short . $type , 'badges') . $c->get_details($short); $items[] = get_string('criteria_descr_single_' . $short . $type , 'badges') . $c->get_details($short);
} else { } else {
$items[] = get_string('criteria_descr_' . $short . $type , 'badges', $items[] = get_string('criteria_descr_' . $short . $type , 'badges',
strtoupper($agg[$badge->get_aggregation_method($type)])) . $c->get_details($short); core_text::strtoupper($agg[$badge->get_aggregation_method($type)])) . $c->get_details($short);
} }
} }
$output .= html_writer::alist($items, array(), 'ul'); $output .= html_writer::alist($items, array(), 'ul');