mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 13:02:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-36622-master' of git://github.com/FMCorz/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2012-11-16 10:57:16 +08:00
commit e8feeb2ca2
24 changed files with 139 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
course/category.php
View File

@ -368,7 +368,7 @@ if (!$courses) {
// role assignment link
if (has_capability('moodle/course:enrolreview', $coursecontext)) {
$url = new moodle_url('/enrol/users.php', array('id' => $acourse->id));
echo $OUTPUT->action_icon($url, new pix_icon('i/users', get_string('enrolledusers', 'enrol')));
echo $OUTPUT->action_icon($url, new pix_icon('t/enrolusers', get_string('enrolledusers', 'enrol')));
}
if (can_delete_course($acourse->id)) {

2
course/index.php
View File

@ -340,7 +340,7 @@ function print_category_edit($category, $displaylist, $parentslist, $depth=-1, $
if (has_capability('moodle/cohort:manage', $category->context) or has_capability('moodle/cohort:view', $category->context)) {
echo '<a title="'.$str->cohorts.'" href="'.$CFG->wwwroot.'/cohort/index.php?contextid='.$category->context->id.'"><img'.
' src="'.$OUTPUT->pix_url('i/cohort') . '" class="iconsmall" alt="'.$str->cohorts.'" /></a> ';
' src="'.$OUTPUT->pix_url('t/cohort') . '" class="iconsmall" alt="'.$str->cohorts.'" /></a> ';
}
if ($up) {

2
course/search.php
View File

@ -336,7 +336,7 @@ if ($courses) {
// checks whether user can do role assignment
if (has_capability('moodle/course:enrolreview', $coursecontext)) {
echo'<a title="'.get_string('enrolledusers', 'enrol').'" href="'.$CFG->wwwroot.'/enrol/users.php?id='.$course->id.'">';
echo '<img src="'.$OUTPUT->pix_url('i/users') . '" class="iconsmall" alt="'.get_string('enrolledusers', 'enrol').'" /></a> ' . "\n";
echo '<img src="'.$OUTPUT->pix_url('i/enrolusers') . '" class="iconsmall" alt="'.get_string('enrolledusers', 'enrol').'" /></a> ' . "\n";
}
// checks whether user can delete course

2
enrol/manual/lib.php
View File

@ -113,7 +113,7 @@ class enrol_manual_plugin extends enrol_plugin {
if (has_capability('enrol/manual:manage', $context)) {
$managelink = new moodle_url("/enrol/manual/manage.php", array('enrolid'=>$instance->id));
$icons[] = $OUTPUT->action_icon($managelink, new pix_icon('i/users', get_string('enrolusers', 'enrol_manual'), 'core', array('class'=>'iconsmall')));
$icons[] = $OUTPUT->action_icon($managelink, new pix_icon('t/enrolusers', get_string('enrolusers', 'enrol_manual'), 'core', array('class'=>'iconsmall')));
}
if (has_capability('enrol/manual:config', $context)) {
$editlink = new moodle_url("/enrol/manual/edit.php", array('courseid'=>$instance->courseid));

2
lib/enrollib.php
View File

@ -401,7 +401,7 @@ function enrol_add_course_navigation(navigation_node $coursenode, $course) {
// list all participants - allows assigning roles, groups, etc.
if (has_capability('moodle/course:enrolreview', $coursecontext)) {
$url = new moodle_url('/enrol/users.php', array('id'=>$course->id));
$usersnode->add(get_string('enrolledusers', 'enrol'), $url, navigation_node::TYPE_SETTING, null, 'review', new pix_icon('i/users', ''));
$usersnode->add(get_string('enrolledusers', 'enrol'), $url, navigation_node::TYPE_SETTING, null, 'review', new pix_icon('i/enrolusers', ''));
}
// manage enrol plugin instances

BIN
pix/i/cohort.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 340 B

18
pix/i/cohort.svg Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M8,4c1.6,0,2.9,1.7,2.9,3.8c0,1.4-0.9,2.5-0.9,2.5c-0.3,0.4-0.2,1,0.3,1.2l3.6,1.7
c0.5,0.3,1.1,0.9,1.1,1.5V16H1v-1.2c0-0.5,0.6-1.2,1.1-1.5l3.6-1.8c0.5-0.3,0.6-0.8,0.3-1.3c0,0-0.9-1.1-0.9-2.5C5.1,5.7,6.4,4,8,4z
M11.9,7.8c0,1.1-0.4,2.1-0.4,2.1c-0.2,0.5,0,1.1,0.5,1.4l1.5,0.7H16V8.4l-1.7-0.8c-0.5-0.3-0.6-0.8-0.3-1.2c0,0,0.9-1.1,0.9-2.5
C14.9,1.7,13.6,0,12,0c-1.5,0-2.6,1.4-2.8,3.2C10.7,3.9,11.9,5.6,11.9,7.8z M1.7,7.6L0,8.4V12h2.6L4,11.3c0.5-0.3,0.8-0.9,0.5-1.4
c0,0-0.4-1-0.4-2.1c0-2.1,1.2-3.9,2.8-4.6C6.6,1.4,5.5,0,4,0C2.4,0,1.1,1.7,1.1,3.8C1.1,5.2,2,6.3,2,6.3C2.3,6.7,2.2,7.3,1.7,7.6z"
/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
pix/i/enrolusers.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 349 B

16
pix/i/enrolusers.svg Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M16,11.9V16h-4.6l-0.9-3.6l0.6-0.6L10.3,11H9.7l-0.8,0.9l0.6,0.6L8.6,16H4v-4l3.2-1.7
C7.7,10,7.8,9.5,7.5,9C7.5,9,6,7.2,6,5.2C6,2.3,7.8,0,10,0s4,2.3,4,5.2c0,2-1.4,3.8-1.4,3.8c-0.3,0.4-0.2,1,0.3,1.2L16,11.9z
M6.1,8.7C5.6,7.9,5,6.9,5,5.2c0-2.1,0.8-3.9,2-5C6.7,0.1,6.4,0,6,0C3.8,0,2,2.3,2,5.2C2,7.2,3.4,9,3.4,9c0.3,0.4,0.2,1-0.3,1.3
L0,12v4h3v-4.6c0,0,2.6-1.3,2.8-1.4C6.2,9.7,6.6,9.6,6.1,8.7z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
pix/i/permissions.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 268 B

15
pix/i/permissions.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M11,0C8.3,0,6,2.2,6,5c0,0.4,0.1,0.9,0.2,1.3L0,12.5v2.1l6.9-6.9C6.9,7.8,7,7.9,7,8l-7,7v1h2v-1h2v-2
h2h0v-2h2l1.3-1.3C9.9,9.8,10.4,10,11,10c2.8,0,5-2.2,5-5S13.8,0,11,0z M12.5,2C13.3,2,14,2.7,14,3.5S13.3,5,12.5,5S11,4.3,11,3.5
S11.7,2,12.5,2z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 880 B

BIN
pix/i/users.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 349 B

After

Width:  |  Height:  |  Size: 327 B

8
pix/i/users.svg
View File

@ -9,8 +9,8 @@
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M16,11.9V16h-4.6l-0.9-3.6l0.6-0.6L10.3,11H9.7l-0.8,0.9l0.6,0.6L8.6,16H4v-4l3.2-1.7
C7.7,10,7.8,9.5,7.5,9C7.5,9,6,7.2,6,5.2C6,2.3,7.8,0,10,0s4,2.3,4,5.2c0,2-1.4,3.8-1.4,3.8c-0.3,0.4-0.2,1,0.3,1.2L16,11.9z
M6.1,8.7C5.6,7.9,5,6.9,5,5.2c0-2.1,0.8-3.9,2-5C6.7,0.1,6.4,0,6,0C3.8,0,2,2.3,2,5.2C2,7.2,3.4,9,3.4,9c0.3,0.4,0.2,1-0.3,1.3
L0,12v4h3v-4.6c0,0,2.6-1.3,2.8-1.4C6.2,9.7,6.6,9.6,6.1,8.7z"/>
<path style="fill:#999999;" d="M3,16H0v-4l3.2-1.7C3.6,10,3.8,9.5,3.4,9C3.4,9,2,7.2,2,5.2C2,2.3,3.8,0,6,0c0.4,0,0.7,0.1,1.1,0.2
c-1.2,1.1-2,3-2,5c0,1.7,0.6,2.7,1,3.5c0.6,0.9,0.1,1-0.3,1.3C5.6,10.1,3,11.4,3,11.4V16z M16,11.9l-3.1-1.6
C12.4,10,12.3,9.4,12.6,9c0,0,1.4-1.8,1.4-3.8C14,2.3,12.2,0,10,0S6,2.3,6,5.2C6,7.2,7.5,9,7.5,9c0.3,0.4,0.2,1-0.3,1.3L4,12v4h12
V11.9z"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 976 B

BIN
pix/i/withsubcat.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 135 B

After

Width:  |  Height:  |  Size: 157 B

14
pix/i/withsubcat.svg Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve">
<defs>
</defs>
<polygon style="fill:#999999;" points="16,10 16,6 5,6 5,7 3,7 3,4 13,4 13,0 0,0 0,4 2,4 2,7 2,8 2,13 2,14 3,14 5,14 5,16 16,16
16,12 5,12 5,13 3,13 3,8 5,8 5,10 "/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 770 B

BIN
pix/t/backup.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 266 B

16
pix/t/backup.svg Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M12,7v4c0,0.5-0.5,1-1,1h-0.5l0,0H1c-0.5,0-1-0.5-1-1V7c0-0.5,0.5-1,1-1h0.5c0.5,0,1,0.5,1,1l0,2.5h7
V7c0-0.5,0.5-1,1-1H11C11.5,6,12,6.5,12,7z M9.9,3.6L6.6,0.3C6.4,0.1,6.2,0,5.9,0C5.7,0,5.4,0.1,5.2,0.3L1.9,3.6
C1.5,4,1.5,4.6,1.9,5l0.3,0.3c0.4,0.4,1,0.4,1.4,0l1-1.1l0,2.7c0,0.5,0.5,1,1,1l0.5,0c0.5,0,1-0.5,1-1l0-2.7l1,1
c0.4,0.4,1,0.4,1.4,0L10,5C10.3,4.6,10.3,4,9.9,3.6z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1009 B

BIN
pix/t/cohort.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 302 B

17
pix/t/cohort.svg Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M12,6.4V8H8.9C9,7.8,9.1,7.4,9.1,6.9c0-1.8-1-3.2-2.3-3.7c0-0.1,0-0.2,0-0.3c0-1.6,1-2.9,2.2-2.9
c1.2,0,2.2,1.3,2.2,2.9c0,1.1-0.5,1.7-0.5,1.7c-0.3,0.4-0.2,1,0.3,1.2L12,6.4z M2.7,6.9c0-1.9,1.1-3.4,2.6-3.8c0-0.1,0-0.1,0-0.2
c0-1.6-1-2.9-2.2-2.9C1.9,0,0.9,1.3,0.9,2.9c0,1.1,0.5,1.7,0.5,1.7c0.3,0.4,0.2,1-0.3,1.3L0,6.4V8h2.9C2.8,7.8,2.7,7.4,2.7,6.9z
M10.7,12c-0.1-0.5-0.4-0.9-0.8-1.1L7.8,9.8C7.3,9.5,7.2,9,7.6,8.6c0,0,0.5-0.6,0.5-1.7c0-1.6-1-2.9-2.2-2.9C4.7,4,3.7,5.3,3.7,6.9
c0,1.1,0.5,1.7,0.5,1.7c0.3,0.4,0.2,1-0.3,1.3l-2.1,1.1C1.5,11.1,1.2,11.6,1,12H10.7z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
pix/t/enrolusers.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 284 B

16
pix/t/enrolusers.svg Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M12,8.4V12H9.2L8.5,9.5l0.6-0.6L8.3,8H7.7L6.9,8.8l0.6,0.6L6.8,12H2v-1.2c0-0.5,0.2-1.2,0.7-1.5
l3.2-1.8c0.5-0.3,0.6-0.8,0.3-1.3c0,0-0.9-1.1-0.9-2.5C5.2,1.7,6.5,0,8.1,0S11,1.7,11,3.8c0,1.4-0.9,2.5-0.9,2.5
c-0.3,0.4-0.2,1,0.3,1.2L12,8.4z M4.7,5.9c0,0-0.5-1-0.5-2.1c0-1.3,0.4-2.4,1.1-3.3C4.9,0.2,4.4,0,3.9,0C2.3,0,1,1.7,1,3.8
c0,1.4,0.9,2.5,0.9,2.5c0.3,0.4,0,1-0.5,1.3L0,8.2V12h1v-1.8C1,9.7,1.2,9,1.7,8.8l2.6-1.5C4.8,7,5,6.4,4.7,5.9z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
pix/t/restore.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 278 B

16
pix/t/restore.svg Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M12,7v4c0,0.5-0.5,1-1,1h-0.5l0,0H1c-0.5,0-1-0.5-1-1V7c0-0.5,0.5-1,1-1h0.5c0.5,0,1,0.5,1,1l0,2.5h7
V7c0-0.5,0.5-1,1-1H11C11.5,6,12,6.4,12,7z M10,3L9.6,2.7c-0.4-0.4-1-0.4-1.4,0l-1,1l0-2.7c0-0.5-0.5-1-1-1L5.7,0c-0.5,0-1,0.5-1,1
l0,2.7l-1.1-1c-0.4-0.4-1-0.4-1.4,0L1.9,3c-0.4,0.4-0.4,1,0,1.4l3.3,3.3C5.4,7.9,5.7,8,6,8c0.3,0,0.5-0.1,0.7-0.3L10,4.4
C10.4,4,10.4,3.4,10,3z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1007 B

2
theme/upgrade.txt
View File

@ -16,6 +16,8 @@ optional changes:
* new icons i/export and i/import (sized 16x16). Previously export and import actions used i/backup and i/restore.
* new icon i/assignroles (sized 16x16), to prevent the use of i/roles which is 12x12.
* new icon i/switchrole (sized 16x16), was previously using i/roles. Now is a copy of the new i/assignroles icon.
* new icons i/enrolusers and t/enrolusers, previsouly i/users was used.
* new icon t/cohorts (sized 12x12), to prevent the use of i/cohorts which is 16x16.
=== 2.3 ===