From 07004d12780ebf25ddb0f714f5d686331dc0cd71 Mon Sep 17 00:00:00 2001 From: Jonathan Champ Date: Mon, 16 Feb 2026 17:48:16 +0100 Subject: [PATCH 1/2] ci: use recommended mobileapp template folder --- .github/workflows/ci.yml | 1 - classes/output/mobile.php | 2 +- .../view_page_ionic3.mustache} | 2 +- .../view_page_latest.mustache} | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) rename templates/{mobile_view_page_ionic3.mustache => mobileapp/view_page_ionic3.mustache} (98%) rename templates/{mobile_view_page_latest.mustache => mobileapp/view_page_latest.mustache} (99%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15924e41..89fc2553 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,7 +91,6 @@ jobs: env: DB: ${{ matrix.database }} MOODLE_BRANCH: ${{ matrix.moodle-branch }} - MUSTACHE_IGNORE_NAMES: 'mobile_view_page_latest.mustache,mobile_view_page_ionic3.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 4dbf2e7d..9b6aceec 100644 --- a/classes/output/mobile.php +++ b/classes/output/mobile.php @@ -85,7 +85,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/mobileapp/view_page_$versionname", $data), ], ], 'javascript' => "this.loadMeeting = function(result) { window.open(result.joinurl, '_system'); };", diff --git a/templates/mobile_view_page_ionic3.mustache b/templates/mobileapp/view_page_ionic3.mustache similarity index 98% rename from templates/mobile_view_page_ionic3.mustache rename to templates/mobileapp/view_page_ionic3.mustache index 34fdf9cf..48373e7e 100644 --- a/templates/mobile_view_page_ionic3.mustache +++ b/templates/mobileapp/view_page_ionic3.mustache @@ -15,7 +15,7 @@ along with Moodle. If not, see . }} {{! - @template mod_zoom/mobile_view_page_ionic3 + @template mod_zoom/mobileapp/view_page_ionic3 Page to view a zoom meeting diff --git a/templates/mobile_view_page_latest.mustache b/templates/mobileapp/view_page_latest.mustache similarity index 99% rename from templates/mobile_view_page_latest.mustache rename to templates/mobileapp/view_page_latest.mustache index e513a14d..138b4f7a 100644 --- a/templates/mobile_view_page_latest.mustache +++ b/templates/mobileapp/view_page_latest.mustache @@ -15,7 +15,7 @@ along with Moodle. If not, see . }} {{! - @template mod_zoom/mobile_view_page_latest + @template mod_zoom/mobileapp/view_page_latest Page to view a zoom meeting From 4329c487909769882d79759a57ac26eff3f76931 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Wed, 17 Jul 2024 15:15:11 +0200 Subject: [PATCH 2/2] Mobile app: Remove ionic3 template --- classes/output/mobile.php | 3 +- ...age_latest.mustache => view_page.mustache} | 2 +- templates/mobileapp/view_page_ionic3.mustache | 118 ------------------ 3 files changed, 2 insertions(+), 121 deletions(-) rename templates/mobileapp/{view_page_latest.mustache => view_page.mustache} (99%) delete mode 100644 templates/mobileapp/view_page_ionic3.mustache diff --git a/classes/output/mobile.php b/classes/output/mobile.php index 9b6aceec..c6c1e819 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. @@ -85,7 +84,7 @@ public static function mobile_course_view($args) { 'templates' => [ [ 'id' => 'main', - 'html' => $OUTPUT->render_from_template("mod_zoom/mobileapp/view_page_$versionname", $data), + 'html' => $OUTPUT->render_from_template('mod_zoom/mobileapp/view_page', $data), ], ], 'javascript' => "this.loadMeeting = function(result) { window.open(result.joinurl, '_system'); };", diff --git a/templates/mobileapp/view_page_latest.mustache b/templates/mobileapp/view_page.mustache similarity index 99% rename from templates/mobileapp/view_page_latest.mustache rename to templates/mobileapp/view_page.mustache index 138b4f7a..bc1915a0 100644 --- a/templates/mobileapp/view_page_latest.mustache +++ b/templates/mobileapp/view_page.mustache @@ -15,7 +15,7 @@ along with Moodle. If not, see . }} {{! - @template mod_zoom/mobileapp/view_page_latest + @template mod_zoom/mobileapp/view_page Page to view a zoom meeting diff --git a/templates/mobileapp/view_page_ionic3.mustache b/templates/mobileapp/view_page_ionic3.mustache deleted file mode 100644 index 48373e7e..00000000 --- a/templates/mobileapp/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/mobileapp/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%> - -