Changeset 4311 for branches/2.2.0.1
- Timestamp:
- 05/10/11 12:10:47 (13 years ago)
- Location:
- branches/2.2.0.1/calendar
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php
r4270 r4311 5377 5377 5378 5378 $events_to_show_json = array(); 5379 5379 $templateSet = $GLOBALS['phpgw_info']['server']['template_set']; 5380 5380 foreach($dates as $day) 5381 5381 { … … 5402 5402 } 5403 5403 5404 if($_GET['menuaction'] == 'calendar.uicalendar.day')5405 {5406 $text = $event['description'];5407 }5408 else5409 {5410 $text = ' - '.$event['end']['hour'].':'.$event['end']['min'].' - '.$event['title']." - ".$event['description'];5411 }5412 5413 5404 $isPublic = 1; 5414 5405 if(($event['type'] == E && $event['public'] == 0)) 5415 5406 { 5416 5407 $isPublic = 0; 5417 $isPublicTitle = "Restrito";5408 $isPublicTitle = lang('restrict'); 5418 5409 } 5419 5410 … … 5421 5412 { 5422 5413 $isPublic = 0; 5423 $isPublicTitle = "Privado";5414 $isPublicTitle = lang('private'); 5424 5415 } 5425 5416 … … 5444 5435 } 5445 5436 if($event['users_status'] == 'R') 5437 { 5446 5438 $rejected = TRUE; 5439 } 5447 5440 else 5441 { 5448 5442 $rejected = FALSE; 5443 } 5444 5445 if($_GET['menuaction'] == 'calendar.uicalendar.day') 5446 { 5447 $text = $event['description']; 5448 } 5449 elseif($_GET['menuaction'] == 'calendar.uicalendar.week') 5450 { 5451 $text = ' - '.$event['end']['hour'].':'.$event['end']['min']; 5452 5453 //is recurrent? 5454 $text .= (isset($recur) && $recur != false) ? ' ' . '<img width="10px" height="10px" border="0" title="'.lang('recurring event').'" src="calendar/templates/'.$templateSet.'/images/recur.png"/>' : '' ; 5455 5456 //participants? 5457 if(count($event['participants']) > 1) 5458 { 5459 $text .= " " . '<img width="11px" height="10px" border="0" title="'.$participants.'" src="calendar/templates/'.$templateSet.'/images/multi_3.png"/>'; 5460 } 5461 else 5462 { 5463 $text .= " " . '<img width="11px" height="10px" border="0" title="'.$participants.'" src="calendar/templates/'.$templateSet.'/images/single.png"/>'; 5464 } 5465 5466 //has attachments? 5467 $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"/>' : '' ; 5468 5469 //is public? 5470 $text .= $isPublic == 0 ? ' ' . '<img width="11px" height="10px" border="0" title="'.$isPublicTitle.'" src="calendar/templates/'.$templateSet.'/images/private.png"/>' : '' ; 5471 5472 //has alarm? 5473 $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"/>' : '' ; 5474 5475 $text .= ' - ' . $event['title']." - ".$event['description']; 5476 } 5477 else 5478 { 5479 $text = ' - '.$event['end']['hour'].':'.$event['end']['min'] . ' - '. $event['title']." - ".$event['description']; 5480 } 5449 5481 5450 5482 $events_to_show_json[] = array( … … 5460 5492 participants_title => $participants, 5461 5493 attachments => $event['attachment'] ? 1 : 0 , 5494 attachmentsTitle => utf8_encode(lang('email notifications with attachments has been sent')), 5462 5495 isPublic => $isPublic, 5463 isPublicTitle => $isPublicTitle,5496 isPublicTitle => utf8_encode($isPublicTitle), 5464 5497 alarm => (isset($event['alarm']) && count($event['alarm']) >= 1) ? 1 : 0, 5498 alarmTitle => utf8_encode(lang('alarm')), 5465 5499 recur => $recur, 5500 recurTitle => utf8_encode(lang('recurring event')), 5466 5501 intersection => $intersection, 5467 5502 rejected => $rejected -
branches/2.2.0.1/calendar/templates/default/day_cal.tpl
r4270 r4311 114 114 if(event.recur && event.recur != false) 115 115 { 116 imgs += '<img width="10px" height="10px" border="0" title=" Evento recorrente" src="calendar/templates/{templateSet}/images/recur.png"/>';116 imgs += '<img width="10px" height="10px" border="0" title="'+event.recurTitle+'" src="calendar/templates/{templateSet}/images/recur.png"/>'; 117 117 } 118 118 … … 128 128 if(event.attachments == 1) 129 129 { 130 imgs += " " + '<img width="10px" height="10px" border="0" title=" Foram enviadas notificações com anexos" src="calendar/templates/{templateSet}/images/clip.png"/>';130 imgs += " " + '<img width="10px" height="10px" border="0" title="'+event.attachmentsTitle+'" src="calendar/templates/{templateSet}/images/clip.png"/>'; 131 131 } 132 132 … … 138 138 if(event.alarm == 1) 139 139 { 140 imgs += " " + '<img width="11px" height="10px" border="0" title=" Alarme" src="calendar/templates/{templateSet}/images/alarm.png"/>';140 imgs += " " + '<img width="11px" height="10px" border="0" title="'+event.alarmTitle+'" src="calendar/templates/{templateSet}/images/alarm.png"/>'; 141 141 } 142 142
Note: See TracChangeset
for help on using the changeset viewer.