mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-25 16:18:57 +01:00
- clearify wording "display holidays or birthdays as events *in dayview*", as it currently only works in dayview and might take to much space for other views
- fixed holidays as events to show no participants and not as private
This commit is contained in:
parent
a86877e0f2
commit
d628f11250
@ -567,7 +567,7 @@ class calendar_hooks
|
||||
),
|
||||
'display_holidays_event' => array(
|
||||
'type' => 'select',
|
||||
'label' => 'Display holidays or birthdays as events',
|
||||
'label' => 'Display holidays or birthdays as events in dayview',
|
||||
'name' => 'display_holidays_event',
|
||||
'values' => array(
|
||||
'0' => lang('Display in header'), //Please note that these values are a binary mask
|
||||
|
@ -129,6 +129,11 @@ class calendar_uiviews extends calendar_ui
|
||||
*/
|
||||
var $allowEdit = true;
|
||||
|
||||
/**
|
||||
* Display holidays as event, currenlty only used in day-view
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
var $display_holiday_event_types = array(
|
||||
'bdays' => false,
|
||||
'hdays' => false
|
||||
@ -171,14 +176,6 @@ class calendar_uiviews extends calendar_ui
|
||||
|
||||
$this->check_owners_access();
|
||||
|
||||
//Load the ""show holiday as event" preference here and set the event
|
||||
//types mask accordingly.
|
||||
$display_holidays_event = $GLOBALS['egw_info']['user']['preferences']['calendar']['display_holidays_event'];
|
||||
$this->display_holiday_event_types = array(
|
||||
'bdays' => ((int)$display_holidays_event & 1) != 0,
|
||||
'hdays' => ((int)$display_holidays_event & 2) != 0
|
||||
);
|
||||
|
||||
if($GLOBALS['egw_info']['user']['preferences']['common']['enable_dragdrop'])
|
||||
{
|
||||
$this->dragdrop = new dragdrop();
|
||||
@ -934,6 +931,14 @@ class calendar_uiviews extends calendar_ui
|
||||
}
|
||||
$cols = array();
|
||||
|
||||
//Load the ""show holiday as event" preference here and set the event
|
||||
//types mask accordingly.
|
||||
$display_holidays_event = $GLOBALS['egw_info']['user']['preferences']['calendar']['display_holidays_event'];
|
||||
$this->display_holiday_event_types = array(
|
||||
'bdays' => ((int)$display_holidays_event & 1) != 0,
|
||||
'hdays' => ((int)$display_holidays_event & 2) != 0
|
||||
);
|
||||
|
||||
//Add the holiday events
|
||||
$holidays = $this->_get_holiday_events($this->date, $this->display_holiday_event_types);
|
||||
foreach($dayEvents as &$events)
|
||||
@ -1664,7 +1669,7 @@ function open_edit(series)
|
||||
$icons = self::integration_get_icons($app,$app_id,$event);
|
||||
}
|
||||
}
|
||||
else
|
||||
elseif($event['id'])
|
||||
{
|
||||
if (($is_private = !$this->bo->check_perms(EGW_ACL_READ,$event)))
|
||||
{
|
||||
@ -2902,10 +2907,8 @@ function open_edit(series)
|
||||
'title' => $title,
|
||||
'description' => $description,
|
||||
'participants' => array(
|
||||
'-1' => 'U'
|
||||
),
|
||||
'whole_day_on_top' => true,
|
||||
'public' => true,
|
||||
'start' => $day_start,
|
||||
'end' => $day_end,
|
||||
'non_blocking' => true,
|
||||
|
@ -133,7 +133,7 @@ deleted calendar de Gelöscht
|
||||
deny ressources reservation for private events calendar de Verbiete die Reservierung von Ressourcen für private Termine
|
||||
directory with documents to insert entries calendar de Verzeichnis mit Dokumenten zum Einfügen von Kalendereinträgen
|
||||
disinvited calendar de Ausgeladen
|
||||
display holidays or birthdays as events calendar de Zeige Feier- oder Geburtstage als Ereignisse
|
||||
display holidays or birthdays as events in dayview calendar de Zeige Feier- oder Geburtstage in der Tagesansicht als Termine
|
||||
display in header calendar de Im Titel anzeigen
|
||||
display status of events calendar de Status von Terminen anzeigen
|
||||
displayed view calendar de Ansicht
|
||||
|
@ -132,7 +132,7 @@ deleted calendar en Deleted.
|
||||
deny ressources reservation for private events calendar en Deny resources reservation for private events
|
||||
directory with documents to insert entries calendar en Directory with documents to insert entries
|
||||
disinvited calendar en Disinvited.
|
||||
display holidays or birthdays as events calendar en Display holidays or birthdays as events
|
||||
display holidays or birthdays as events in dayview calendar en Display holidays or birthdays as events in dayview
|
||||
display in header calendar en Display in header
|
||||
display status of events calendar en Display status of events
|
||||
displayed view calendar en Displayed view
|
||||
|
@ -129,7 +129,7 @@ deleted calendar fi Poistetut
|
||||
deny ressources reservation for private events calendar fi Estä resurssien varaaminen henkilökohtaisiin tapahtumiin
|
||||
directory with documents to insert entries calendar fi Asiakirjan oletuskansio
|
||||
disinvited calendar fi Kutsu peruttu
|
||||
display holidays or birthdays as events calendar fi Esitä lomat ja syntymäpäivät tapahtumina
|
||||
display holidays or birthdays as events in dayview calendar fi Esitä lomat ja syntymäpäivät tapahtumina
|
||||
display in header calendar fi Esitä aiheena
|
||||
display status of events calendar fi Näytä tapahtumien tila
|
||||
displayed view calendar fi Valittu näkymä
|
||||
|
Loading…
Reference in New Issue
Block a user