diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c1b342e5..99656c58 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,7 +93,7 @@ jobs: env: DB: ${{ matrix.database }} MOODLE_BRANCH: ${{ matrix.moodle-branch }} - MUSTACHE_IGNORE_NAMES: 'mobile_view_page_latest.mustache,mobile_view_page_ionic3.mustache' + MUSTACHE_IGNORE_NAMES: 'mobile_view_page_latest.mustache' # Uncomment this to run Behat tests using the Moodle App. # MOODLE_APP: 'true' diff --git a/classes/output/mobile.php b/classes/output/mobile.php index 4a2cd161..8d18520b 100644 --- a/classes/output/mobile.php +++ b/classes/output/mobile.php @@ -42,7 +42,6 @@ public static function mobile_course_view($args) { global $OUTPUT, $DB; $args = (object) $args; - $versionname = $args->appversioncode >= 3950 ? 'latest' : 'ionic3'; $cm = get_coursemodule_from_id('zoom', $args->cmid); // Capabilities check. @@ -84,7 +83,7 @@ public static function mobile_course_view($args) { 'templates' => [ [ 'id' => 'main', - 'html' => $OUTPUT->render_from_template("mod_zoom/mobile_view_page_$versionname", $data), + 'html' => $OUTPUT->render_from_template('mod_zoom/mobile_view_page_latest', $data), ], ], 'javascript' => "this.loadMeeting = function(result) { window.open(result.joinurl, '_system'); };", diff --git a/templates/mobile_view_page_ionic3.mustache b/templates/mobile_view_page_ionic3.mustache deleted file mode 100644 index 34fdf9cf..00000000 --- a/templates/mobile_view_page_ionic3.mustache +++ /dev/null @@ -1,118 +0,0 @@ -{{! - This file is part of Moodle - http://moodle.org/ - - Moodle is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Moodle is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Moodle. If not, see . -}} -{{! - @template mod_zoom/mobile_view_page_ionic3 - - Page to view a zoom meeting - - Classes required for JS: - * none - - Data attributes required for JS: - * none - - Example context (json): - { - "zoom": { - "intro": "Introduction String", - "password": "9836451", - "recurring": 1, - "webinar": 1, - "option_host_video": 1, - "option_jbh": 1, - "option_participants_video": 1 - }, - "available": true, - "status": "Finished", - "start_time": "Tuesday, June 29, 2021, 1:30 PM", - "duration": "1 hour", - "option_audio": "Computer audio and Telephone", - "cmid": 3, - "courseid": 3 - } -}} -{{=<% %>=}} -
- - - - <%#available%> - - - - <%/available%> - <%^available%> - -

{{ 'plugin.mod_zoom.unavailable' | translate }}

-
- <%/available%> - - <%#zoom.recurring%> - -

{{ 'plugin.mod_zoom.recurringmeetinglong' | translate }}

-
- <%/zoom.recurring%> - <%^zoom.recurring%> - -

{{ 'plugin.mod_zoom.meeting_time' | translate }}

-

<% start_time %>

-
- -

{{ 'plugin.mod_zoom.duration' | translate }}

-

<% duration %>

-
- <%/zoom.recurring%> - - -

{{ 'plugin.mod_zoom.passwordprotected' | translate }}

- <%#zoom.password%>

{{ 'core.yes' | translate }}

<%/zoom.password%> - <%^zoom.password%>

{{ 'core.no' | translate }}

<%/zoom.password%> -
- - <%^zoom.webinar%> - -

{{ 'plugin.mod_zoom.joinbeforehost' | translate }}

- <%#zoom.option_jbh%>

{{ 'core.yes' | translate }}

<%/zoom.option_jbh%> - <%^zoom.option_jbh%>

{{ 'core.no' | translate }}

<%/zoom.option_jbh%> -
- -

{{ 'plugin.mod_zoom.starthostjoins' | translate }}

- <%#zoom.option_host_video%>

{{ 'core.yes' | translate }}

<%/zoom.option_host_video%> - <%^zoom.option_host_video%>

{{ 'core.no' | translate }}

<%/zoom.option_host_video%> -
- -

{{ 'plugin.mod_zoom.startpartjoins' | translate }}

- <%#zoom.option_participants_video%>

{{ 'core.yes' | translate }}

<%/zoom.option_participants_video%> - <%^zoom.option_participants_video%>

{{ 'core.no' | translate }}

<%/zoom.option_participants_video%> -
- <%/zoom.webinar%> - - -

{{ 'plugin.mod_zoom.option_audio' | translate }}

-

<% option_audio %>

-
- - <%^zoom.recurring%> - -

{{ 'plugin.mod_zoom.status' | translate }}

-

<% status %>

-
- <%/zoom.recurring%> -
-