Changeset 4549 for branches/2.2.0.1/calendar/inc
- Timestamp:
- 05/31/11 09:46:05 (13 years ago)
- Location:
- branches/2.2.0.1/calendar/inc
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php
r4529 r4549 5383 5383 $hour_size_px = $account_prefs['calendar']['interval'] ? $account_prefs['calendar']['interval'] : 42; 5384 5384 5385 $title_view = $account_prefs['calendar']['title_view']; 5386 5385 5387 $events_to_show_json = array(); 5386 5388 $templateSet = $GLOBALS['phpgw_info']['server']['template_set']; … … 5450 5452 } 5451 5453 5452 if($_GET['menuaction'] == 'calendar.uicalendar.day') 5453 { 5454 $text = $event['description']; 5455 } 5456 elseif($_GET['menuaction'] == 'calendar.uicalendar.week') 5457 { 5458 $text = ' - '.$event['end']['hour'].':'.$event['end']['min']; 5459 5460 //is recurrent? 5461 $text .= (isset($recur) && $recur != false) ? ' ' . '<img width="10px" height="10px" border="0" title="'.lang('recurring event').'" src="calendar/templates/'.$templateSet.'/images/recur.png"/>' : '' ; 5462 5463 //participants? 5464 if(count($event['participants']) > 1) 5454 if($title_view == 0) 5455 { 5456 if($_GET['menuaction'] == 'calendar.uicalendar.day') 5465 5457 { 5466 $text .= " " . '<img width="11px" height="10px" border="0" title="'.$participants.'" src="calendar/templates/'.$templateSet.'/images/multi_3.png"/>'; 5458 $text = $event['description']; 5459 } 5460 elseif($_GET['menuaction'] == 'calendar.uicalendar.week') 5461 { 5462 $text = ' - '.$event['end']['hour'].':'.$event['end']['min']; 5463 5464 //is recurrent? 5465 $text .= (isset($recur) && $recur != false) ? ' ' . '<img width="10px" height="10px" border="0" title="'.lang('recurring event').'" src="calendar/templates/'.$templateSet.'/images/recur.png"/>' : '' ; 5466 5467 //participants? 5468 if(count($event['participants']) > 1) 5469 { 5470 $text .= " " . '<img width="11px" height="10px" border="0" title="'.$participants.'" src="calendar/templates/'.$templateSet.'/images/multi_3.png"/>'; 5471 } 5472 else 5473 { 5474 $text .= " " . '<img width="11px" height="10px" border="0" title="'.$participants.'" src="calendar/templates/'.$templateSet.'/images/single.png"/>'; 5475 } 5476 5477 //has attachments? 5478 $text .= (isset($event['attachment']) && $event['attachment'] != '') ? ' ' . '<img width="10px" height="10px" border="0" title="'.lang('email notifications with attachments has been sent').'" src="calendar/templates/'.$templateSet.'/images/clip.png"/>' : '' ; 5479 5480 //is public? 5481 $text .= $isPublic == 0 ? ' ' . '<img width="11px" height="10px" border="0" title="'.$isPublicTitle.'" src="calendar/templates/'.$templateSet.'/images/private.png"/>' : '' ; 5482 5483 //has alarm? 5484 $text .= (isset($event['alarm']) && count($event['alarm']) >= 1) ? ' ' . '<img width="11px" height="10px" border="0" title="'.lang('alarm').'" src="calendar/templates/'.$templateSet.'/images/alarm.png"/>' : '' ; 5485 5486 $text .= ' - ' . $event['title']." - ".$event['description']; 5467 5487 } 5468 5488 else 5469 5489 { 5470 $text .= " " . '<img width="11px" height="10px" border="0" title="'.$participants.'" src="calendar/templates/'.$templateSet.'/images/single.png"/>';5490 $text = ' - '.$event['end']['hour'].':'.$event['end']['min'] . ' - '. $event['title']." - ".$event['description']; 5471 5491 } 5472 5473 //has attachments? 5474 $text .= (isset($event['attachment']) && $event['attachment'] != '') ? ' ' . '<img width="10px" height="10px" border="0" title="'.lang('email notifications with attachments has been sent').'" src="calendar/templates/'.$templateSet.'/images/clip.png"/>' : '' ; 5475 5476 //is public? 5477 $text .= $isPublic == 0 ? ' ' . '<img width="11px" height="10px" border="0" title="'.$isPublicTitle.'" src="calendar/templates/'.$templateSet.'/images/private.png"/>' : '' ; 5478 5479 //has alarm? 5480 $text .= (isset($event['alarm']) && count($event['alarm']) >= 1) ? ' ' . '<img width="11px" height="10px" border="0" title="'.lang('alarm').'" src="calendar/templates/'.$templateSet.'/images/alarm.png"/>' : '' ; 5481 5482 $text .= ' - ' . $event['title']." - ".$event['description']; 5483 } 5492 } 5484 5493 else 5485 5494 { 5486 $text = ' - '.$event['end']['hour'].':'.$event['end']['min'] . ' - '. $event['title']." - ".$event['description'];5495 $text = ''; 5487 5496 } 5488 5497 … … 5508 5517 recurTitle => utf8_encode(lang('recurring event')), 5509 5518 intersection => $intersection, 5510 rejected => $rejected 5519 rejected => $rejected, 5520 title_view => $title_view 5511 5521 ); 5512 5522 -
branches/2.2.0.1/calendar/inc/hook_settings.inc.php
r4530 r4549 189 189 create_check_box('Leave my calendar public','public_view', 190 190 'This option allow everybody to view your calendar in readmode.'); 191 //create_select_box('Default view of your calendar','title_view',array(192 //'0' => lang('Title and Description'),193 //'1' => lang('Only Title')194 //),'This option enable or disable the meeting description view your calendar in readmode.');191 create_select_box('Default view of your calendar','title_view',array( 192 '0' => lang('Title and Description'), 193 '1' => lang('Only Title') 194 ),'This option enable or disable the meeting description view your calendar in readmode.'); 195 195 create_select_box('Choose fields to print','fields_to_print',array( 196 196 '0' => lang('Only Title'),
Note: See TracChangeset
for help on using the changeset viewer.