mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

MDL-46643 calendar: improved tab order of calendar detail pages

Browse Source
This commit is contained in:
Brian Barnes 2014-08-01 11:53:02 +12:00
parent d29fb4ac65
commit 712e5f222f
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/renderer.php
View File

@ -256,10 +256,10 @@ class core_calendar_renderer extends plugin_renderer_base {
$events = calendar_get_upcoming($calendar->courses, $calendar->groups, $calendar->users, 1, 100, $calendar->timestamp_today()); $events = calendar_get_upcoming($calendar->courses, $calendar->groups, $calendar->users, 1, 100, $calendar->timestamp_today());
$output = html_writer::start_tag('div', array('class'=>'header')); $output = html_writer::start_tag('div', array('class'=>'header'));
$output .= $this->course_filter_selector($returnurl, get_string('dayviewfor', 'calendar'));
if (calendar_user_can_add_event($calendar->course)) { if (calendar_user_can_add_event($calendar->course)) {
$output .= $this->add_event_button($calendar->course->id, 0, 0, 0, $calendar->time); $output .= $this->add_event_button($calendar->course->id, 0, 0, 0, $calendar->time);
} }
$output .= $this->course_filter_selector($returnurl, get_string('dayviewfor', 'calendar'));
$output .= html_writer::end_tag('div'); $output .= html_writer::end_tag('div');
// Controls // Controls
$output .= html_writer::tag('div', calendar_top_controls('day', array('id' => $calendar->courseid, 'time' => $calendar->time)), array('class'=>'controls')); $output .= html_writer::tag('div', calendar_top_controls('day', array('id' => $calendar->courseid, 'time' => $calendar->time)), array('class'=>'controls'));
@ -464,10 +464,10 @@ class core_calendar_renderer extends plugin_renderer_base {
calendar_events_by_day($events, $date['mon'], $date['year'], $eventsbyday, $durationbyday, $typesbyday, $calendar->courses); calendar_events_by_day($events, $date['mon'], $date['year'], $eventsbyday, $durationbyday, $typesbyday, $calendar->courses);
$output = html_writer::start_tag('div', array('class'=>'header')); $output = html_writer::start_tag('div', array('class'=>'header'));
$output .= $this->course_filter_selector($returnurl, get_string('detailedmonthviewfor', 'calendar'));
if (calendar_user_can_add_event($calendar->course)) { if (calendar_user_can_add_event($calendar->course)) {
$output .= $this->add_event_button($calendar->course->id, 0, 0, 0, $calendar->time); $output .= $this->add_event_button($calendar->course->id, 0, 0, 0, $calendar->time);
} }
$output .= $this->course_filter_selector($returnurl, get_string('detailedmonthviewfor', 'calendar'));
$output .= html_writer::end_tag('div', array('class'=>'header')); $output .= html_writer::end_tag('div', array('class'=>'header'));
// Controls // Controls
$output .= html_writer::tag('div', calendar_top_controls('month', array('id' => $calendar->courseid, 'time' => $calendar->time)), array('class' => 'controls')); $output .= html_writer::tag('div', calendar_top_controls('month', array('id' => $calendar->courseid, 'time' => $calendar->time)), array('class' => 'controls'));
@ -614,10 +614,10 @@ class core_calendar_renderer extends plugin_renderer_base {
$events = calendar_get_upcoming($calendar->courses, $calendar->groups, $calendar->users, $futuredays, $maxevents); $events = calendar_get_upcoming($calendar->courses, $calendar->groups, $calendar->users, $futuredays, $maxevents);
$output = html_writer::start_tag('div', array('class'=>'header')); $output = html_writer::start_tag('div', array('class'=>'header'));
$output .= $this->course_filter_selector($returnurl, get_string('upcomingeventsfor', 'calendar'));
if (calendar_user_can_add_event($calendar->course)) { if (calendar_user_can_add_event($calendar->course)) {
$output .= $this->add_event_button($calendar->course->id); $output .= $this->add_event_button($calendar->course->id);
} }
$output .= $this->course_filter_selector($returnurl, get_string('upcomingeventsfor', 'calendar'));
$output .= html_writer::end_tag('div'); $output .= html_writer::end_tag('div');
if ($events) { if ($events) {

2
theme/base/style/calendar.css
View File

@ -43,6 +43,8 @@
.dir-rtl.path-calendar .maincalendar .header .buttons {float: left;} .dir-rtl.path-calendar .maincalendar .header .buttons {float: left;}
.path-calendar .filters table {border-collapse:separate;border-spacing: 2px;width: 100%;} .path-calendar .filters table {border-collapse:separate;border-spacing: 2px;width: 100%;}
#page-calendar-export .indent {padding-left: 20px;} #page-calendar-export .indent {padding-left: 20px;}
.path-calendar div.cal_courses_flt { float: left; }
.dir-rtl.path-calendar div.cal_courses_flt { float: right; }
.path-calendar .cal_courses_flt label { margin-right: .45em; } .path-calendar .cal_courses_flt label { margin-right: .45em; }
.dir-rtl.path-calendar .cal_courses_flt label { margin-left: .45em; margin-right: 0; } .dir-rtl.path-calendar .cal_courses_flt label { margin-left: .45em; margin-right: 0; }

3
theme/bootstrapbase/less/moodle/calendar.less
View File

@ -58,6 +58,8 @@
} }
} }
.cal_courses_flt { .cal_courses_flt {
float: left;
label { label {
margin-right: .45em; margin-right: .45em;
} }
@ -217,6 +219,7 @@
// RTL overrides for main calendar. // RTL overrides for main calendar.
.dir-rtl.path-calendar { .dir-rtl.path-calendar {
.cal_courses_flt { .cal_courses_flt {
float: right;
label { label {
margin-left: .45em; margin-left: .45em;
margin-right: 0; margin-right: 0;

2
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long