L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	theme/upgrade.txt
This commit is contained in:
Dan Poltawski
2012-11-27 13:10:27 +08:00
parent 5d6aca6e1a 857c5f90e7
commit e7705abdde
15 changed files with 111 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/lib.php
+10 -10
View File
@@ -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);
@@ -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 = '<img height="16" width="16" src="'.$icon.'" alt="'.$eventtype.'" title="'.$modulename.'" style="vertical-align: middle;" />';
$event->icon = '<img src="'.$icon.'" alt="'.$eventtype.'" title="'.$modulename.'" class="icon" />';
$event->referer = '<a href="'.$CFG->wwwroot.'/mod/'.$event->modulename.'/view.php?id='.$module->id.'">'.$event->name.'</a>';
$event->courselink = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$module->course.'">'.$fullname.'</a>';
$event->cmid = $module->id;
} else if($event->courseid == SITEID) { // Site event
$event->icon = '<img height="16" width="16" src="'.$OUTPUT->pix_url('c/site') . '" alt="'.get_string('globalevent', 'calendar').'" style="vertical-align: middle;" />';
$event->icon = '<img src="'.$OUTPUT->pix_url('i/siteevent') . '" alt="'.get_string('globalevent', 'calendar').'" class="icon" />';
$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 = '<img height="16" width="16" src="'.$OUTPUT->pix_url('c/course') . '" alt="'.get_string('courseevent', 'calendar').'" style="vertical-align: middle;" />';
$event->icon = '<img src="'.$OUTPUT->pix_url('i/courseevent') . '" alt="'.get_string('courseevent', 'calendar').'" class="icon" />';
$event->courselink = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$event->courseid.'">'.$fullname.'</a>';
$event->cssclass = 'calendar_event_course';
} else if ($event->groupid) { // Group event
$event->icon = '<img height="16" width="16" src="'.$OUTPUT->pix_url('c/group') . '" alt="'.get_string('groupevent', 'calendar').'" style="vertical-align: middle;" />';
$event->icon = '<img src="'.$OUTPUT->pix_url('i/groupevent') . '" alt="'.get_string('groupevent', 'calendar').'" class="icon" />';
$event->cssclass = 'calendar_event_group';
} else if($event->userid) { // User event
$event->icon = '<img height="16" width="16" src="'.$OUTPUT->pix_url('c/user') . '" alt="'.get_string('userevent', 'calendar').'" style="vertical-align: middle;" />';
$event->icon = '<img src="'.$OUTPUT->pix_url('i/userevent') . '" alt="'.get_string('userevent', 'calendar').'" class="icon" />';
$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 .= '<div class="event"><span class="icon c0">'.$events[$i]->icon.'</span> ';
$content .= '<div class="event"><span class="icon c0">'.$events[$i]->icon.'</span>';
if (!empty($events[$i]->referer)) {
// That's an activity event, so let's provide the hyperlink
$content .= $events[$i]->referer;
pix/i/courseevent.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 230 B

pix/i/courseevent.svg
+17
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="16px" height="16px" viewBox="-1 0 16 16" style="overflow:visible;enable-background:new -1 0 16 16;"
xml:space="preserve">
<defs>
</defs>
<path style="fill:#999999;" d="M13,0H2C1.5,0,1,0.5,1,1v2h1.5C3.3,3,4,3.7,4,4.5S3.3,6,2.5,6H1v1h1.5C3.3,7,4,7.7,4,8.5
S3.3,10,2.5,10H1v1h1.5C3.3,11,4,11.7,4,12.5S3.3,14,2.5,14H1v1c0,0.5,0.5,1,1,1h11c0.5,0,1-0.5,1-1V1C14,0.5,13.5,0,13,0z M12,6H5
V3h7V6z M3,12.5C3,12.8,2.8,13,2.5,13h-2C0.2,13,0,12.8,0,12.5l0,0C0,12.2,0.2,12,0.5,12h2C2.8,12,3,12.2,3,12.5L3,12.5z M3,8.5
C3,8.8,2.8,9,2.5,9h-2C0.2,9,0,8.8,0,8.5v0C0,8.2,0.2,8,0.5,8h2C2.8,8,3,8.2,3,8.5L3,8.5z M3,4.5C3,4.8,2.8,5,2.5,5h-2
C0.2,5,0,4.8,0,4.5l0,0C0,4.2,0.2,4,0.5,4h2C2.8,4,3,4.2,3,4.5L3,4.5z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

pix/i/groupevent.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 327 B

pix/i/groupevent.svg
+16
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" preserveAspectRatio="xMinYMid meet">
<defs>
</defs>
<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

After

Width:  |  Height:  |  Size: 1012 B

pix/i/siteevent.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 208 B

pix/i/siteevent.svg
+17
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="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="M14,1h-2v1.5C12,3.3,11.3,4,10.5,4S9,3.3,9,2.5V1H6v1.5C6,3.3,5.3,4,4.5,4S3,3.3,3,2.5V1H1
C0.4,1,0,1.4,0,2v13c0,0.6,0.4,1,1,1h13c0.6,0,1-0.4,1-1V2C15,1.4,14.6,1,14,1z M4,14H2v-2h2V14z M4,11H2V9h2V11z M4,8H2V6h2V8z
M7,14H5v-2h2V14z M7,11H5V9h2V11z M7,8H5V6h2V8z M10,14H8v-2h2V14z M10,11H8V9h2V11z M10,8H8V6h2V8z M13,14h-2v-2h2V14z M13,11h-2
V9h2V11z M13,8h-2V6h2V8z M5,2.5C5,2.8,4.8,3,4.5,3l0,0C4.2,3,4,2.8,4,2.5v-2C4,0.2,4.2,0,4.5,0l0,0C4.8,0,5,0.2,5,0.5V2.5z M11,2.5
C11,2.8,10.8,3,10.5,3l0,0C10.2,3,10,2.8,10,2.5v-2C10,0.2,10.2,0,10.5,0l0,0C10.8,0,11,0.2,11,0.5V2.5z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

pix/i/userevent.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 264 B

pix/i/userevent.svg
+14
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" preserveAspectRatio="xMinYMid meet">
<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>
Side by Side

After

Width:  |  Height:  |  Size: 827 B

theme/base/style/blocks.css
+1
View File
@@ -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;}
theme/base/style/calendar.css
+9 -1
View File
@@ -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;}
.dir-rtl .block .calendar_filters .eventname { padding-right: .2em; padding-left: 0; }
.block .content h3.eventskey {margin-top:0.5em;}
theme/standard/style/blocks.css
+1
View File
@@ -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;}
theme/standard/style/calendar.css
+1
View File
@@ -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;}
theme/standard/style/css3.css
+20
View File
@@ -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,
theme/upgrade.txt
+5
View File
@@ -12,6 +12,10 @@ deprecation:
* t/manual_item: Use i/manual_item instead
* t/unlock_gray: Use t/locked instead
* t/userblue: Previously used to unblock a user, use t/unblock.
* 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)
@@ -28,6 +32,7 @@ optional changes:
* new icons i/folder (16x16), monochrome equivalent to f/folder.
* new icons t/addcontact, t/removecontact and t/messages, previously t/addgreen, t/delete and t/log were used in messaging.
* new icons t/unblock and i/twoway.
* new icons i/courseevent, i/groupevent, i/siteevent and i/userevent (16x16) instead of c/* for calendar events.
=== 2.3 ===