extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

UI change for videoconference

Browse Source
This commit is contained in:
Ralf Becker 2020-04-02 15:15:04 +02:00
parent f9a961085f
commit 43c75cad94
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -262,6 +262,8 @@ class calendar_uiforms extends calendar_ui
'recur_exception' => array(), 'recur_exception' => array(),
'title' => $title ? $title : '', 'title' => $title ? $title : '',
'category' => $cat_id, 'category' => $cat_id,
'videoconference' => !empty($_GET['videoconference']),
'notify_externals' => !empty($_GET['videoconference']) ? 'yes' : $this->cal_prefs['notify_externals'],
); );
} }
@ -1507,6 +1509,16 @@ class calendar_uiforms extends calendar_ui
'mail' => array('label' => 'Mail all participants', 'title' => 'Compose a mail to all participants after the event is saved'), 'mail' => array('label' => 'Mail all participants', 'title' => 'Compose a mail to all participants after the event is saved'),
'sendrequest' => array('label' => 'Meetingrequest to all participants', 'title' => 'Send meetingrequest to all participants after the event is saved'), 'sendrequest' => array('label' => 'Meetingrequest to all participants', 'title' => 'Send meetingrequest to all participants after the event is saved'),
), ),
'participants[nofify_externals]' => [
'yes' => ['label' => 'Yes', 'title' => 'Notify all externals (non-users) about this event'],
'no' => ['label' => 'No', 'title' => 'Do NOT notify externals (non-users) about this event'],
'never' => ['label' => 'Never', 'title' => 'Never notify externals (non-users) about events I create'],
'add_cancel' => ['label' => 'Always', 'title' => 'on invitation / cancellation only'],
'time_change_4h' => ['label' => 'Always', 'title' => 'on time change of more than 4 hours too'],
'time_change' => ['label' => 'Always', 'title' => 'on any time change too'],
'modifications' => ['label' => 'Always', 'title' => 'on all modification, but responses'],
'responses' => ['label' => 'Always', 'title' => 'on participant responses too'],
],
); );
unset($sel_options['status']['G']); unset($sel_options['status']['G']);
if (!is_array($event)) if (!is_array($event))

19
calendar/templates/default/edit.xet
View File

@ -56,14 +56,14 @@
<row class="th"></row> <row class="th"></row>
<row disabled="@no_add" height="60" class="et2_toolbar"> <row disabled="@no_add" height="60" class="et2_toolbar">
<calendar-owner id="participant" allowFreeEntries="true" span="4" empty_label="Add new participants or resource" onchange="app.calendar.participantOnChange"/> <calendar-owner id="participant" allowFreeEntries="true" span="4" empty_label="Add new participants or resource" onchange="app.calendar.participantOnChange"/>
<hbox> <hbox width="100%">
<textbox type="integer" id="quantity" min="1" size="3"/> <textbox type="integer" id="quantity" min="1" size="3"/>
<menulist> <select class="selectRole" id="role" align="center"/>
<menupopup class="selectRole" id="role" align="left"/> <button id="add" align="right" image="add" novalidate="1" statustext="Please first select participants on the left and then use plus button to add them" background_image="1" readonly="true" ro_image="add"/>
</menulist>
<button id="add" image="add" novalidate="1" statustext="Please first select participants on the left and then use plus button to add them" background_image="1" readonly="true" ro_image="add"/>
</hbox> </hbox>
</row>
<row>
<select label="Notify externals" id="nofify_externals" span="all" align="right"/>
</row> </row>
<row class="th thb"> <row class="th thb">
<description value="Type"/> <description value="Type"/>
@ -216,7 +216,7 @@
<date-time id="end" onchange="app.calendar.edit_update_participant"/> <date-time id="end" onchange="app.calendar.edit_update_participant"/>
</row> </row>
<row class="dialogHeader2" height="28"> <row class="dialogHeader2" height="28">
<label value="options"/> <label value="Options"/>
<checkbox statustext="Event will occupy the whole day" label="whole day" id="whole_day" onchange="app.calendar.set_alarmOptions_WD"/> <checkbox statustext="Event will occupy the whole day" label="whole day" id="whole_day" onchange="app.calendar.set_alarmOptions_WD"/>
<checkbox label="Private" id="public" options="0,1" statustext="Mark event as private to hide title and description"/> <checkbox label="Private" id="public" options="0,1" statustext="Mark event as private to hide title and description"/>
<checkbox statustext="A non blocking event will not conflict with other events" label="non blocking" id="non_blocking" options="1,0, ,"/> <checkbox statustext="A non blocking event will not conflict with other events" label="non blocking" id="non_blocking" options="1,0, ,"/>
@ -230,7 +230,10 @@
</row> </row>
<row class="dialogHeader3" height="28"> <row class="dialogHeader3" height="28">
<label for="location" value="Location"/> <label for="location" value="Location"/>
<textbox id="location" maxlength="255" class="et2_fullWidth" span="2"/> <hbox span="2">
<textbox id="location" maxlength="255" class="et2_fullWidth"/>
<checkbox label="Videoconference" id="videoconference"/>
</hbox>
<description/> <description/>
<taglist-cat id="category" height="190" empty_label="Categories" multiple="toggle" class="et2_fullWidth" rows="1" /> <taglist-cat id="category" height="190" empty_label="Categories" multiple="toggle" class="et2_fullWidth" rows="1" />
</row> </row>