- Timestamp:
- 01/26/09 14:56:58 (16 years ago)
- Location:
- trunk/calendar
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/calendar/inc/class.bocalendar.inc.php
r588 r625 3244 3244 { 3245 3245 //echo "<p>bocalendar::send_alarm("; print_r($alarm); echo ")</p>\n"; 3246 3246 3247 $GLOBALS['phpgw_info']['user']['account_id'] = $this->owner = $alarm['owner']; 3247 3248 … … 3720 3721 'notifyAlarm' => $this->translate('Alarm for %1 at %2 in %3',array('$$title$$','$$startdate$$','$$location$$')) . "\n" . $this->translate('Here is your requested alarm.'), 3721 3722 'show_rejected' => '0', 3723 'hide_event_conflict' => '0', 3722 3724 'display_status' => '1', 3723 3725 'weekdaystarts' => 'Monday', -
trunk/calendar/inc/class.uicalendar.inc.php
r602 r625 3170 3170 3171 3171 /*****************************************************************************************/ 3172 3172 function normDec($num) 3173 { 3174 if ($num > 9) 3175 return $num; 3176 else 3177 return "0".$num; 3178 } 3173 3179 function overlap($params) 3174 3180 { … … 3193 3199 { 3194 3200 $overlapped_event = $this->bo->read_entry($overlapping_events[$i],True); 3195 $overlap .= '<li>'.$this->link_to_entry($overlapped_event,$month,$mday,$year);3196 $overlap .= '<ul>';3197 3201 foreach($overlapped_event['participants'] as $id => $status) 3198 3202 { … … 3200 3204 $overlap .= '<li>'.($conflict?'<b>':''). 3201 3205 $GLOBALS['phpgw']->common->grab_owner_name($id). 3202 ($conflict?'</b> - '.lang('Scheduling conflict'):'')."</li>\n"; 3203 } 3204 $overlap .= "</ul>\n"; 3206 ($conflict?'</b> - '.lang('Scheduling conflict'):'')."</li>"; 3207 } 3208 if ($this->bo->prefs['calendar']['hide_event_conflict']) 3209 $overlap .= '<ul><font size="1"><span>'. 3210 $this->normDec($overlapped_event['start']['hour']).":". 3211 $this->normDec($overlapped_event['start']['min'])."-". 3212 $this->normDec($overlapped_event['end']['hour']).":". 3213 $this->normDec($overlapped_event['end']['min']). 3214 '<br><b>'.lang('title').": ".lang("Hidden"). 3215 '</b><br>'.lang('description').": ".lang("Hidden").'<br></span></ul><br>'; 3216 else 3217 $overlap .= '<ul>'.$this->link_to_entry($overlapped_event,$month,$mday,$year)."</ul><br>"; 3205 3218 } 3206 3219 … … 3919 3932 { 3920 3933 $icon = '<img src="'.$GLOBALS['phpgw']->common->image('calendar',($alarm['enabled']?'enabled':'disabled')).'" width="13" height="13">'; 3921 $var = Array( 3934 $var = Array( 3922 3935 'field' => $icon.$GLOBALS['phpgw']->common->show_date($alarm['time']), 3923 3936 'data' => lang('Email Notification for %1',$GLOBALS['phpgw']->common->grab_owner_name($alarm['owner'])) -
trunk/calendar/inc/hook_settings.inc.php
r2 r625 105 105 create_check_box('Display status of events','display_status', 106 106 'Should the status of the event-participants (accept, reject, ...) be shown in brakets after each participants name ?'); 107 create_check_box('Hide title and description of event when conflicts','hide_event_conflict', 108 'When user invite other that time conflicts this option hide title and description even if the event is public'); 107 109 108 110 $weekdaystarts = array(
Note: See TracChangeset
for help on using the changeset viewer.