mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 20:50:21 +01:00
Accessibility: bug 5078, "Update calendar blocks in courses to match the changes in site page". Fix function, calendar_top_controls.
This commit is contained in:
parent
e642ed1244
commit
a7c385e606
@ -627,18 +627,18 @@ function calendar_top_controls($type, $data) {
|
||||
$content .= '<span class="previous" title="'.get_string('monthprev','access').'">'.$prevlink."</span>\n";
|
||||
$content .= '<span class="hide"> | </span><span class="current"><a href="'.calendar_get_link_href(CALENDAR_URL.'view.php?view=month&', 1, $data['m'], $data['y']).'">'.userdate($time, get_string('strftimemonthyear')).'</a></span>';
|
||||
$content .= '<span class="hide"> | </span><span class="next" title="'.get_string('monthnext','access').'">'.$nextlink."</span>\n";
|
||||
$content .= '<span class="clearer"></span></div>';
|
||||
$content .= "<span class=\"clearer\"></span></div>\n";
|
||||
break;
|
||||
case 'course':
|
||||
list($prevmonth, $prevyear) = calendar_sub_month($data['m'], $data['y']);
|
||||
list($nextmonth, $nextyear) = calendar_add_month($data['m'], $data['y']);
|
||||
$nextlink = calendar_get_link_tag('>>', 'view.php?id='.$data['id'].'&', 0, $nextmonth, $nextyear);
|
||||
$prevlink = calendar_get_link_tag('<<', 'view.php?id='.$data['id'].'&', 0, $prevmonth, $prevyear);
|
||||
$content .= '<table class="calendar-controls"><tr>';
|
||||
$content .= '<td class="previous">'.$prevlink."</td>\n";
|
||||
$content .= '<td class="current"><a href="'.calendar_get_link_href(CALENDAR_URL.'view.php?view=month&course='.$data['id'].'&', 1, $data['m'], $data['y']).'">'.userdate($time, get_string('strftimemonthyear')).'</a></td>';
|
||||
$content .= '<td class="next">'.$nextlink."</td>\n";
|
||||
$content .= '</tr></table>';
|
||||
$nextlink = calendar_get_link_tag($nexttext, 'view.php?id='.$data['id'].'&', 0, $nextmonth, $nextyear);
|
||||
$prevlink = calendar_get_link_tag($prevtext, 'view.php?id='.$data['id'].'&', 0, $prevmonth, $prevyear);
|
||||
$content .= '<div class="calendar-controls">';
|
||||
$content .= '<span class="previous" title="'.get_string('monthprev','access').'">'.$prevlink."</span>\n";
|
||||
$content .= '<span class="hide"> | </span><span class="current"><a href="'.calendar_get_link_href(CALENDAR_URL.'view.php?view=month&course='.$data['id'].'&', 1, $data['m'], $data['y']).'">'.userdate($time, get_string('strftimemonthyear')).'</a></span>';
|
||||
$content .= '<span class="hide"> | </span><span class="next" title="'.get_string('monthnext','access').'">'.$nextlink."</span>\n";
|
||||
$content .= "<span class=\"clearer\"></span></div>\n";
|
||||
break;
|
||||
case 'upcoming':
|
||||
$content .= '<div style="text-align: center;"><a href="'.CALENDAR_URL.'view.php?view=upcoming">'.userdate($time, get_string('strftimemonthyear'))."</a></div>\n";
|
||||
@ -651,11 +651,11 @@ function calendar_top_controls($type, $data) {
|
||||
list($nextmonth, $nextyear) = calendar_add_month($data['m'], $data['y']);
|
||||
$prevdate = make_timestamp($prevyear, $prevmonth, 1);
|
||||
$nextdate = make_timestamp($nextyear, $nextmonth, 1);
|
||||
$content .= '<table class="calendar-controls"><tr>';
|
||||
$content .= '<td class="previous"><a href="'.calendar_get_link_href('view.php?view=month&', 1, $prevmonth, $prevyear).'"><< '.userdate($prevdate, get_string('strftimemonthyear')).'</a></td>';
|
||||
$content .= '<td class="current">'.userdate($time, get_string('strftimemonthyear'))."</td>\n";
|
||||
$content .= '<td class="next"><a href="'.calendar_get_link_href('view.php?view=month&', 1, $nextmonth, $nextyear).'">'.userdate($nextdate, get_string('strftimemonthyear'))." >></a></td>\n";
|
||||
$content .= "</tr></table>\n";
|
||||
$content .= '<div class="calendar-controls">';
|
||||
$content .= '<span class="previous"><a href="'.calendar_get_link_href('view.php?view=month&', 1, $prevmonth, $prevyear).'">< '.userdate($prevdate, get_string('strftimemonthyear')).'</a></span>';
|
||||
$content .= '<span class="hide"> | </span><span class="current">'.userdate($time, get_string('strftimemonthyear'))."</span>\n";
|
||||
$content .= '<span class="hide"> | </span><span class="next"><a href="'.calendar_get_link_href('view.php?view=month&', 1, $nextmonth, $nextyear).'">'.userdate($nextdate, get_string('strftimemonthyear'))." ></a></span>\n";
|
||||
$content .= "<span class=\"clearer\"></span></div>\n";
|
||||
break;
|
||||
case 'day':
|
||||
$data['d'] = $date['mday']; // Just for convenience
|
||||
@ -663,8 +663,8 @@ function calendar_top_controls($type, $data) {
|
||||
$nextdate = usergetdate(make_timestamp($data['y'], $data['m'], $data['d'] + 1));
|
||||
$prevname = calendar_wday_name($CALENDARDAYS[$prevdate['wday']]);
|
||||
$nextname = calendar_wday_name($CALENDARDAYS[$nextdate['wday']]);
|
||||
$content .= '<table class="calendar-controls"><tr>';
|
||||
$content .= '<td class="previous"><a href="'.calendar_get_link_href('view.php?view=day&', $prevdate['mday'], $prevdate['mon'], $prevdate['year']).'"><< '.$prevname."</a></td>\n";
|
||||
$content .= '<div class="calendar-controls">';
|
||||
$content .= '<span class="previous"><a href="'.calendar_get_link_href('view.php?view=day&', $prevdate['mday'], $prevdate['mon'], $prevdate['year']).'">< '.$prevname."</a></span>\n";
|
||||
|
||||
// Get the format string
|
||||
$text = get_string('strftimedaydate');
|
||||
@ -676,10 +676,10 @@ function calendar_top_controls($type, $data) {
|
||||
// Replace with actual values and lose any day leading zero
|
||||
$text = userdate($time, $text);
|
||||
// Print the actual thing
|
||||
$content .= '<td class="current">'.$text.'</td>';
|
||||
$content .= '<span class="hide"> | </span><span class="current">'.$text.'</span>';
|
||||
|
||||
$content .= '<td class="next"><a href="'.calendar_get_link_href('view.php?view=day&', $nextdate['mday'], $nextdate['mon'], $nextdate['year']).'">'.$nextname." >></a></td>\n";
|
||||
$content .= '</tr></table>';
|
||||
$content .= '<span class="hide"> | </span><span class="next"><a href="'.calendar_get_link_href('view.php?view=day&', $nextdate['mday'], $nextdate['mon'], $nextdate['year']).'">'.$nextname." ></a></span>\n";
|
||||
$content .= "<span class=\"clearer\"></span></div>\n";
|
||||
break;
|
||||
}
|
||||
return $content;
|
||||
|
Loading…
x
Reference in New Issue
Block a user