From e6c4b5f2bb4d376f7a9ae4c1cd130d040d7a6a88 Mon Sep 17 00:00:00 2001 From: Eloy Lafuente Date: Thu, 4 Mar 2010 22:01:38 +0000 Subject: [PATCH] MDL-17510 calendar - added 2 missing labels plus space/comments cleaning. Credit goes to Daniel Neis ; merged from 19_STABLE --- calendar/view.php | 96 +++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 49 deletions(-) diff --git a/calendar/view.php b/calendar/view.php index 76d2b6f6f63..edd5cd10878 100644 --- a/calendar/view.php +++ b/calendar/view.php @@ -270,7 +270,10 @@ function calendar_show_day($d, $m, $y, $courses, $groups, $users, $courseid) { $text.= ''; } - $text .= get_string('dayview', 'calendar').': '.calendar_course_filter_selector($getvars); + $text .= ''. + calendar_course_filter_selector($getvars); echo '
'.$text.'
'; @@ -536,54 +539,50 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course echo "\n"; // Tabular display of days ends // OK, now for the filtering display - echo '
'; + echo '
'; - // Global events - if($SESSION->cal_show_global) { - echo ''."\n"; - } - else { - echo ''."\n"; - } + // Global events + if($SESSION->cal_show_global) { + echo ''."\n"; + } else { + echo ''."\n"; + } - // Course events - if(!empty($SESSION->cal_show_course)) { - echo ''."\n"; - } - else { - echo ''."\n"; - } + // Course events + if(!empty($SESSION->cal_show_course)) { + echo ''."\n"; + } else { + echo ''."\n"; + } - echo "\n"; + echo "\n"; - if(!empty($USER->id) && !has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTEM), 0, false)) { - echo ''; - // Group events - if($SESSION->cal_show_groups) { - echo ''."\n"; - } - else { - echo ''."\n"; - } - // User events - if($SESSION->cal_show_user) { - echo ''."\n"; - } - else { - echo ''."\n"; - } - echo "\n"; - } + if(!empty($USER->id) && !has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTEM), 0, false)) { + echo ''; + // Group events + if($SESSION->cal_show_groups) { + echo ''."\n"; + } else { + echo ''."\n"; + } + // User events + if($SESSION->cal_show_user) { + echo ''."\n"; + } else { + echo ''."\n"; + } + echo "\n"; + } - echo '
'.get_string('globalevents', 'calendar').': '; - echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').')'.get_string('globalevents', 'calendar').': '; - echo get_string('hidden', 'calendar').' ('.get_string('clickshow', 'calendar').')'.get_string('globalevents', 'calendar').': '; + echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').')'.get_string('globalevents', 'calendar').': '; + echo get_string('hidden', 'calendar').' ('.get_string('clickshow', 'calendar').')'.get_string('courseevents', 'calendar').': '; - echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').')'.get_string('courseevents', 'calendar').': '; - echo get_string('hidden', 'calendar').' ('.get_string('clickshow', 'calendar').')'.get_string('courseevents', 'calendar').': '; + echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').')'.get_string('courseevents', 'calendar').': '; + echo get_string('hidden', 'calendar').' ('.get_string('clickshow', 'calendar').')
'.get_string('groupevents', 'calendar').': '; - echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').')'.get_string('groupevents', 'calendar').': '; - echo get_string('hidden', 'calendar').' ('.get_string('clickshow', 'calendar').')'.get_string('userevents', 'calendar').': '; - echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').')'.get_string('userevents', 'calendar').': '; - echo get_string('hidden', 'calendar').' ('.get_string('clickshow', 'calendar').')
'.get_string('groupevents', 'calendar').': '; + echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').')'.get_string('groupevents', 'calendar').': '; + echo get_string('hidden', 'calendar').' ('.get_string('clickshow', 'calendar').')'.get_string('userevents', 'calendar').': '; + echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').')'.get_string('userevents', 'calendar').': '; + echo get_string('hidden', 'calendar').' ('.get_string('clickshow', 'calendar').')
'; + echo ''; } function calendar_show_upcoming_events($courses, $groups, $users, $futuredays, $maxevents, $courseid) { @@ -599,15 +598,14 @@ function calendar_show_upcoming_events($courses, $groups, $users, $futuredays, $ $text.= '
'; $text.= ''; $text.= ''; - /* - $text.= ''; - $text.= ''; - */ $text.= ''; $text.= '
'; } - $text .= get_string('upcomingevents', 'calendar').': '.calendar_course_filter_selector('from=upcoming'); + $text .= ''. + calendar_course_filter_selector('from=upcoming'); echo '
'.$text.'
';