From f434283f4fc37cd5722268981b98d354e566e5d5 Mon Sep 17 00:00:00 2001 From: defacer Date: Fri, 21 May 2004 11:24:22 +0000 Subject: [PATCH] Bye bye event details view... --- calendar/lib.php | 14 +++++--------- calendar/set.php | 6 ------ calendar/view.php | 24 ++++++------------------ 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/calendar/lib.php b/calendar/lib.php index e7e61182dc..d6a1aadfac 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -163,14 +163,16 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y // Special visual fx if an event is defined if(isset($eventsbyday[$day])) { + $dayhref = calendar_get_link_href(CALENDAR_URL.'view.php?view=day&', $day, $m, $y); + // OverLib popup $popupcontent = ''; foreach($eventsbyday[$day] as $eventid) { if(!empty($events[$eventid]->modulename)) { - $popupcontent .= '
modpixpath.'/'.$events[$eventid]->modulename.'/icon.gif\\\' style=\\\'vertical-align: middle; margin-right: 4px;\\\' alt=\\\''.$events[$eventid]->modulename.'\\\' />id.'\\\'>'.addslashes(htmlspecialchars($events[$eventid]->name)).'
'; + $popupcontent .= '
modpixpath.'/'.$events[$eventid]->modulename.'/icon.gif\\\' style=\\\'vertical-align: middle; margin-right: 4px;\\\' alt=\\\''.$events[$eventid]->modulename.'\\\' />'.addslashes(htmlspecialchars($events[$eventid]->name)).'
'; } else { - $popupcontent .= '
pixpath.'/c/event.gif\\\' style=\\\'vertical-align: middle; margin-right: 4px;\\\' alt=\\\'\\\' />id.'\\\'>'.addslashes(htmlspecialchars($events[$eventid]->name)).'
'; + $popupcontent .= '
pixpath.'/c/event.gif\\\' style=\\\'vertical-align: middle; margin-right: 4px;\\\' alt=\\\'\\\' />'.addslashes(htmlspecialchars($events[$eventid]->name)).'
'; } } @@ -196,7 +198,7 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y else { $title = get_string('manyevents', 'calendar', count($eventsbyday[$day])); } - $cell = ''.$day.''; + $cell = ''.$day.''; } else { $cell = $day; @@ -560,12 +562,6 @@ function calendar_filter_controls($type, $vars = NULL) { case 'upcoming': $getvars = '&from=upcoming'; break; - case 'prefs': - $getvars = '&from=prefs&pref='.$_GET['edit']; - break; - case 'event': - $getvars = '&from=event&id='.$_GET['id']; - break; case 'day': $getvars = '&from=day'; break; diff --git a/calendar/set.php b/calendar/set.php index 959a89930b..108386cf04 100644 --- a/calendar/set.php +++ b/calendar/set.php @@ -85,18 +85,12 @@ } switch($_GET['from']) { - case 'prefs': - redirect($CFG->wwwroot.'/calendar/preferences.php?edit='.$_GET['pref']); - break; case 'month': redirect($CFG->wwwroot.'/calendar/view.php?view=month&cal_d='.$_GET['cal_d'].'&cal_m='.$_GET['cal_m'].'&cal_y='.$_GET['cal_y']); break; case 'upcoming': redirect($CFG->wwwroot.'/calendar/view.php?view=upcoming&cal_d='.$_GET['cal_d'].'&cal_m='.$_GET['cal_m'].'&cal_y='.$_GET['cal_y']); break; - case 'event': - redirect($CFG->wwwroot.'/calendar/view.php?view=event&id='.$_GET['id']); - break; case 'day': redirect($CFG->wwwroot.'/calendar/view.php?view=day&cal_d='.$_GET['cal_d'].'&cal_m='.$_GET['cal_m'].'&cal_y='.$_GET['cal_y']); break; diff --git a/calendar/view.php b/calendar/view.php index dfa37d3f82..7102b92234 100644 --- a/calendar/view.php +++ b/calendar/view.php @@ -88,10 +88,6 @@ case 'upcoming': $pagetitle = get_string('upcomingevents', 'calendar'); break; - case 'event': - $pagetitle = get_string('eventview', 'calendar'); - $nav .= ' -> '.$pagetitle; // Smart guy... :) - break; } if(isguest($USER->id)) { @@ -128,17 +124,6 @@ echo ''; switch($_GET['view']) { - case 'event': - optional_variable($_GET['id'], 0); - $event = get_record('event', 'id', intval($_GET['id'])); - if($event === false) { - error('Invalid event id'); - } - $date = calendar_show_event($event); - $day = $date['mday']; - $mon = $date['mon']; - $yr = $date['year']; - break; case 'day': calendar_show_day($day, $mon, $yr, $courses, $groups, $users); break; @@ -258,8 +243,9 @@ function calendar_show_day($d, $m, $y, $courses, $groups, $users) { echo '