diff --git a/course/lib.php b/course/lib.php
index e1a54f036f8..2e1709559c0 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -2289,7 +2289,7 @@ function print_category_info($category, $depth=0, $showcourses = false) {
$courseicon = '';
if ($icons = enrol_get_course_info_icons($course)) {
foreach ($icons as $pix_icon) {
- $courseicon = $OUTPUT->render($pix_icon).' ';
+ $courseicon = $OUTPUT->render($pix_icon);
}
}
diff --git a/enrol/guest/pix/withoutpassword.png b/enrol/guest/pix/withoutpassword.png
new file mode 100644
index 00000000000..f803c863605
Binary files /dev/null and b/enrol/guest/pix/withoutpassword.png differ
diff --git a/enrol/guest/pix/withoutpassword.svg b/enrol/guest/pix/withoutpassword.svg
new file mode 100644
index 00000000000..44faf6e0ba7
--- /dev/null
+++ b/enrol/guest/pix/withoutpassword.svg
@@ -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>
+<path style="fill:#999999;" d="M5.2,10.3L0,13.1V16h16v-3l-5.2-2.7C10.3,10,10.2,9.4,10.6,9c0,0,1.4-1.8,1.4-3.8C12,2.3,10.2,0,8,0
+ S4,2.3,4,5.2C4,7.2,5.4,9,5.4,9C5.8,9.5,5.7,10,5.2,10.3z"/>
+</svg>
diff --git a/enrol/guest/pix/withpassword.png b/enrol/guest/pix/withpassword.png
new file mode 100644
index 00000000000..63198b102e7
Binary files /dev/null and b/enrol/guest/pix/withpassword.png differ
diff --git a/enrol/guest/pix/withpassword.svg b/enrol/guest/pix/withpassword.svg
new file mode 100644
index 00000000000..8a3478d9ec3
--- /dev/null
+++ b/enrol/guest/pix/withpassword.svg
@@ -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="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="M3.4,9C3.4,9,2,7.2,2,5.2C2,2.3,3.8,0,6,0s4,2.3,4,5.2c0,0.1,0,0.1,0,0.2C8.8,6.2,8,7.6,8,9.2
+ c0,0.1,0,0.2,0,0.4l-4,4V16H0v-4l3.2-1.7C3.7,10,3.8,9.5,3.4,9z M11.8,13.6L10.4,15H10v0.4l-0.6,0.6L9,16h3v-2.3
+ C11.9,13.6,11.8,13.6,11.8,13.6z M16,9.2c0,1.9-1.6,3.5-3.5,3.5c-0.4,0-0.7-0.1-1-0.2L10,14H9v1l0,0H8v1l0,0H5v-2l4.1-4.1
+ C9,9.6,9,9.4,9,9.2c0-1.9,1.6-3.5,3.5-3.5S16,7.2,16,9.2z M14.5,8c0-0.6-0.4-1-1-1c-0.6,0-1,0.4-1,1s0.4,1,1,1C14,9,14.5,8.5,14.5,8
+ z"/>
+</svg>
diff --git a/enrol/self/pix/withkey.png b/enrol/self/pix/withkey.png
new file mode 100644
index 00000000000..f2a2d16644f
Binary files /dev/null and b/enrol/self/pix/withkey.png differ
diff --git a/enrol/self/pix/withkey.svg b/enrol/self/pix/withkey.svg
new file mode 100644
index 00000000000..651e6599dac
--- /dev/null
+++ b/enrol/self/pix/withkey.svg
@@ -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="M9,16H1c-0.5,0-1-0.5-1-1V1c0-0.5,0.5-1,1-1h8v2H3C2.4,2,2,2.4,2,3v10c0,0.6,0.4,1,1,1h6V16z M16,5.2
+ c0,1.9-1.6,3.5-3.5,3.5c-0.4,0-0.7-0.1-1-0.2L10,10H9v1l0,0H8v1l0,0H5v-2l4.1-4.1C9,5.7,9,5.5,9,5.2c0-1.9,1.6-3.5,3.5-3.5
+ S16,3.3,16,5.2z M14.5,4c0-0.6-0.4-1-1-1c-0.6,0-1,0.4-1,1s0.4,1,1,1C14,5,14.5,4.6,14.5,4z"/>
+</svg>
diff --git a/enrol/self/pix/withoutkey.png b/enrol/self/pix/withoutkey.png
new file mode 100644
index 00000000000..b00cdfd6d9a
Binary files /dev/null and b/enrol/self/pix/withoutkey.png differ
diff --git a/enrol/self/pix/withoutkey.svg b/enrol/self/pix/withoutkey.svg
new file mode 100644
index 00000000000..d3621e2ceb6
--- /dev/null
+++ b/enrol/self/pix/withoutkey.svg
@@ -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="M9,16H1c-0.5,0-1-0.5-1-1V1c0-0.5,0.5-1,1-1h8v2H3C2.4,2,2,2.4,2,3v10c0,0.6,0.4,1,1,1h6V16z M15,6.5
+ h-4.7l1-1c0.4-0.4,0.4-1,0-1.4l-0.7-0.7c-0.4-0.4-1-0.4-1.4,0l-4,4c-0.4,0.4-0.4,1,0,1.4l4,4c0.4,0.4,1,0.4,1.4,0l0.7-0.7
+ c0.4-0.4,0.4-1,0-1.4l-1.1-1.1H15c0.5,0,1-0.4,1-1v-1C16,7,15.5,6.5,15,6.5z"/>
+</svg>
diff --git a/theme/base/style/course.css b/theme/base/style/course.css
index 38ea24716a8..b12aaa1cabb 100644
--- a/theme/base/style/course.css
+++ b/theme/base/style/course.css
@@ -98,6 +98,8 @@
#page-course-category #coursesearch,
#page-course-category .singlebutton,
#page-course-editsection .singlebutton {text-align:center;}
+#page-course-category #movecourses td img { margin: 0 .22em; vertical-align: text-bottom;}
+#page-course-category #movecourses td img.icon { padding: 0; }
#coursesearch,
#coursesearch2 {margin-top: 1em;text-align:center;}
@@ -110,26 +112,30 @@
#page-course-pending .pendingcourserequests .cell {padding: 0 5px;}
#page-course-pending .pendingcourserequests .cell.c6 {white-space: nowrap;}
-
.coursebox {width: 100%;margin-bottom: 15px;}
.coursebox .info {float: left;text-align:left;width: 40%;}
.coursebox .summary {float: right;text-align:left;width: 55%;}
.coursebox .summary .category {text-align:right;}
.coursebox .teachers li {list-style-type:none;padding:0;margin:0;}
+.coursebox .enrolmenticons {margin-top: .3em;}
+.coursebox .enrolmenticons img {margin-right: .45em;}
.categorylist {width: 100%;}
.categorylist .category .numberofcourse {font-style: italic; font-size: 0.85em; font-style: normal;}
.categorylist .category {padding-top: 5px; padding-bottom: 5px; }
.categorylist .category .info,
-.categorylist .category .indentation,
.categorylist .category .name,
.categorylist .category .image,
.categorylist .course .name,
-.categorylist .course .info {float:left;text-align: left;}
-.categorylist .course {padding-left:18px;}
-
-.categorylist .indentation {padding-left: 20px;}
-#page-course-index .category .image {padding-right: 2px;}
+.categorylist .course .info {float:left;text-align: left; margin-left: .45em;}
+.categorylist .course .name img.smallicon { vertical-align: text-bottom; margin-right: .45em;}
+.dir-rtl .categorylist .course .name img.smallicon { margin-left: .45em; margin-right: 0;}
+.categorylist .course .info {margin-left: .45em;}
+.categorylist .course .info img { vertical-align: text-bottom;}
+.dir-rtl .categorylist .course .info {margin-right: .45em; margin-left: 0;}
+.categorylist .course {padding-left:24px; margin-bottom: .5em; line-height: 1.5em;}
+.categorylist .course .indentation { margin-left: 24px;}
+.categorylist .category .indentation { margin-left: 24px;}
.course ul.section {margin:5px;padding:0;}
@@ -142,16 +148,16 @@
.course_category_tree .controls div {display:inline;cursor:pointer;}
.course_category_tree .category.with_children>.category_label {background-image:url([[pix:moodle|t/expanded]]);background-repeat: no-repeat;}
.course_category_tree .category_label {padding-left:13px;}
-.course_category_tree .category .category {margin:5px;}
+.course_category_tree .category .category {margin:5px 0;}
.course_category_tree .category .courses {padding-left:16px;}
-.course_category_tree .category .courses .course_link {display:block;background-image:url([[pix:moodle|i/course]]);background-repeat: no-repeat;padding-left:18px;}
+.course_category_tree .category .courses .course_link {display:block;background-image:url([[pix:moodle|i/course]]);background-repeat: no-repeat;padding-left:21px;}
.course_category_tree .category .course {position:relative;}
.course_category_tree .category .course_info {position:absolute;right:0;top:0;}
.dir-rtl .course_category_tree .category .course_info { position: static; }
.dir-rtl .course_category_tree .category .course_info a, .dir-rtl .course_category_tree .category .course_info div {float: right;}
.dir-rtl .course_category_tree .controls div {padding: 7px;}
-.course_category_tree .category .course_info a,
-.course_category_tree .category .course_info div {float:left;width:16px;height:16px;}
+.course_category_tree .category .course_info img { margin-left: .45em;}
+.dir-rtl .course_category_tree .category .course_info img { margin-right: .45em; margin-left: 0;}
.jsenabled .course_category_tree .controls {visibility: visible;}
.jsenabled .course_category_tree .category.with_children.collapsed .category_label {background-image:url([[pix:moodle|t/collapsed]]);}
.jsenabled .course_category_tree .category.with_children.collapsed .subcategories,