moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dan Poltawski 2013-02-04 10:12:54 +08:00
commit 85ef4d45ca
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
calendar/lib.php
View file

@ -798,7 +798,7 @@ function calendar_get_events_by_id($eventids) {
* @return string $content return available control for the calender in html * @return string $content return available control for the calender in html
*/ */
function calendar_top_controls($type, $data) { function calendar_top_controls($type, $data) {
global $CFG; global $CFG, $PAGE;
$content = ''; $content = '';
if(!isset($data['d'])) { if(!isset($data['d'])) {
$data['d'] = 1; $data['d'] = 1;
@ -821,6 +821,7 @@ function calendar_top_controls($type, $data) {
$data['m'] = $date['mon']; $data['m'] = $date['mon'];
$data['y'] = $date['year']; $data['y'] = $date['year'];
$urlbase = $PAGE->url;
//Accessibility: calendar block controls, replaced <table> with <div>. //Accessibility: calendar block controls, replaced <table> with <div>.
//$nexttext = link_arrow_right(get_string('monthnext', 'access'), $url='', $accesshide=true); //$nexttext = link_arrow_right(get_string('monthnext', 'access'), $url='', $accesshide=true);
@ -830,8 +831,8 @@ function calendar_top_controls($type, $data) {
case 'frontpage': case 'frontpage':
list($prevmonth, $prevyear) = calendar_sub_month($data['m'], $data['y']); list($prevmonth, $prevyear) = calendar_sub_month($data['m'], $data['y']);
list($nextmonth, $nextyear) = calendar_add_month($data['m'], $data['y']); list($nextmonth, $nextyear) = calendar_add_month($data['m'], $data['y']);
$nextlink = calendar_get_link_next(get_string('monthnext', 'access'), 'index.php?', 0, $nextmonth, $nextyear, $accesshide=true); $nextlink = calendar_get_link_next(get_string('monthnext', 'access'), $urlbase, 0, $nextmonth, $nextyear, true);
$prevlink = calendar_get_link_previous(get_string('monthprev', 'access'), 'index.php?', 0, $prevmonth, $prevyear, true); $prevlink = calendar_get_link_previous(get_string('monthprev', 'access'), $urlbase, 0, $prevmonth, $prevyear, true);
$calendarlink = calendar_get_link_href(new moodle_url(CALENDAR_URL.'view.php', array('view'=>'month')), 1, $data['m'], $data['y']); $calendarlink = calendar_get_link_href(new moodle_url(CALENDAR_URL.'view.php', array('view'=>'month')), 1, $data['m'], $data['y']);
if (!empty($data['id'])) { if (!empty($data['id'])) {
@ -857,8 +858,8 @@ function calendar_top_controls($type, $data) {
case 'course': case 'course':
list($prevmonth, $prevyear) = calendar_sub_month($data['m'], $data['y']); list($prevmonth, $prevyear) = calendar_sub_month($data['m'], $data['y']);
list($nextmonth, $nextyear) = calendar_add_month($data['m'], $data['y']); list($nextmonth, $nextyear) = calendar_add_month($data['m'], $data['y']);
$nextlink = calendar_get_link_next(get_string('monthnext', 'access'), 'view.php?id='.$data['id'].'&amp;', 0, $nextmonth, $nextyear, $accesshide=true); $nextlink = calendar_get_link_next(get_string('monthnext', 'access'), $urlbase, 0, $nextmonth, $nextyear, true);
$prevlink = calendar_get_link_previous(get_string('monthprev', 'access'), 'view.php?id='.$data['id'].'&amp;', 0, $prevmonth, $prevyear, true); $prevlink = calendar_get_link_previous(get_string('monthprev', 'access'), $urlbase, 0, $prevmonth, $prevyear, true);
$calendarlink = calendar_get_link_href(new moodle_url(CALENDAR_URL.'view.php', array('view'=>'month')), 1, $data['m'], $data['y']); $calendarlink = calendar_get_link_href(new moodle_url(CALENDAR_URL.'view.php', array('view'=>'month')), 1, $data['m'], $data['y']);
if (!empty($data['id'])) { if (!empty($data['id'])) {