Merge branch 'MDL-36471-master-int' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 16 Nov 2012 03:01:53 +0000 (11:01 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 16 Nov 2012 03:01:53 +0000 (11:01 +0800)
27 files changed:
course/category.php
course/index.php
course/lib.php
course/search.php
enrol/manual/lib.php
lib/enrollib.php
pix/i/cohort.png [new file with mode: 0644]
pix/i/cohort.svg [new file with mode: 0644]
pix/i/enrolusers.png [new file with mode: 0644]
pix/i/enrolusers.svg [new file with mode: 0644]
pix/i/permissions.png [new file with mode: 0644]
pix/i/permissions.svg [new file with mode: 0644]
pix/i/rss.png [new file with mode: 0644]
pix/i/rss.svg [new file with mode: 0644]
pix/i/users.png
pix/i/users.svg
pix/i/withsubcat.png
pix/i/withsubcat.svg [new file with mode: 0644]
pix/t/backup.png [new file with mode: 0644]
pix/t/backup.svg [new file with mode: 0644]
pix/t/cohort.png [new file with mode: 0644]
pix/t/cohort.svg [new file with mode: 0644]
pix/t/enrolusers.png [new file with mode: 0644]
pix/t/enrolusers.svg [new file with mode: 0644]
pix/t/restore.png [new file with mode: 0644]
pix/t/restore.svg [new file with mode: 0644]
theme/upgrade.txt

index e363e41..43b1132 100644 (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)) {
index 209e280..a1a5e56 100644 (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) {
index 8626b42..7d2ed99 100644 (file)
@@ -1252,6 +1252,7 @@ function get_module_types_names($plural = false) {
 function course_set_marker($courseid, $marker) {
     global $DB;
     $DB->set_field("course", "marker", $marker, array('id' => $courseid));
+    format_base::reset_course_cache($courseid);
 }
 
 /**
index 8c9f85c..393ab0b 100644 (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
index ee17fa9..94b89dc 100644 (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));
index 835a07a..6295a10 100644 (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
diff --git a/pix/i/cohort.png b/pix/i/cohort.png
new file mode 100644 (file)
index 0000000..d9c15bd
Binary files /dev/null and b/pix/i/cohort.png differ
diff --git a/pix/i/cohort.svg b/pix/i/cohort.svg
new file mode 100644 (file)
index 0000000..c573e94
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<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\r
+       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\r
+        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\r
+       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\r
+       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"\r
+       />\r
+</svg>\r
diff --git a/pix/i/enrolusers.png b/pix/i/enrolusers.png
new file mode 100644 (file)
index 0000000..23d7832
Binary files /dev/null and b/pix/i/enrolusers.png differ
diff --git a/pix/i/enrolusers.svg b/pix/i/enrolusers.svg
new file mode 100644 (file)
index 0000000..28ce5f4
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<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\r
+       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\r
+        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\r
+       L0,12v4h3v-4.6c0,0,2.6-1.3,2.8-1.4C6.2,9.7,6.6,9.6,6.1,8.7z"/>\r
+</svg>\r
diff --git a/pix/i/permissions.png b/pix/i/permissions.png
new file mode 100644 (file)
index 0000000..7c1c8ec
Binary files /dev/null and b/pix/i/permissions.png differ
diff --git a/pix/i/permissions.svg b/pix/i/permissions.svg
new file mode 100644 (file)
index 0000000..935d811
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<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\r
+       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\r
+       S11.7,2,12.5,2z"/>\r
+</svg>\r
diff --git a/pix/i/rss.png b/pix/i/rss.png
new file mode 100644 (file)
index 0000000..9835e38
Binary files /dev/null and b/pix/i/rss.png differ
diff --git a/pix/i/rss.svg b/pix/i/rss.svg
new file mode 100644 (file)
index 0000000..99cf4d2
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M0,0.1C0.3,0,0.7,0,1,0c8.2,0,15,6.7,15,15c0,0.3,0,0.7-0.1,1h-3c0-0.3,0.1-0.7,0.1-1\r
+       C13,8.4,7.6,3,1,3C0.7,3,0.3,3,0,3.1V0.1z M2.5,11c-1.3,0-2.4,1-2.5,2.3v0.5c0.1,1.2,1,2.1,2.2,2.2h0.5C4,15.8,5,14.8,5,13.5\r
+       C5,12.1,3.9,11,2.5,11z M0,5v3c4.4,0,8,3.6,8,8h3C11,9.9,6.1,5,0,5z"/>\r
+</svg>\r
index 23d7832..393371b 100644 (file)
Binary files a/pix/i/users.png and b/pix/i/users.png differ
index 28ce5f4..837e63d 100644 (file)
@@ -9,8 +9,8 @@
         xml:space="preserve">\r
 <defs>\r
 </defs>\r
-<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\r
-       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\r
-        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\r
-       L0,12v4h3v-4.6c0,0,2.6-1.3,2.8-1.4C6.2,9.7,6.6,9.6,6.1,8.7z"/>\r
+<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\r
+       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\r
+       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\r
+       V11.9z"/>\r
 </svg>\r
index e0fd2e1..2e5c33b 100644 (file)
Binary files a/pix/i/withsubcat.png and b/pix/i/withsubcat.png differ
diff --git a/pix/i/withsubcat.svg b/pix/i/withsubcat.svg
new file mode 100644 (file)
index 0000000..86ff2ef
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<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 \r
+       16,12 5,12 5,13 3,13 3,8 5,8 5,10 "/>\r
+</svg>\r
diff --git a/pix/t/backup.png b/pix/t/backup.png
new file mode 100644 (file)
index 0000000..27fb529
Binary files /dev/null and b/pix/t/backup.png differ
diff --git a/pix/t/backup.svg b/pix/t/backup.svg
new file mode 100644 (file)
index 0000000..4513122
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<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\r
+       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\r
+       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\r
+       c0.4,0.4,1,0.4,1.4,0L10,5C10.3,4.6,10.3,4,9.9,3.6z"/>\r
+</svg>\r
diff --git a/pix/t/cohort.png b/pix/t/cohort.png
new file mode 100644 (file)
index 0000000..77b26b6
Binary files /dev/null and b/pix/t/cohort.png differ
diff --git a/pix/t/cohort.svg b/pix/t/cohort.svg
new file mode 100644 (file)
index 0000000..49b1c74
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<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\r
+       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\r
+       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\r
+        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\r
+       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"/>\r
+</svg>\r
diff --git a/pix/t/enrolusers.png b/pix/t/enrolusers.png
new file mode 100644 (file)
index 0000000..4f41e91
Binary files /dev/null and b/pix/t/enrolusers.png differ
diff --git a/pix/t/enrolusers.svg b/pix/t/enrolusers.svg
new file mode 100644 (file)
index 0000000..13fd167
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<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\r
+       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\r
+       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\r
+       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"/>\r
+</svg>\r
diff --git a/pix/t/restore.png b/pix/t/restore.png
new file mode 100644 (file)
index 0000000..86e52f5
Binary files /dev/null and b/pix/t/restore.png differ
diff --git a/pix/t/restore.svg b/pix/t/restore.svg
new file mode 100644 (file)
index 0000000..092073a
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<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\r
+       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\r
+       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\r
+       C10.4,4,10.4,3.4,10,3z"/>\r
+</svg>\r
index ce15db2..105f425 100644 (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 ===