--- calendar/lib.php.orig	2009-09-11 01:18:31.000000000 +0900
+++ calendar/lib.php	2009-09-11 08:35:40.000000000 +0900
@@ -500,7 +500,9 @@
         $event->cssclass = 'event_course';
     } else if ($event->groupid) {                                    // Group event
         $event->icon = '<img height="16" width="16" src="'.$CFG->pixpath.'/c/group.gif" alt="'.get_string('groupevent', 'calendar').'" style="vertical-align: middle;" />';
-        $event->cssclass = 'event_group';
+	//        $event->cssclass = 'event_group';
+	// t-kita
+        $event->cssclass = 'event_group groupid'.$event->groupid;
     } else if($event->userid) {                                      // User event
         $event->icon = '<img height="16" width="16" src="'.$CFG->pixpath.'/c/user.gif" alt="'.get_string('userevent', 'calendar').'" style="vertical-align: middle;" />';
         $event->cssclass = 'event_user';
@@ -527,7 +529,12 @@
     if (!empty($event->referer)) {
         echo '<div class="referer">'.$event->referer.'</div>';
     } else {
+      // t-kita
+      if ($event->groupid) {
+        echo '<div class="name">'.$event->name." (group: ".get_record('groups','id', $event->groupid)->name.")"."</div>";
+      }else{
         echo '<div class="name">'.$event->name."</div>";
+      }
     }
     if (!empty($event->courselink)) {
         echo '<div class="course">'.$event->courselink.' </div>';
--- calendar/view.php.orig	2009-09-10 00:28:14.000000000 +0900
+++ calendar/view.php	2009-09-11 01:16:15.000000000 +0900
@@ -489,10 +489,16 @@
                 // If event has a class set then add it to the event <li> tag
                 $eventclass = '';
                 if (!empty($events[$eventindex]->class)) {
-                    $eventclass = ' class="'.$events[$eventindex]->class.'"';
+		  // t-kita
+                    $eventclass = ' class="'.$events[$eventindex]->class.' groupid'.$events[$eventindex]->groupid.'"';
                 }
-
-                echo '<li'.$eventclass.'><a href="'.$dayhref.'#event_'.$events[$eventindex]->id.'">'.format_string($events[$eventindex]->name, true).'</a></li>';
+                // t-kita
+		if ($events[$eventindex]->class == "event_group"){
+		  $groupid_mark= '<span style="font-size:large">&#'.(0x265f+$events[$eventindex]->groupid).';</span> ';
+	        }else{
+	          $groupid_mark= '';
+                }
+                echo '<li'.$eventclass.'><a href="'.$dayhref.'#event_'.$events[$eventindex]->id.'">'.$groupid_mark.format_string($events[$eventindex]->name, true).'</a></li>';
             }
             echo '</ul>';
         }