diff --git a/calendar/inc/class.bocal.inc.php b/calendar/inc/class.bocal.inc.php index 24c7db363c..05a53dc4bb 100644 --- a/calendar/inc/class.bocal.inc.php +++ b/calendar/inc/class.bocal.inc.php @@ -172,10 +172,6 @@ class bocal $this->grants = $GLOBALS['egw']->acl->get_grants('calendar'); - foreach($this->verbose_status as $status => $text) - { - $this->verbose_status[$status] = lang($text); - } if (!is_array($this->resources = $GLOBALS['egw']->session->appsession('resources','calendar'))) { $this->resources = array(); @@ -1360,7 +1356,7 @@ class bocal * @param boolean $show_group_invitation=false show group-invitations (status == 'G') or not (default) * @return array with id / names with status pairs */ - function participants($event,$long_status=False,$show_group_invitation=false) + function participants($event,$long_status=true,$show_group_invitation=false) { //_debug_array($event); $names = array(); @@ -1369,12 +1365,28 @@ class bocal if ($status == 'G' && !$show_group_invitation) continue; // dont show group-invitation $status = $this->verbose_status[$status]; + if($status == "Accepted") + { + $status = $GLOBALS['egw']->html->image('calendar','agt_action_success',lang($status)); + } + else if($status == "Rejected") + { + $status = $GLOBALS['egw']->html->image('calendar','agt_action_fail',lang($status)); + } + else if($status == "Tentative") + { + $status = $GLOBALS['egw']->html->image('calendar','tentative',lang($status)); + } + else if($status == "No Response") + { + $status = $GLOBALS['egw']->html->image('calendar','cnr-pending',lang($status)); + } if (!$long_status) { - $status = substr($status,0,1); + $status = substr($status,0,1); } - $names[$id] = $this->participant_name($id).' ('.$status.')'; + $names[$id] = $this->participant_name($id).' '.$status; } return $names; } diff --git a/calendar/templates/default/images/agt_action_fail.gif b/calendar/templates/default/images/agt_action_fail.gif new file mode 100755 index 0000000000..0b8234fe29 Binary files /dev/null and b/calendar/templates/default/images/agt_action_fail.gif differ diff --git a/calendar/templates/default/images/agt_action_fail.png b/calendar/templates/default/images/agt_action_fail.png new file mode 100755 index 0000000000..64d36513c4 Binary files /dev/null and b/calendar/templates/default/images/agt_action_fail.png differ diff --git a/calendar/templates/default/images/agt_action_success.gif b/calendar/templates/default/images/agt_action_success.gif new file mode 100755 index 0000000000..6ddd63d3a1 Binary files /dev/null and b/calendar/templates/default/images/agt_action_success.gif differ diff --git a/calendar/templates/default/images/agt_action_success.png b/calendar/templates/default/images/agt_action_success.png new file mode 100755 index 0000000000..d19bd220f8 Binary files /dev/null and b/calendar/templates/default/images/agt_action_success.png differ diff --git a/calendar/templates/default/images/cnr-pending.gif b/calendar/templates/default/images/cnr-pending.gif new file mode 100755 index 0000000000..dda34fcfa6 Binary files /dev/null and b/calendar/templates/default/images/cnr-pending.gif differ diff --git a/calendar/templates/default/images/cnr-pending.png b/calendar/templates/default/images/cnr-pending.png new file mode 100755 index 0000000000..2995f57c52 Binary files /dev/null and b/calendar/templates/default/images/cnr-pending.png differ diff --git a/calendar/templates/default/images/tentative.gif b/calendar/templates/default/images/tentative.gif new file mode 100755 index 0000000000..aaaf7df4ae Binary files /dev/null and b/calendar/templates/default/images/tentative.gif differ diff --git a/calendar/templates/default/images/tentative.png b/calendar/templates/default/images/tentative.png new file mode 100755 index 0000000000..9f2e4491ae Binary files /dev/null and b/calendar/templates/default/images/tentative.png differ