From 5326675e2019f3cd1295ff1eb00f233dc904a33c Mon Sep 17 00:00:00 2001 From: Barbara Ramiro Date: Fri, 23 Nov 2012 14:11:07 +0800 Subject: [PATCH 1/2] MDL-36775 usability: New icons for calendar events --- calendar/lib.php | 16 ++++++++-------- pix/i/courseevent.png | Bin 0 -> 230 bytes pix/i/courseevent.svg | 17 +++++++++++++++++ pix/i/groupevent.png | Bin 0 -> 327 bytes pix/i/groupevent.svg | 16 ++++++++++++++++ pix/i/siteevent.png | Bin 0 -> 208 bytes pix/i/siteevent.svg | 17 +++++++++++++++++ pix/i/userevent.png | Bin 0 -> 264 bytes pix/i/userevent.svg | 14 ++++++++++++++ theme/upgrade.txt | 5 +++++ 10 files changed, 77 insertions(+), 8 deletions(-) create mode 100644 pix/i/courseevent.png create mode 100644 pix/i/courseevent.svg create mode 100644 pix/i/groupevent.png create mode 100644 pix/i/groupevent.svg create mode 100644 pix/i/siteevent.png create mode 100644 pix/i/siteevent.svg create mode 100644 pix/i/userevent.png create mode 100644 pix/i/userevent.svg diff --git a/calendar/lib.php b/calendar/lib.php index 8401de36add..8832cbbdca3 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -322,13 +322,13 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y $popupalt = $event->modulename; $component = $event->modulename; } else if ($event->courseid == SITEID) { // Site event - $popupicon = 'c/site'; + $popupicon = 'i/siteevent'; } else if ($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) { // Course event - $popupicon = 'c/course'; + $popupicon = 'i/courseevent'; } else if ($event->groupid) { // Group event - $popupicon = 'c/group'; + $popupicon = 'i/groupevent'; } else if ($event->userid) { // User event - $popupicon = 'c/user'; + $popupicon = 'i/userevent'; } $dayhref->set_anchor('event_'.$event->id); @@ -614,7 +614,7 @@ function calendar_add_event_metadata($event) { } else if($event->courseid == SITEID) { // Site event - $event->icon = ''.get_string('globalevent', 'calendar').''; + $event->icon = ''.get_string('globalevent', 'calendar').''; $event->cssclass = 'calendar_event_global'; } else if($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) { // Course event calendar_get_course_cached($coursecache, $event->courseid); @@ -622,14 +622,14 @@ function calendar_add_event_metadata($event) { $context = context_course::instance($event->courseid); $fullname = format_string($coursecache[$event->courseid]->fullname, true, array('context' => $context)); - $event->icon = ''.get_string('courseevent', 'calendar').''; + $event->icon = ''.get_string('courseevent', 'calendar').''; $event->courselink = ''.$fullname.''; $event->cssclass = 'calendar_event_course'; } else if ($event->groupid) { // Group event - $event->icon = ''.get_string('groupevent', 'calendar').''; + $event->icon = ''.get_string('groupevent', 'calendar').''; $event->cssclass = 'calendar_event_group'; } else if($event->userid) { // User event - $event->icon = ''.get_string('userevent', 'calendar').''; + $event->icon = ''.get_string('userevent', 'calendar').''; $event->cssclass = 'calendar_event_user'; } return $event; diff --git a/pix/i/courseevent.png b/pix/i/courseevent.png new file mode 100644 index 0000000000000000000000000000000000000000..fe9df5fb5ba4e5c81c54892553031a2614a3b9e2 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XIy_w*Ln>}1r7$$jG*0JYSozz5XHh4s{H4p6S!YgQ@wmtn z&Tqz$afzMHh*8;y{e>v2LMZ + + +]> + + + + + diff --git a/pix/i/groupevent.png b/pix/i/groupevent.png new file mode 100644 index 0000000000000000000000000000000000000000..393371b021a2f86b822b5e554c9e9cb9456b40bb GIT binary patch literal 327 zcmV-N0l5B&P)0KDPyr%EkVLNh>%yI_@M=vDkToG;v8)PDUgcu9d=ZHqzeJG zAB*aQ(Nlfyf;n>sTgg6r1Tc`nanEUsZ8&lUy*MAN*hcRfVlB=m9;6TTN`RN65lM*^ z8+5Bh;w36!1>gP3b11CWksUO&OaaIxuPY^<9ZTiIyHF^Tq1eIQz95^IszUW6{x9$n ZU;r)6ID{^< + + +]> + + + + + diff --git a/pix/i/siteevent.png b/pix/i/siteevent.png new file mode 100644 index 0000000000000000000000000000000000000000..02a18b55970b2e7221578853d553cd2e994c454a GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XiacE$Ln>}1B{(n}r=R`Cq#zC9Mq+*0<8U6LIl=?O^-L>dk;Sju#y z9{wS+yFoDgj}Y^Li`K7N9Urhx;I^BvQhp7;!U2Zq73s1w<07qrwljFT`njxgN@xNA D0G~rZ literal 0 HcmV?d00001 diff --git a/pix/i/siteevent.svg b/pix/i/siteevent.svg new file mode 100644 index 00000000000..061d4bb8a81 --- /dev/null +++ b/pix/i/siteevent.svg @@ -0,0 +1,17 @@ + + + +]> + + + + + diff --git a/pix/i/userevent.png b/pix/i/userevent.png new file mode 100644 index 0000000000000000000000000000000000000000..f803c863605daa69fb5623ecf62fa91cbf66f022 GIT binary patch literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XR(ZNOhE&{2N;$xkc5Y54!;)W(HyE`_7&^EwU%srrV0G$| zMUf01ciEE|O;++dtl=hIJ2j~-Vp2GFTu@p;+{eMsr^jO!_X1AW z28SJuCjKpwM>wv`V7R)%A&I4dH;GZ`^T{5^f=hBgT37@U80N)j7C0 literal 0 HcmV?d00001 diff --git a/pix/i/userevent.svg b/pix/i/userevent.svg new file mode 100644 index 00000000000..9fc00819b5f --- /dev/null +++ b/pix/i/userevent.svg @@ -0,0 +1,14 @@ + + + +]> + + + + + diff --git a/theme/upgrade.txt b/theme/upgrade.txt index 908ffb5cc43..851728f0819 100644 --- a/theme/upgrade.txt +++ b/theme/upgrade.txt @@ -8,6 +8,10 @@ required changes: deprecation: * i/roles: Use t/assignroles instead +* c/course: Use i/courseevent instead +* c/group: Use i/groupevent instead +* c/site: Use i/siteevent instead +* c/user: Use i/userevent instead optional changes: * new optional boolean parameter $withlinks for public function login_info() in lib/outputrenderers.php (MDL-31365) @@ -20,6 +24,7 @@ optional changes: * new icon t/cohorts (sized 12x12), to prevent the use of i/cohorts which is 16x16. * new icons t/sort_asc, t/sort_desc to use for ordering in table headers. * new class 'iconsort' for icons used for ordering in table headers. +* new icons i/courseevent, i/groupevent, i/siteevent and i/userevent (16x16) instead of c/* for calendar events. === 2.3 === From 857c5f90e781682f673edd3406a17dfa2f58d02a Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Fri, 23 Nov 2012 14:45:29 +0800 Subject: [PATCH 2/2] MDL-36775 usability: Code update following new calendar icons --- calendar/lib.php | 12 ++++++------ theme/base/style/blocks.css | 1 + theme/base/style/calendar.css | 10 +++++++++- theme/standard/style/blocks.css | 1 + theme/standard/style/calendar.css | 1 + theme/standard/style/css3.css | 20 ++++++++++++++++++++ 6 files changed, 38 insertions(+), 7 deletions(-) diff --git a/calendar/lib.php b/calendar/lib.php index 8832cbbdca3..2549493d441 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -607,14 +607,14 @@ function calendar_add_event_metadata($event) { $context = context_course::instance($module->course); $fullname = format_string($coursecache[$module->course]->fullname, true, array('context' => $context)); - $event->icon = ''.$eventtype.''; + $event->icon = ''.$eventtype.''; $event->referer = ''.$event->name.''; $event->courselink = ''.$fullname.''; $event->cmid = $module->id; } else if($event->courseid == SITEID) { // Site event - $event->icon = ''.get_string('globalevent', 'calendar').''; + $event->icon = ''.get_string('globalevent', 'calendar').''; $event->cssclass = 'calendar_event_global'; } else if($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) { // Course event calendar_get_course_cached($coursecache, $event->courseid); @@ -622,14 +622,14 @@ function calendar_add_event_metadata($event) { $context = context_course::instance($event->courseid); $fullname = format_string($coursecache[$event->courseid]->fullname, true, array('context' => $context)); - $event->icon = ''.get_string('courseevent', 'calendar').''; + $event->icon = ''.get_string('courseevent', 'calendar').''; $event->courselink = ''.$fullname.''; $event->cssclass = 'calendar_event_course'; } else if ($event->groupid) { // Group event - $event->icon = ''.get_string('groupevent', 'calendar').''; + $event->icon = ''.get_string('groupevent', 'calendar').''; $event->cssclass = 'calendar_event_group'; } else if($event->userid) { // User event - $event->icon = ''.get_string('userevent', 'calendar').''; + $event->icon = ''.get_string('userevent', 'calendar').''; $event->cssclass = 'calendar_event_user'; } return $event; @@ -1153,7 +1153,7 @@ function calendar_get_block_upcoming($events, $linkhref = NULL) { continue; } $events[$i] = calendar_add_event_metadata($events[$i]); - $content .= '
'.$events[$i]->icon.' '; + $content .= '
'.$events[$i]->icon.''; if (!empty($events[$i]->referer)) { // That's an activity event, so let's provide the hyperlink $content .= $events[$i]->referer; diff --git a/theme/base/style/blocks.css b/theme/base/style/blocks.css index 7283d491c1e..b8223e91051 100644 --- a/theme/base/style/blocks.css +++ b/theme/base/style/blocks.css @@ -15,6 +15,7 @@ .block .footer {margin-bottom: 4px;} .block .blockannotation {font-size:0.75em;margin: -1em 0 1em;} .block_navigation .block_tree li {overflow:hidden;} +.block_calendar_upcoming .footer { margin-top: .5em; } /** block_list blocks need column stuffs **/ .block.list_block .unlist > li > .column {display:inline-block;} diff --git a/theme/base/style/calendar.css b/theme/base/style/calendar.css index 40efe705928..f6ac3820ff9 100644 --- a/theme/base/style/calendar.css +++ b/theme/base/style/calendar.css @@ -29,13 +29,20 @@ .path-calendar .maincalendar .controls {width:98%;margin:10px auto;} .path-calendar .maincalendar .eventlist .event {width:100%;margin-bottom:10px;border-spacing:0px;border-collapse:separate;border-width:1px;border-style:solid;} .path-calendar .maincalendar .eventlist .event .topic .name {float:left;} +.dir-rtl.path-calendar .maincalendar .eventlist .event .topic .name {float:right;} .path-calendar .maincalendar .eventlist .event .topic .date {float:right;} +.dir-rtl.path-calendar .maincalendar .eventlist .event .topic .date {float:left;} .path-calendar .maincalendar .eventlist .event .course {float:left;clear:left;} +.dir-rtl.path-calendar .maincalendar .eventlist .event .course {float:right;clear:right;} .path-calendar .maincalendar .eventlist .event .side {width:32px;} +.path-calendar .maincalendar .eventlist .event .commands a { margin: 0 3px;} .path-calendar .maincalendar .header {overflow:hidden;} .path-calendar .maincalendar .header .buttons {float: right;} +.dir-rtl.path-calendar .maincalendar .header .buttons {float: left;} .path-calendar .filters table {border-collapse:separate;border-spacing: 2px;width: 100%;} #page-calendar-export .indent {padding-left: 20px;} +.path-calendar .cal_courses_flt label { margin-right: .45em; } +.dir-rtl.path-calendar .cal_courses_flt label { margin-left: .45em; margin-right: 0; } .block .minicalendar {width:100%;margin:10px auto;} .block .minicalendar th, @@ -48,4 +55,5 @@ .block .calendar_filters li { margin-bottom: .2em;} .block .calendar_filters li span img { padding: 0 .2em;} .block .calendar_filters .eventname { padding-left: .2em;} -.block .content h3.eventskey {margin-top:0.5em;} \ No newline at end of file +.dir-rtl .block .calendar_filters .eventname { padding-right: .2em; padding-left: 0; } +.block .content h3.eventskey {margin-top:0.5em;} diff --git a/theme/standard/style/blocks.css b/theme/standard/style/blocks.css index cde9e7360eb..2bc8ab57e92 100644 --- a/theme/standard/style/blocks.css +++ b/theme/standard/style/blocks.css @@ -39,6 +39,7 @@ /** Calendar Upcoming **/ .block_calendar_upcoming .event .date {text-align:right;} +.dir-rtl .block_calendar_upcoming .event .date {text-align:left;} /** Course Overview **/ .block_course_overview .coursebox h3 {margin: 10px;} diff --git a/theme/standard/style/calendar.css b/theme/standard/style/calendar.css index 638347db1c6..dc8bdfb96f8 100644 --- a/theme/standard/style/calendar.css +++ b/theme/standard/style/calendar.css @@ -13,6 +13,7 @@ .path-calendar .maincalendar .eventlist .event .course {font-size:0.8em;} .path-calendar .maincalendar .eventlist .event .description {padding:5px;} .path-calendar .maincalendar .eventlist .event .description .commands {text-align: right;} +.dir-rtl.path-calendar .maincalendar .eventlist .event .description .commands {text-align: left;} .path-calendar .maincalendar .eventlist .event .topic {background-color:#EEEEEE;padding: 5px;border:0px solid #EEEEEE;border-bottom-width: 1px;} .path-calendar .maincalendar .eventlist .event .picture {background-color:#EEEEEE;padding:8px;} .path-calendar .maincalendar .eventlist .event .side {background-color:#EEEEEE;} diff --git a/theme/standard/style/css3.css b/theme/standard/style/css3.css index d559107828d..cb6ab17b6ad 100644 --- a/theme/standard/style/css3.css +++ b/theme/standard/style/css3.css @@ -156,6 +156,16 @@ table.minicalendar { -webkit-border-bottom-left-radius: 15px; border-bottom-left-radius: 15px; } +.dir-rtl.path-calendar .eventlist .event .side, +.dir-rtl .glossarypost .side, +.dir-rtl#page-mod-journal-view .feedbackbox .side { + -moz-border-radius-bottomleft:0; + -webkit-border-bottom-left-radius: 0; + border-bottom-left-radius: 0; + -moz-border-radius-bottomright:15px; + -webkit-border-bottom-right-radius: 15px; + border-bottom-right-radius: 15px; +} .path-calendar .eventlist .event .description, .encyclopedia .entrylowersection, @@ -164,6 +174,16 @@ table.minicalendar { -webkit-border-bottom-right-radius: 15px; border-bottom-right-radius: 15px; } +.dir-rtl.path-calendar .eventlist .event .description, +.dir-rtl .encyclopedia .entrylowersection, +.dir-rtl#page-mod-journal-view .feedbackbox .entrycontent { + -moz-border-radius-bottomright:0; + -webkit-border-bottom-right-radius: 0; + border-bottom-right-radius: 0; + -moz-border-radius-bottomleft:15px; + -webkit-border-bottom-left-radius: 15px; + border-bottom-left-radius: 15px; +} .path-calendar .maincalendar, .path-calendar .sidecalendar,