Changeset 4565
- Timestamp:
- 06/01/11 08:56:40 (13 years ago)
- Location:
- sandbox/2.2.0.2/calendar
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.2.0.2/calendar/inc/class.uicalendar.inc.php
r4554 r4565 5385 5385 $hour_size_px = $account_prefs['calendar']['interval'] ? $account_prefs['calendar']['interval'] : 42; 5386 5386 5387 $title_view = $account_prefs['calendar']['title_view']; 5388 5387 5389 $events_to_show_json = array(); 5388 5390 $templateSet = $GLOBALS['phpgw_info']['server']['template_set']; … … 5454 5456 } 5455 5457 5456 if($_GET['menuaction'] == 'calendar.uicalendar.day') 5457 { 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) 5458 if($title_view == 0) 5459 { 5460 if($_GET['menuaction'] == 'calendar.uicalendar.day') 5469 5461 { 5470 $text .= " " . '<img width="11px" height="10px" border="0" title="'.$participants.'" src="calendar/templates/'.$templateSet.'/images/multi_3.png"/>'; 5462 $text = $event['description']; 5463 } 5464 elseif($_GET['menuaction'] == 'calendar.uicalendar.week') 5465 { 5466 $text = ' - '.$event['end']['hour'].':'.$event['end']['min']; 5467 5468 //is recurrent? 5469 $text .= (isset($recur) && $recur != false) ? ' ' . '<img width="10px" height="10px" border="0" title="'.lang('recurring event').'" src="calendar/templates/'.$templateSet.'/images/recur.png"/>' : '' ; 5470 5471 //participants? 5472 if(count($event['participants']) > 1) 5473 { 5474 $text .= " " . '<img width="11px" height="10px" border="0" title="'.$participants.'" src="calendar/templates/'.$templateSet.'/images/multi_3.png"/>'; 5475 } 5476 else 5477 { 5478 $text .= " " . '<img width="11px" height="10px" border="0" title="'.$participants.'" src="calendar/templates/'.$templateSet.'/images/single.png"/>'; 5479 } 5480 5481 //has attachments? 5482 $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"/>' : '' ; 5483 5484 //is public? 5485 $text .= $isPublic == 0 ? ' ' . '<img width="11px" height="10px" border="0" title="'.$isPublicTitle.'" src="calendar/templates/'.$templateSet.'/images/private.png"/>' : '' ; 5486 5487 //has alarm? 5488 $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"/>' : '' ; 5489 5490 $text .= ' - ' . $event['title']." - ".$event['description']; 5471 5491 } 5472 5492 else 5473 5493 { 5474 $text .= " " . '<img width="11px" height="10px" border="0" title="'.$participants.'" src="calendar/templates/'.$templateSet.'/images/single.png"/>';5494 $text = ' - '.$event['end']['hour'].':'.$event['end']['min'] . ' - '. $event['title']." - ".$event['description']; 5475 5495 } 5476 5496 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'];5487 5497 } 5488 5498 else 5489 5499 { 5490 $text = ' - '.$event['end']['hour'].':'.$event['end']['min'] . ' - '. $event['title']." - ".$event['description'];5500 $text = ''; 5491 5501 } 5492 5502 … … 5514 5524 recurTitle => utf8_encode(lang('recurring event')), 5515 5525 intersection => $intersection, 5516 rejected => $rejected 5526 rejected => $rejected, 5527 title_view => $title_view 5517 5528 ); 5518 5529 -
sandbox/2.2.0.2/calendar/inc/hook_settings.inc.php
r4555 r4565 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'), -
sandbox/2.2.0.2/calendar/templates/default/day_cal.tpl
r4323 r4565 150 150 } 151 151 152 if(event.descOnTitle == 1) 153 { 154 var eventDescOnTitle = (" - ") + event.text; 152 if(event.title_view == 0) 153 { 154 if(event.descOnTitle == 1) 155 { 156 var eventDescOnTitle = (" - ") + event.text; 157 } 158 else 159 { 160 var eventDescOnTitle = ''; 161 } 155 162 } 156 163 else
Note: See TracChangeset
for help on using the changeset viewer.