From 622bd2d65c1ac38e25e3a52b3f40415e70316bb2 Mon Sep 17 00:00:00 2001 From: Rob van Kraanen Date: Wed, 6 Dec 2006 13:56:17 +0000 Subject: [PATCH] patch lang problem. -The first letter in the acceptance view in tooltip replaced by a icon. -Added images for tooltip --- calendar/inc/class.bocal.inc.php | 26 +++++++++++++----- .../default/images/agt_action_fail.gif | Bin 0 -> 1912 bytes .../default/images/agt_action_fail.png | Bin 0 -> 840 bytes .../default/images/agt_action_success.gif | Bin 0 -> 1282 bytes .../default/images/agt_action_success.png | Bin 0 -> 634 bytes .../templates/default/images/cnr-pending.gif | Bin 0 -> 615 bytes .../templates/default/images/cnr-pending.png | Bin 0 -> 851 bytes .../templates/default/images/tentative.gif | Bin 0 -> 583 bytes .../templates/default/images/tentative.png | Bin 0 -> 680 bytes 9 files changed, 19 insertions(+), 7 deletions(-) create mode 100755 calendar/templates/default/images/agt_action_fail.gif create mode 100755 calendar/templates/default/images/agt_action_fail.png create mode 100755 calendar/templates/default/images/agt_action_success.gif create mode 100755 calendar/templates/default/images/agt_action_success.png create mode 100755 calendar/templates/default/images/cnr-pending.gif create mode 100755 calendar/templates/default/images/cnr-pending.png create mode 100755 calendar/templates/default/images/tentative.gif create mode 100755 calendar/templates/default/images/tentative.png 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 0000000000000000000000000000000000000000..0b8234fe2937b8e106d1b61be46fd7ce59ddf56e GIT binary patch literal 1912 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 literal 0 HcmV?d00001 diff --git a/calendar/templates/default/images/tentative.gif b/calendar/templates/default/images/tentative.gif new file mode 100755 index 0000000000000000000000000000000000000000..aaaf7df4ae5a39b4bde5941aa760988bff90422c GIT binary patch literal 583 zcmV-N0=WH0Nk%w1VGsZi0OkMy|B{hHmp?CtDJyy?`~CZ~U_Si+`9;nI+;LyYYhL~L z_0Ecf(f!B&fPa3&Y)8umh@X4;ihRy?Uu?-i)R2y>>4E;3kYub@ZP!3C(g0JyCtb`l z^W)(ChI{?}{(i}BotQL^zKCqQVr9=dcF`pIYG9+mq-MfSX~a+et))n%3sk%V{egFA zz8bG*O0suHpVgB0z`4+hbocr9euW*yhJf7Z+-bjBTg5iacVy%C+IYxiHogJ;_4EDw z{QUm=MXEGHv?E@lH&C)XfU1C&yO(38V)Od%y4ba&&zpVKI&{TkUe7B+j6!0@L|wB} zw&JfkuO4U1Lu$!O>CVe>#X$Ac)BUEMNT(Lo@X7Xte;=^`@usACsCfIXtj)vLp(VNMMXRuV^XkAyr zH8{fn!h3AmNIu~3+w{uG_UGe#&SEvR05YTi(*DGH#cV6F0RR90A^8LV00000EC2ui z01yBW000N1fPaF6goTEOhebvK0Zl}RHUc7QeMnGG12csL0!uq-NggmCHv@$sLnu>H zc7JYpCqO2I7eP29OkxHY8*))ye>H7BaDH#|Vp`aK!WGJx6u_K{C06P~19Z&!O literal 0 HcmV?d00001 diff --git a/calendar/templates/default/images/tentative.png b/calendar/templates/default/images/tentative.png new file mode 100755 index 0000000000000000000000000000000000000000..9f2e4491ae12ea636294906a1b19e085d6a03c13 GIT binary patch literal 680 zcmV;Z0$2TsP)Y8hpbtCKeHgUE=84mp2P_GE%*ihivOM1Cw3eyXofB?S36N}zO2qtXJSVTz@o7s z%0-aj*xZxpUm9#SwL-~YRb0R+?ldmxZSZX`BR@@x#zt$F zrcAYP*ax(t0`28z^~t+r4MB>>Uc3*cd<$rrLRF?2Qrr$=%nr(H3NsR}b1er2ESE%` z3DN=*sR+1u79s+0dWX<@E*IUt2iTIf5dn?exK*%n7yzKRrlKdzAnbH~y~oOAg!0Aa z5R&GgBrJ;eO=vXSfJgd{hdJG7n<>X;bRRyNAY)x2J*~U=tmg5P77_{}sjVf#$|+26 z3>vhtVssVsLK&~di^VP|+-?+%Wy7dX$9wxSG(6BLH=1g1-!+D&CL#1Z_XO5gUsLD= zYs|w+RgonvK(XK`C6c3B+*;=YtfmYWD?