Layout and colour tweaks for calendar. Related to MDL-7433.

diff --git a/calendar/lib.php b/calendar/lib.php
index 9a82581f440db9f5aa72baa3af18a793ea3e7664..498b30cabdd72e11ae9c4996621d852655fc0dc6 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -434,19 +434,19 @@ function calendar_add_event_metadata($event) {
 
     } else if($event->courseid == SITEID) {                              // Site event
         $event->icon = '<img height="16" width="16" src="'.$CFG->pixpath.'/c/site.gif" alt="" style="vertical-align: middle;" />';
-
+        $event->cssclass = 'event_global';
     } else if($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) {          // Course event
         calendar_get_course_cached($coursecache, $event->courseid);
         $event->icon = '<img height="16" width="16" src="'.$CFG->pixpath.'/c/course.gif" alt="" style="vertical-align: middle;" />';
         $event->courselink = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$event->courseid.'">'.$coursecache[$event->courseid]->fullname.'</a>';
-
+        $event->cssclass = 'event_course';
     } else if ($event->groupid) {                                    // Group event
         $event->icon = '<img height="16" width="16" src="'.$CFG->pixpath.'/c/group.gif" alt="" style="vertical-align: middle;" />';
-
+        $event->cssclass = 'event_group';
     } else if($event->userid) {                                      // User event
         $event->icon = '<img height="16" width="16" src="'.$CFG->pixpath.'/c/user.gif" alt="" style="vertical-align: middle;" />';
+        $event->cssclass = 'event_user';
     }
-
     return $event;
 }    
 
@@ -482,7 +482,7 @@ function calendar_print_event($event) {
 
     echo '</td></tr>';
     echo '<tr><td class="side">&nbsp;</td>';
-    echo '<td class="description">';
+    echo '<td class="description '.$event->cssclass.'">';
     echo format_text($event->description, FORMAT_HTML);
     if (calendar_edit_event_allowed($event)) {
         echo '<div class="commands">';
@@ -1184,8 +1184,8 @@ function calendar_edit_event_allowed($event) {
             return (has_capability('moodle/calendar:manageownentries', $sitecontext));
         }
     } else if ($event->groupid) {
-        $group = get_record('groups', 'id', $event->groupid);
-        if($group === false) {
+        //TODO:check.
+        if (! groups_group_exists($event->groupid)) {
             return false;
         } 
         
@@ -1193,7 +1193,7 @@ function calendar_edit_event_allowed($event) {
         // to edit group calendar too
         // there is no need to check membership, because if you have this capability
         // you will have a role in this group context
-        return has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_GROUP, $group->id));  
+        return has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_GROUP, $event->groupid));  
     } else if ($event->courseid) {
         return has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_COURSE, $event->courseid)); 
     }

diff --git a/calendar/view.php b/calendar/view.php
index 677c92c9429e1929ed2453591f732ddc9b5ab0e8..0ead12a7929272dd806e5606d404e0c08ae43258 100644 (file)
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -132,12 +132,13 @@
     echo calendar_overlib_html();
 
     // Layout the whole page as three big columns.
-    echo '<table id="calendar">';
+    echo '<table id="calendar" style="height:100%;">';
     echo '<tr>';
 
     // START: Main column
 
     echo '<td class="maincalendar">';
+    echo '<div class="heightcontainer">';
 
     switch($view) {
         case 'day':
@@ -150,16 +151,24 @@
             calendar_show_upcoming_events($courses, $groups, $users, get_user_preferences('calendar_lookahead', CALENDAR_UPCOMING_DAYS), get_user_preferences('calendar_maxevents', CALENDAR_UPCOMING_MAXEVENTS));
         break;
     }
-    
+
     //Link to calendar export page
-    echo '<p><a href="export.php">' . get_string('exportcalendar', 'calendar') . '</a></p>';
-    
+    echo '<div class="bottom">';
+    print_single_button('export.php', false, get_string('exportcalendar', 'calendar'));
+
     if (!empty($USER->id)) {
         $authtoken = sha1($USER->username . $USER->password);
         $usernameencoded = urlencode($USER->username);
-        echo "<p><a href=\"export_execute.php?preset_what=all&amp;preset_time=recentupcoming&amp;username=$usernameencoded&amp;authtoken=$authtoken\">" . get_string('quickdownloadcalendar', 'calendar') . '</a></p>';
+
+        echo "<a href=\"export_execute.php?preset_what=all&amp;preset_time=recentupcoming&amp;username=$usernameencoded&amp;authtoken=$authtoken\">"
+             .'<img src="'.$CFG->pixpath.'/i/ical.gif" height="14" width="36" '
+             .'alt="'.get_string('ical', 'calendar').'" '
+             .'title="'.get_string('quickdownloadcalendar', 'calendar').'" />'
+             .'</a>';
     }
 
+    echo '</div>';
+    echo '</div>';
     echo '</td>';
 
     // END: Main column