mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 16:48:49 +01:00
feature to have a bit more possibilities to set your own calendar listview, by offering title,description,owner,location and recure as single column,
and offer to display start and enddate as date with either dow,weekday or both prefixed before the date
This commit is contained in:
parent
09612e4f58
commit
1163804989
@ -108,6 +108,19 @@ class uilist extends uical
|
|||||||
$msg = lang('Event deleted');
|
$msg = lang('Event deleted');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//Delete all selected Entrys
|
||||||
|
if (is_array($content) && $content['deleteall'])
|
||||||
|
{
|
||||||
|
//_debug_array($content);
|
||||||
|
|
||||||
|
foreach($content['nm']['rows']['checked'] as $num => $id)
|
||||||
|
{
|
||||||
|
if ($this->bo->delete($id))
|
||||||
|
{
|
||||||
|
$msg .= lang('Event deleted');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
$content = array(
|
$content = array(
|
||||||
'nm' => $GLOBALS['egw']->session->appsession('calendar_list','calendar'),
|
'nm' => $GLOBALS['egw']->session->appsession('calendar_list','calendar'),
|
||||||
'msg' => $msg,
|
'msg' => $msg,
|
||||||
@ -123,7 +136,7 @@ class uilist extends uical
|
|||||||
'filter' => 'after',
|
'filter' => 'after',
|
||||||
'order' => 'cal_start',// IO name of the column to sort after (optional for the sortheaders)
|
'order' => 'cal_start',// IO name of the column to sort after (optional for the sortheaders)
|
||||||
'sort' => 'ASC',// IO direction of the sort: 'ASC' or 'DESC'
|
'sort' => 'ASC',// IO direction of the sort: 'ASC' or 'DESC'
|
||||||
'default_cols' => '!week,cat_id,pm_id',
|
'default_cols' => '!week,weekday,cal_title,cal_description,recure,cal_location,cal_owner,cat_id,pm_id',
|
||||||
'filter_onchange' => "set_style_by_class('*','custom_hide','visibility',this.value == 'custom' ? 'visible' : 'hidden'); if (this.value != 'custom') this.form.submit();",
|
'filter_onchange' => "set_style_by_class('*','custom_hide','visibility',this.value == 'custom' ? 'visible' : 'hidden'); if (this.value != 'custom') this.form.submit();",
|
||||||
'header_left' => 'calendar.list.dates',
|
'header_left' => 'calendar.list.dates',
|
||||||
);
|
);
|
||||||
@ -288,10 +301,23 @@ class uilist extends uical
|
|||||||
if (empty($event['location'])) $event['location'] = ' '; // no location screws the owner horz. alignment
|
if (empty($event['location'])) $event['location'] = ' '; // no location screws the owner horz. alignment
|
||||||
$rows[] = $event;
|
$rows[] = $event;
|
||||||
}
|
}
|
||||||
|
$wv=0;
|
||||||
|
$dv=0;
|
||||||
$params['options-selectcols']['week'] = lang('Week');
|
$params['options-selectcols']['week'] = lang('Week');
|
||||||
if (substr($this->cal_prefs['nextmatch-calendar.list.rows'],0,4) == 'week')
|
$params['options-selectcols']['weekday'] = lang('Weekday');
|
||||||
|
if ((substr($this->cal_prefs['nextmatch-calendar.list.rows'],0,4) == 'week' && strlen($this->cal_prefs['nextmatch-calendar.list.rows'])==4) || substr($this->cal_prefs['nextmatch-calendar.list.rows'],0,5) == 'week,')
|
||||||
{
|
{
|
||||||
$rows['format'] = '32'; // prefix date with week-number
|
$rows['format'] = '32'; // prefix date with week-number
|
||||||
|
$wv=1;
|
||||||
|
}
|
||||||
|
if (!(strpos($this->cal_prefs['nextmatch-calendar.list.rows'],'weekday')===FALSE))
|
||||||
|
{
|
||||||
|
$rows['format'] = '16';
|
||||||
|
$dv=1;
|
||||||
|
}
|
||||||
|
if ($wv&&$dv)
|
||||||
|
{
|
||||||
|
$rows['format'] = '64';
|
||||||
}
|
}
|
||||||
if ($this->cat_id) $rows['no_cat_id'] = true;
|
if ($this->cat_id) $rows['no_cat_id'] = true;
|
||||||
if (!$GLOBALS['egw_info']['user']['apps']['projectmanager'])
|
if (!$GLOBALS['egw_info']['user']['apps']['projectmanager'])
|
||||||
|
@ -251,7 +251,7 @@ select who should get the alarm calendar de Auswählen wer den Alarm erhalten so
|
|||||||
selected range calendar de Ausgewählter Zeitraum
|
selected range calendar de Ausgewählter Zeitraum
|
||||||
set a year only for one-time / non-regular holidays. calendar de Nur für einmalige/unregelmäßige Feiertage das Jahr angeben.
|
set a year only for one-time / non-regular holidays. calendar de Nur für einmalige/unregelmäßige Feiertage das Jahr angeben.
|
||||||
set new events to private calendar de Neue Termine als private Termine eintragen
|
set new events to private calendar de Neue Termine als private Termine eintragen
|
||||||
setting lock time calender calendar de Zeitintervall für Datensatzlock (default 1 sec.)
|
setting lock time calender admin de Zeitintervall für Datensatzlock (default 1 sec.)
|
||||||
should invitations you rejected still be shown in your calendar ?<br>you can only accept them later (eg. when your scheduling conflict is removed), if they are still shown in your calendar! calendar de Sollen Einladungen welche von Ihnen abgelehnt wurden in Ihrem Kalender angezeigt werden?<br> Sie können diese Einladungen dann später akzeptieren (z. B. wenn Sie eine Terminkolission gelöst haben), wenn Sie in Ihrem Kalender noch vorhanden sind!
|
should invitations you rejected still be shown in your calendar ?<br>you can only accept them later (eg. when your scheduling conflict is removed), if they are still shown in your calendar! calendar de Sollen Einladungen welche von Ihnen abgelehnt wurden in Ihrem Kalender angezeigt werden?<br> Sie können diese Einladungen dann später akzeptieren (z. B. wenn Sie eine Terminkolission gelöst haben), wenn Sie in Ihrem Kalender noch vorhanden sind!
|
||||||
should new events created as private by default ? calendar de Sollen neue Termine generell als Privat angelegt werden?
|
should new events created as private by default ? calendar de Sollen neue Termine generell als Privat angelegt werden?
|
||||||
should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is %1. calendar de Sollen nicht angemeldete Personen ihre Belegtzeiten einsehen können? Sie können ein Passwort setzen um diese Informationen zu schützen. Das Passwort sollte sich von Ihrem normalen Passwort unterscheiden. Die Belegtzeiten sind im iCal Format und enthalten ausschließlich die Zeiten an denen sie nicht verfügbar sind. Sie enthalten NICHT den Namen, die Beschreibung oder den Ort des Termins. Die Adresse (URL) Ihrer Belegtzeiten ist %1.
|
should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is %1. calendar de Sollen nicht angemeldete Personen ihre Belegtzeiten einsehen können? Sie können ein Passwort setzen um diese Informationen zu schützen. Das Passwort sollte sich von Ihrem normalen Passwort unterscheiden. Die Belegtzeiten sind im iCal Format und enthalten ausschließlich die Zeiten an denen sie nicht verfügbar sind. Sie enthalten NICHT den Namen, die Beschreibung oder den Ort des Termins. Die Adresse (URL) Ihrer Belegtzeiten ist %1.
|
||||||
@ -304,6 +304,7 @@ view this event calendar de Diesen Termin anzeigen
|
|||||||
views with fixed time intervals calendar de Ansichten mit festen Zeitintervallen
|
views with fixed time intervals calendar de Ansichten mit festen Zeitintervallen
|
||||||
wed calendar de Mi
|
wed calendar de Mi
|
||||||
week calendar de Woche
|
week calendar de Woche
|
||||||
|
weekday calendar de Wochentag
|
||||||
weekday starts on calendar de Arbeitswoche beginnt am
|
weekday starts on calendar de Arbeitswoche beginnt am
|
||||||
weekdays calendar de Wochentage
|
weekdays calendar de Wochentage
|
||||||
weekdays to use in search calendar de Wochentage für die Suche
|
weekdays to use in search calendar de Wochentage für die Suche
|
||||||
|
@ -304,6 +304,7 @@ view this event calendar en View this event
|
|||||||
views with fixed time intervals calendar en Views with fixed time intervals
|
views with fixed time intervals calendar en Views with fixed time intervals
|
||||||
wed calendar en Wed
|
wed calendar en Wed
|
||||||
week calendar en Week
|
week calendar en Week
|
||||||
|
weekday calendar en weekday
|
||||||
weekday starts on calendar en weekday starts on
|
weekday starts on calendar en weekday starts on
|
||||||
weekdays calendar en Weekdays
|
weekdays calendar en Weekdays
|
||||||
weekdays to use in search calendar en Weekdays to use in search
|
weekdays to use in search calendar en Weekdays to use in search
|
||||||
|
File diff suppressed because one or more lines are too long
@ -32,7 +32,7 @@
|
|||||||
</select>
|
</select>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<!--- lock setting -->
|
<!-- lock setting -->
|
||||||
<tr class="row_on">
|
<tr class="row_on">
|
||||||
<td>{lang_setting_lock_time_calender}:</td>
|
<td>{lang_setting_lock_time_calender}:</td>
|
||||||
<td><input name="newsettings[Lock_Time_Calender]" value="{value_Lock_Time_Calender}" size="40"></td>
|
<td><input name="newsettings[Lock_Time_Calender]" value="{value_Lock_Time_Calender}" size="40"></td>
|
||||||
|
Loading…
Reference in New Issue
Block a user