diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php index e207b8192a..b39750f21a 100644 --- a/calendar/inc/class.calendar_uiforms.inc.php +++ b/calendar/inc/class.calendar_uiforms.inc.php @@ -1962,7 +1962,13 @@ class calendar_uiforms extends calendar_ui if (!empty($preserved['lock_token'])) $content['lock_token'] = $preserved['lock_token']; //Disable videoconference if the module is not enabled - $etpl->disableElement('videoconference', calendar_hooks::isVideoconferenceDisabled()); + $etpl->disableElement('videoconference', $video_disabled=calendar_hooks::isVideoconferenceDisabled()); + + // disable mobile Join Videoconference button, if not available or enabled + if ($video_disabled || empty($content['id']) || empty($content['##videoconference'])) + { + $readonlys['button[videoconference]'] = true; + } $content['future_exceptions'] = !empty($content['id']) && !empty($content['recur_type']) && $this->bo->search(['start' => Api\DateTime::to('now', 'ts')], 'cal_reference='.(int)$content['id']); diff --git a/calendar/inc/class.calendar_uilist.inc.php b/calendar/inc/class.calendar_uilist.inc.php index 4ab90c4cf5..b883723f0b 100644 --- a/calendar/inc/class.calendar_uilist.inc.php +++ b/calendar/inc/class.calendar_uilist.inc.php @@ -999,7 +999,7 @@ class calendar_uilist extends calendar_ui { Api\Translation::add_app('status'); $actions['videoconference'] = [ - 'icon' => 'status/videoconference', + 'icon' => 'camera-video', 'caption' => 'Video Conference', 'group' => $group, 'allowOnMultiple' => false, @@ -1008,14 +1008,14 @@ class calendar_uilist extends calendar_ui 'children' => [ 'join' => [ 'caption' => 'Join', - 'icon' => 'status/videoconference_join', + 'icon' => 'camera-video', 'onExecute' => 'javaScript:app.calendar.videoConferenceAction', 'enabled' => !calendar_hooks::isVideoconferenceDisabled(), 'allowOnMultiple' => false, ], 'recordings' => [ 'caption' => 'Recordings', - 'icon' => 'status/videoconference_recordings', + 'icon' => 'record-btn', 'onExecute' => 'javaScript:app.calendar.videoConferenceAction', 'enabled' => !calendar_hooks::isVideoconferenceDisabled() || calendar_hooks::isVCRecordingSupported(), diff --git a/calendar/js/app.ts b/calendar/js/app.ts index 612a755d73..8f78811a15 100644 --- a/calendar/js/app.ts +++ b/calendar/js/app.ts @@ -4386,7 +4386,7 @@ export class CalendarApp extends EgwApp if (_value) { if (_value.err) egw.message(_value.err, 'error'); - if(_value.url) egw.top.app.status.openCall(_value.url); + if(_value.url) egw.callFunc('app.status.openCall', _value.url); } }).sendRequest(); } diff --git a/calendar/templates/mobile/edit.xet b/calendar/templates/mobile/edit.xet index ae0c2cf300..7ead94e546 100644 --- a/calendar/templates/mobile/edit.xet +++ b/calendar/templates/mobile/edit.xet @@ -195,6 +195,8 @@ + diff --git a/calendar/templates/mobile/view.xet b/calendar/templates/mobile/view.xet index daa706e038..b828f29590 100644 --- a/calendar/templates/mobile/view.xet +++ b/calendar/templates/mobile/view.xet @@ -4,9 +4,8 @@ Egroupware @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License @package @subpackage -@link http://www.egroupware.org +@link https://www.egroupware.org @author Nathan Gray -@version $Id$ --> @@ -21,7 +20,7 @@ Egroupware