From 447cfc94a2672047539cd94cf84745cb92e1a9d0 Mon Sep 17 00:00:00 2001 From: Barbara Ramiro Date: Thu, 15 Nov 2012 18:50:42 +0800 Subject: [PATCH 1/2] MDL-36622 usability: New icons on course category page --- pix/i/cohort.png | Bin 0 -> 340 bytes pix/i/cohort.svg | 18 ++++++++++++++++++ pix/i/permissions.png | Bin 0 -> 268 bytes pix/i/permissions.svg | 15 +++++++++++++++ pix/i/withsubcat.png | Bin 135 -> 157 bytes pix/i/withsubcat.svg | 14 ++++++++++++++ pix/t/backup.png | Bin 0 -> 266 bytes pix/t/backup.svg | 16 ++++++++++++++++ pix/t/cohort.png | Bin 0 -> 302 bytes pix/t/cohort.svg | 17 +++++++++++++++++ pix/t/enrolusers.png | Bin 0 -> 284 bytes pix/t/enrolusers.svg | 16 ++++++++++++++++ pix/t/restore.png | Bin 0 -> 278 bytes pix/t/restore.svg | 16 ++++++++++++++++ 14 files changed, 112 insertions(+) create mode 100644 pix/i/cohort.png create mode 100644 pix/i/cohort.svg create mode 100644 pix/i/permissions.png create mode 100644 pix/i/permissions.svg create mode 100644 pix/i/withsubcat.svg create mode 100644 pix/t/backup.png create mode 100644 pix/t/backup.svg create mode 100644 pix/t/cohort.png create mode 100644 pix/t/cohort.svg create mode 100644 pix/t/enrolusers.png create mode 100644 pix/t/enrolusers.svg create mode 100644 pix/t/restore.png create mode 100644 pix/t/restore.svg diff --git a/pix/i/cohort.png b/pix/i/cohort.png new file mode 100644 index 0000000000000000000000000000000000000000..d9c15bdbe231a2bd39d7416e9a0bb1c8203a43af GIT binary patch literal 340 zcmV-a0jvIrP)%@p{}{|MVBk-@1Q-D5WI!n}PW>JL0000 + + +]> + + + + + diff --git a/pix/i/permissions.png b/pix/i/permissions.png new file mode 100644 index 0000000000000000000000000000000000000000..7c1c8ec388e182616796be3e758a734a15fb156f GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X)_J-(hE&{2N>N})J2&Sh!;(*p5e!;i7(3LNKDK=M@`b;L z#biEv5SzskeTI$7#*DL-FSLj=6e>=6%Xq|o<_8M}x$YZI3pVpNWN6sWXYFU?y1~P` zi|1wmqZr#I2PTojjKX~X)deyiu&c?;dM=!Kz{QQrB%Xn7g`)7pS@sGW + + +]> + + + + + diff --git a/pix/i/withsubcat.png b/pix/i/withsubcat.png index e0fd2e143184df62e0dda4dc22fa9d3f03f1ae33..2e5c33b7a0a4110f9969690b806e0ef66a954a97 100644 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X>^)r^Ln>}1&9N+gR?jBnSXE`E+;jGbgQ7$Q^Mi&t8y0kN zM`)DtaxcA?;M5=g#6qr@)#@md@>0D87Ca10JPdwYq(t9}?Y{^#iow&>&t;ucLK6UD C3NQWu literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-v3?#1{n!goDF%}28J29*~C-V}>;SBHzaXrJp z(9qCu;J|^nbsfPV6(vD_!3+-1ZlnP@@}4e^Asn*F2@FjaE- + + +]> + + + + + diff --git a/pix/t/backup.png b/pix/t/backup.png new file mode 100644 index 0000000000000000000000000000000000000000..27fb5290a28b8637c35db1406d60640792e512e8 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1GYdl>XLn>}1r8qDfr=Rm-2>RUkgIU0O+4AM_4%5<)ER + + +]> + + + + + diff --git a/pix/t/cohort.png b/pix/t/cohort.png new file mode 100644 index 0000000000000000000000000000000000000000..77b26b697368f65c0f2e908ffc84369dec1f7ab7 GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1G7d%}YLn>~y1m5O7WFX+Zh)=-m1=|6(w`?06e_zd4V^CwT z`_1aZAbo*%7Vjyx6qcGpLf2Ptc&nSAvz@cr)Zz9v(HA*(H_UxEFV>54-P=~TaZg3# zo}Wpc@1}|c8f^B^E2x-ZX!gW;(R4p8;g20Vl&#v_N+g6o2!?Emkj{9%>Rr>5F4gnw z>r+ya{FhztkmkNFxx13fHOWywNpYuN=OO>k>|yd5`2oIGKlDobW^WKspVg!8aKFz33`#0|w(L+rN3i?+ya}#^CAd=d#Wzp$Pzp%yTdR literal 0 HcmV?d00001 diff --git a/pix/t/cohort.svg b/pix/t/cohort.svg new file mode 100644 index 00000000000..49b1c74986a --- /dev/null +++ b/pix/t/cohort.svg @@ -0,0 +1,17 @@ + + + +]> + + + + + diff --git a/pix/t/enrolusers.png b/pix/t/enrolusers.png new file mode 100644 index 0000000000000000000000000000000000000000..4f41e91fa316eb896bd41e7f3713313825580e61 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1G`#fD7Ln>~S1Rmr)WFW9ROjbeq0*JE2yog zNb53iy2+r{AZX=O`>1J+fR1Hg(YLRU!kAhFWVUgXeLBc^r%~PdeAV;4@maeqCja2I z66(GhqI~i~@JBYer{cEKGNSXon6@P|FW$PbYsJez&f9Nv)_AsQi++2+p*Qp4BJWm@ z(w37gT2eV{G>tPPlAE8VI=%g1kmwyNo^@mCM7G(slOi@6)=kcO;kfa`g=$09zfbFf g=6pU9#>mDHXQ}r6;NjF*pidY)UHx3vIVCg!0B3A%x&QzG literal 0 HcmV?d00001 diff --git a/pix/t/enrolusers.svg b/pix/t/enrolusers.svg new file mode 100644 index 00000000000..13fd1675a5a --- /dev/null +++ b/pix/t/enrolusers.svg @@ -0,0 +1,16 @@ + + + +]> + + + + + diff --git a/pix/t/restore.png b/pix/t/restore.png new file mode 100644 index 0000000000000000000000000000000000000000..86e52f5e2928cebaec10075336db73a46db19d98 GIT binary patch literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1GJ3L(+Ln>}1r8qDfr=R0t2ztFR=J=N{UzksP^5L0rfT8nk zgWgFF(@+MFugo9W75;G?`5N$((}8EwZ-y-^1tOgpLztOECNqf57H*s+c3@5kqbJks zqzQ`b56l!Q%k0E>6^`}=d}9_{aOiu0YimH~UyoS{U5^_jp1k4r@tDNqU>?_?^@Aap zN3^+h4ujhUCsBzopr05KC`MF0Q* literal 0 HcmV?d00001 diff --git a/pix/t/restore.svg b/pix/t/restore.svg new file mode 100644 index 00000000000..092073a36da --- /dev/null +++ b/pix/t/restore.svg @@ -0,0 +1,16 @@ + + + +]> + + + + + From c42651d682ab7e8adbee3521ae366a0a1fa71270 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Thu, 15 Nov 2012 19:30:16 +0800 Subject: [PATCH 2/2] MDL-36622 usability: Adaptations following new icons --- course/category.php | 2 +- course/index.php | 2 +- course/search.php | 2 +- enrol/manual/lib.php | 2 +- lib/enrollib.php | 2 +- pix/i/enrolusers.png | Bin 0 -> 349 bytes pix/i/enrolusers.svg | 16 ++++++++++++++++ pix/i/users.png | Bin 349 -> 327 bytes pix/i/users.svg | 8 ++++---- theme/upgrade.txt | 2 ++ 10 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 pix/i/enrolusers.png create mode 100644 pix/i/enrolusers.svg diff --git a/course/category.php b/course/category.php index e363e4139fd..43b11320327 100644 --- a/course/category.php +++ b/course/category.php @@ -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)) { diff --git a/course/index.php b/course/index.php index 209e2800f5d..a1a5e569957 100644 --- a/course/index.php +++ b/course/index.php @@ -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 ' '; + ' src="'.$OUTPUT->pix_url('t/cohort') . '" class="iconsmall" alt="'.$str->cohorts.'" /> '; } if ($up) { diff --git a/course/search.php b/course/search.php index 8c9f85cd156..393ab0b6faa 100644 --- a/course/search.php +++ b/course/search.php @@ -336,7 +336,7 @@ if ($courses) { // checks whether user can do role assignment if (has_capability('moodle/course:enrolreview', $coursecontext)) { echo''; - echo ''.get_string('enrolledusers', 'enrol').' ' . "\n"; + echo ''.get_string('enrolledusers', 'enrol').' ' . "\n"; } // checks whether user can delete course diff --git a/enrol/manual/lib.php b/enrol/manual/lib.php index ee17fa97016..94b89dceff4 100644 --- a/enrol/manual/lib.php +++ b/enrol/manual/lib.php @@ -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)); diff --git a/lib/enrollib.php b/lib/enrollib.php index 835a07a4b14..6295a108f07 100644 --- a/lib/enrollib.php +++ b/lib/enrollib.php @@ -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/enrolusers.png b/pix/i/enrolusers.png new file mode 100644 index 0000000000000000000000000000000000000000..23d78326e366fa1ff18a5f7fe27337d322ff6059 GIT binary patch literal 349 zcmV-j0iyniP) + + +]> + + + + + diff --git a/pix/i/users.png b/pix/i/users.png index 23d78326e366fa1ff18a5f7fe27337d322ff6059..393371b021a2f86b822b5e554c9e9cb9456b40bb 100644 GIT binary patch delta 262 zcmV+h0r~#j0>=W7Nq^}{L_t(|+Qd@95rRMrJg9&Yumei41EB)-#S^T6p@PFFFR=qk zpaeUR5-7oqlf!V_G0ymKXEM1!c9Y8`Py%h+CU6?IhfS~yR&h)iV3$14ABGbMas>B; zMf@pau~;oZ!aInNSE2Z!1(_-(4zl7LZ2~Efit`cpgf6q?8vpC>6AFJ&yHh92{cU;U@5^1ID!$FvrXv1ERN&P6yu0s56c(y z_$XpAUoAnxCy3ChTyar~V9FF2f))FelOY8{v44R#WklZenR%36Z@-X>*!2PEX4lKjkKXy32;f3a0)bgLc1Cy9-ia7%D<0&gDebu5^ZCi{)v^dIpb%pUMwA|NL#c*elT6F5Df# j1D^ILkN5&V0Tu=T%&tK}1qKSi00000NkvXXu0mjf0Q-Gg diff --git a/pix/i/users.svg b/pix/i/users.svg index 28ce5f478c2..837e63d0079 100644 --- a/pix/i/users.svg +++ b/pix/i/users.svg @@ -9,8 +9,8 @@ xml:space="preserve"> - + diff --git a/theme/upgrade.txt b/theme/upgrade.txt index ce15db20614..105f4258541 100644 --- a/theme/upgrade.txt +++ b/theme/upgrade.txt @@ -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 ===