diff --git a/calendar/inc/class.uiviews.inc.php b/calendar/inc/class.uiviews.inc.php index 1bcd35ddc2..77d8aee520 100644 --- a/calendar/inc/class.uiviews.inc.php +++ b/calendar/inc/class.uiviews.inc.php @@ -1060,7 +1060,7 @@ class uiviews extends uical } foreach($part_array as $part_group => $participant) { - $participants .= $this->add_nonempty($participant,$part_group,True); + $participants .= $this->add_nonempty($participant,$part_group,True,False); } // as we only deal with percentual widht, we consider only the full dayview (1 colum) as NOT small $small = $this->view != 'day' || $width < 50; @@ -1165,11 +1165,18 @@ class uiviews extends uical '>'."\n".$ie_fix.$html.$indent."\n"; } - function add_nonempty($content,$label,$one_per_line=False) + function add_nonempty($content,$label,$one_per_line=False,$space = True) { if (is_array($content)) { - $content = implode($one_per_line ? ",\n" : ', ',$content); + if($space) + { + $content = implode($one_per_line ? ",\n" : ', ',$content); + } + else + { + $content = implode($one_per_line ? "\n" : ', ',$content); + } } if (!empty($content)) { diff --git a/calendar/templates/default/images/agt_action_fail.gif b/calendar/templates/default/images/agt_action_fail.gif index 0b8234fe29..66680c4a39 100755 Binary files a/calendar/templates/default/images/agt_action_fail.gif 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 index 64d36513c4..c4ec9c9f99 100755 Binary files a/calendar/templates/default/images/agt_action_fail.png 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 index 6ddd63d3a1..8cae458996 100755 Binary files a/calendar/templates/default/images/agt_action_success.gif 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 index d19bd220f8..5ec2aba581 100755 Binary files a/calendar/templates/default/images/agt_action_success.png 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 index dda34fcfa6..0d14da11a9 100755 Binary files a/calendar/templates/default/images/cnr-pending.gif 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 index 2995f57c52..b151e9681b 100755 Binary files a/calendar/templates/default/images/cnr-pending.png 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 index aaaf7df4ae..ec865b3bb2 100755 Binary files a/calendar/templates/default/images/tentative.gif 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 index 9f2e4491ae..aa9f1a778f 100755 Binary files a/calendar/templates/default/images/tentative.png and b/calendar/templates/default/images/tentative.png differ