mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-15 05:25:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-39209_master' of git://github.com/totara/openbadges

Browse Source
This commit is contained in:
Damyon Wiese 2013-05-13 14:59:37 +08:00
commit a02e36d682
10 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
badges/backpack.js
View File

@ -10,19 +10,23 @@ function addtobackpack(event, args) {
*/
function check_site_access() {
var add = Y.one('#check_connection');
var callback = {
success: function(o) {
var data = Y.JSON.parse(o.responseText);
if (data.code == 'http-unreachable') {
add.setHTML(data.response);
add.removeClass('hide');
}
},
failure: function(o) { }
};
YUI().use('yui2-connection', function (Y) {
Y.YUI2.util.Connect.asyncRequest('GET', 'ajax.php', callback, null);
var callback = {
method: "GET",
on: {
success: function(id, o, args) {
var data = Y.JSON.parse(o.responseText);
if (data.code == 'http-unreachable') {
add.setHTML(data.response);
add.removeClass('hide');
}
},
failure: function(o) { }
}
};
Y.use('io-base', function(Y) {
Y.io('ajax.php', callback);
});
return false;

3
badges/criteria.php
View File

@ -41,6 +41,9 @@ $context = $badge->get_context();
$navurl = new moodle_url('/badges/index.php', array('type' => $badge->type));
if ($badge->type == BADGE_TYPE_COURSE) {
if (empty($CFG->badges_allowcoursebadges)) {
print_error('coursebadgesdisabled', 'badges');
}
require_login($badge->courseid);
$navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
}

3
badges/edit.php
View File

@ -44,6 +44,9 @@ $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type));
require_capability('moodle/badges:configuredetails', $context);
if ($badge->type == BADGE_TYPE_COURSE) {
if (empty($CFG->badges_allowcoursebadges)) {
print_error('coursebadgesdisabled', 'badges');
}
require_login($badge->courseid);
$navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
}

4
badges/index.php
View File

@ -56,6 +56,10 @@ if (empty($CFG->enablebadges)) {
print_error('badgesdisabled', 'badges');
}
if (empty($CFG->badges_allowcoursebadges) && ($type == BADGE_TYPE_COURSE)) {
print_error('coursebadgesdisabled', 'badges');
}
$err = '';
$urlparams = array('sort' => $sortby, 'dir' => $sorthow, 'page' => $page);

4
badges/newbadge.php
View File

@ -37,6 +37,10 @@ if (empty($CFG->enablebadges)) {
print_error('badgesdisabled', 'badges');
}
if (empty($CFG->badges_allowcoursebadges) && ($type == BADGE_TYPE_COURSE)) {
print_error('coursebadgesdisabled', 'badges');
}
$title = get_string('create', 'badges');
if (($type == BADGE_TYPE_COURSE) && ($course = $DB->get_record('course', array('id' => $courseid)))) {

3
badges/overview.php
View File

@ -41,6 +41,9 @@ $context = $badge->get_context();
$navurl = new moodle_url('/badges/index.php', array('type' => $badge->type));
if ($badge->type == BADGE_TYPE_COURSE) {
if (empty($CFG->badges_allowcoursebadges)) {
print_error('coursebadgesdisabled', 'badges');
}
require_login($badge->courseid);
$navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
}

3
badges/recipients.php
View File

@ -56,6 +56,9 @@ $context = $badge->get_context();
$navurl = new moodle_url('/badges/index.php', array('type' => $badge->type));
if ($badge->type == BADGE_TYPE_COURSE) {
if (empty($CFG->badges_allowcoursebadges)) {
print_error('coursebadgesdisabled', 'badges');
}
require_login($badge->courseid);
$navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
}

4
badges/view.php
View File

@ -39,6 +39,10 @@ if (empty($CFG->enablebadges)) {
print_error('badgesdisabled', 'badges');
}
if (empty($CFG->badges_allowcoursebadges) && $courseid != 0) {
print_error('coursebadgesdisabled', 'badges');
}
if (!in_array($sortby, array('name', 'dateissued'))) {
$sortby = 'name';
}

1
lang/en/badges.php
View File

@ -133,6 +133,7 @@ $string['connected'] = 'Connected';
$string['contact'] = 'Contact';
$string['contact_help'] = 'An email address associated with the badge issuer.';
$string['copyof'] = 'Copy of {$a}';
$string['coursebadgesdisabled'] = 'Course badges are not enabled on this site.';
$string['coursecompletion'] = 'Learners must complete this course. ';
$string['coursebadges'] = 'Badges';
$string['create'] = 'New badge';

2
lib/navigationlib.php
View File

@ -2498,7 +2498,7 @@ class global_navigation extends navigation_node {
}
//Badges
if (!empty($CFG->enablebadges) && has_capability('moodle/badges:viewbadges', $this->page->context)) {
if (!empty($CFG->enablebadges) && !empty($CFG->badges_allowcoursebadges) && has_capability('moodle/badges:viewbadges', $this->page->context)) {
$url = new moodle_url($CFG->wwwroot . '/badges/view.php', array('type' => 1));
$coursenode->add(get_string('sitebadges', 'badges'), $url, navigation_node::TYPE_CUSTOM);
}