L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improving the behavior of the two calendar blocks when they are displayed

Browse Source 
at the site front page. See http://moodle.org/mod/forum/discuss.php?d=12149
This commit is contained in:
defacer
2004-09-07 10:16:33 +00:00
parent 472b9e478e
commit 75c45044bb
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/calendar_month/block_calendar_month.php
+13 -1
View File
@@ -24,11 +24,23 @@ class CourseBlock_calendar_month extends MoodleBlock {
$this->content->footer = '';
if (empty($this->course)) { // Overrides: use no course at all
$courseshown = false;
$filtercourse = array();
} else {
$courseshown = $this->course->id;
$filtercourse = array($courseshown => 1);
if($this->course->id == SITEID) {
// Being displayed at site level. This will cause the filter to fall back to auto-detecting
// the list of courses it will be grabbing events from.
$filtercourse = NULL;
}
else {
// Forcibly filter events to include only those from the particular course we are in.
$filtercourse = array($courseshown => 1);
}
}
// We 'll need this later
blocks/calendar_upcoming/block_calendar_upcoming.php
+14 -2
View File
@@ -22,19 +22,31 @@ class CourseBlock_calendar_upcoming extends MoodleBlock {
$this->content = New object;
$this->content->text = '';
if (empty($this->course)) { // Overrides: use no course at all
if (empty($this->course)) { // Overrides: use no course at all
$courseshown = false;
$filtercourse = array();
$this->content->footer = '';
} else {
$courseshown = $this->course->id;
$filtercourse = array($courseshown => 1);
$this->content->footer = '<br /><a href="'.$CFG->wwwroot.
'/calendar/view.php?view=upcoming&amp;course='.$this->course->id.'">'.
get_string('gotocalendar', 'calendar').'</a>...';
$this->content->footer .= '<br /><a href="'.$CFG->wwwroot.
'/calendar/event.php?action=new&amp;course='.$this->course->id.'">'.
get_string('newevent', 'calendar').'</a>...';
if($this->course->id == SITEID) {
// Being displayed at site level. This will cause the filter to fall back to auto-detecting
// the list of courses it will be grabbing events from.
$filtercourse = NULL;
}
else {
// Forcibly filter events to include only those from the particular course we are in.
$filtercourse = array($courseshown => 1);
}
}
// We 'll need this later