From 749a8c02f5680aa5190033d64f822d9da99b8b77 Mon Sep 17 00:00:00 2001
From: Meirza <meirza.arson@moodle.com>
Date: Wed, 15 Feb 2023 17:29:18 +0700
Subject: [PATCH 1/3] MDL-76825 theme: ensure button role has an accessible
 name.

---
 lib/templates/help_icon.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/templates/help_icon.mustache b/lib/templates/help_icon.mustache
index a52440bbdde..5d2f7d08b36 100644
--- a/lib/templates/help_icon.mustache
+++ b/lib/templates/help_icon.mustache
@@ -20,6 +20,6 @@
 <a class="btn btn-link p-0" role="button"
     data-container="body" data-toggle="popover"
     data-placement="{{#ltr}}right{{/ltr}}{{^ltr}}left{{/ltr}}" data-content="{{text}} {{completedoclink}}"
-    data-html="true" tabindex="0" data-trigger="focus">
+    data-html="true" tabindex="0" data-trigger="focus" aria-label="{{#str}} help {{/str}}">
   {{#pix}}help, core, {{{alt}}}{{/pix}}
 </a>

From b12b738994a7313ef0f41553ba3e0ec5ddfe044d Mon Sep 17 00:00:00 2001
From: Meirza <meirza.arson@moodle.com>
Date: Wed, 15 Feb 2023 18:06:50 +0700
Subject: [PATCH 2/3] MDL-76825 tiny_media: Make IDs and labels unique.

---
 .../embed_media_modal_audio.mustache          | 134 +++++++++---------
 .../templates/embed_media_modal_link.mustache |   4 +-
 .../embed_media_modal_video.mustache          | 132 ++++++++---------
 3 files changed, 135 insertions(+), 135 deletions(-)

diff --git a/lib/editor/tiny/plugins/media/templates/embed_media_modal_audio.mustache b/lib/editor/tiny/plugins/media/templates/embed_media_modal_audio.mustache
index ae617548378..1b95c93ff29 100644
--- a/lib/editor/tiny/plugins/media/templates/embed_media_modal_audio.mustache
+++ b/lib/editor/tiny/plugins/media/templates/embed_media_modal_audio.mustache
@@ -27,11 +27,11 @@
 {{#audio.sources}}
     <div class="tiny_media_source tiny_media_media_source">
         <div class="mb-1">
-            <label for="url-input">
+            <label for="audio-audio-url-input">
                 {{#str}} audiosourcelabel, tiny_media {{/str}}
             </label>
             <div class="input-group input-append w-100">
-                <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{.}}"/>
+                <input id="audio-audio-url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{.}}"/>
                 <span class="input-group-append">
                     <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
                 </span>
@@ -55,11 +55,11 @@
 {{^audio}}
     <div class="tiny_media_source tiny_media_media_source">
         <div class="mb-1">
-            <label for="url-input">
+            <label for="audio-audio-url-input">
                 {{#str}} audiosourcelabel, tiny_media {{/str}}
             </label>
             <div class="input-group input-append w-100">
-                <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
+                <input id="audio-audio-url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
                 <span class="input-group-append">
                     <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
                 </span>
@@ -158,14 +158,14 @@
             </div>
             <div class="form-check">
                 <input type="checkbox" class="form-check-input tiny_media_mute"
-                       id="vadvancedsettings_media-mute-toggle {{# audio.muted }}checked{{/ audio.muted }}"/>
-                <label class="form-check-label" for="vadvancedsettings_media-mute-toggle">
+                       id="aadvancedsettings_media-mute-toggle" {{# audio.muted }}checked{{/ audio.muted }}/>
+                <label class="form-check-label" for="aadvancedsettings_media-mute-toggle">
                     {{#str}} mute, tiny_media {{/str}}
                 </label>
             </div>
             <div class="form-check">
                 <input type="checkbox" class="form-check-input tiny_media_loop"
-                       id="vadvancedsettings_media-loop-toggle" {{# audio.loop }}checked{{/ audio.loop }}/>
+                       id="aadvancedsettings_media-loop-toggle" {{# audio.loop }}checked{{/ audio.loop }}/>
                 <label class="form-check-label" for="aadvancedsettings_media-loop-toggle">
                     {{#str}} loop, tiny_media {{/str}}
                 </label>
@@ -243,11 +243,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="subtitle-audio-url-input">
                                     {{#str}} subtitlessourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
+                                    <input id="subtitle-audio-url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
                                     <span class="input-group-append">
                     <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
                 </span>
@@ -255,8 +255,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
+                            <label class="w-100" for="subtitle-audio-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="subtitle-audio-lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -270,8 +270,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
+                            <label class="w-100" for="subtitle-audio-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="subtitle-audio-track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default" {{# defaultTrack }}checked{{/ defaultTrack }}/>
@@ -293,11 +293,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="subtitle-audio-url-input">
                                     {{#str}} subtitlessourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
+                                    <input id="subtitle-audio-url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
                                     <span class="input-group-append">
                     <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
                 </span>
@@ -305,8 +305,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry">
+                            <label class="w-100" for="subtitle-audio-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="subtitle-audio-lang-input" class="custom-select tiny_media_track_lang_entry">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -320,8 +320,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text"/>
+                            <label class="w-100" for="subtitle-audio-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="subtitle-audio-track-input" class="form-control tiny_media_track_label_entry" type="text"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default"/>
@@ -351,11 +351,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="caption-audio-url-input">
                                     {{#str}} captionssourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
+                                    <input id="caption-audio-url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
                                     <span class="input-group-append">
                     <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
                 </span>
@@ -363,8 +363,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
+                            <label class="w-100" for="caption-audio-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="caption-audio-lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -378,8 +378,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
+                            <label class="w-100" for="caption-audio-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="caption-audio-track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default" {{# defaultTrack }}checked{{/ defaultTrack }}/>
@@ -401,11 +401,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="caption-audio-url-input">
                                     {{#str}} captionssourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
+                                    <input id="caption-audio-url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
                                     <span class="input-group-append">
                 <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
             </span>
@@ -413,8 +413,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry">
+                            <label class="w-100" for="caption-audio-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="caption-audio-lang-input" class="custom-select tiny_media_track_lang_entry">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -428,8 +428,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text"/>
+                            <label class="w-100" for="caption-audio-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="caption-audio-track-input" class="form-control tiny_media_track_label_entry" type="text"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default"/>
@@ -459,11 +459,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="description-audio-url-input">
                                     {{#str}} descriptionssourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
+                                    <input id="description-audio-url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
                                     <span class="input-group-append">
                     <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
                 </span>
@@ -471,8 +471,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
+                            <label class="w-100" for="description-audio-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="description-audio-lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -486,8 +486,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
+                            <label class="w-100" for="description-audio-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="description-audio-track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default" {{# defaultTrack }}checked{{/ defaultTrack }}/>
@@ -509,11 +509,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="description-audio-url-input">
                                     {{#str}} descriptionssourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
+                                    <input id="description-audio-url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
                                     <span class="input-group-append">
                 <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
             </span>
@@ -521,8 +521,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry">
+                            <label class="w-100" for="description-audio-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="description-audio-lang-input" class="custom-select tiny_media_track_lang_entry">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -536,8 +536,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text"/>
+                            <label class="w-100" for="description-audio-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="description-audio-track-input" class="form-control tiny_media_track_label_entry" type="text"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default"/>
@@ -567,11 +567,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="chapter-audio-url-input">
                                     {{#str}} chapterssourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
+                                    <input id="chapter-audio-url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
                                     <span class="input-group-append">
                     <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
                 </span>
@@ -579,8 +579,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
+                            <label class="w-100" for="chapter-audio-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="chapter-audio-lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -594,8 +594,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
+                            <label class="w-100" for="chapter-audio-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="chapter-audio-track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default" {{# defaultTrack }}checked{{/ defaultTrack }}/>
@@ -617,11 +617,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="chapter-audio-url-input">
                                     {{#str}} chapterssourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
+                                    <input id="chapter-audio-url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
                                     <span class="input-group-append">
                 <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
             </span>
@@ -629,8 +629,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry">
+                            <label class="w-100" for="chapter-audio-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="chapter-audio-lang-input" class="custom-select tiny_media_track_lang_entry">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -644,8 +644,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text"/>
+                            <label class="w-100" for="chapter-audio-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="chapter-audio-track-input" class="form-control tiny_media_track_label_entry" type="text"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default"/>
@@ -676,11 +676,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="metadata-audio-url-input">
                                     {{#str}} metadatasourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
+                                    <input id="metadata-audio-url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
                                     <span class="input-group-append">
                     <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
                 </span>
@@ -688,8 +688,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
+                            <label class="w-100" for="metadata-audio-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="metadata-audio-lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -703,8 +703,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
+                            <label class="w-100" for="metadata-audio-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="metadata-audio-track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default" {{# defaultTrack }}checked{{/ defaultTrack }}/>
@@ -726,11 +726,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="metadata-audio-url-input">
                                     {{#str}} metadatasourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
+                                    <input id="metadata-audio-url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
                                     <span class="input-group-append">
                 <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
             </span>
@@ -738,8 +738,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry">
+                            <label class="w-100" for="metadata-audio-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="metadata-audio-lang-input" class="custom-select tiny_media_track_lang_entry">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -753,8 +753,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text"/>
+                            <label class="w-100" for="metadata-audio-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="metadata-audio-track-input" class="form-control tiny_media_track_label_entry" type="text"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default"/>
diff --git a/lib/editor/tiny/plugins/media/templates/embed_media_modal_link.mustache b/lib/editor/tiny/plugins/media/templates/embed_media_modal_link.mustache
index 537e532791e..6f28995b1b8 100644
--- a/lib/editor/tiny/plugins/media/templates/embed_media_modal_link.mustache
+++ b/lib/editor/tiny/plugins/media/templates/embed_media_modal_link.mustache
@@ -26,11 +26,11 @@
 }}
 <div class="tiny_media_source {{id}}">
     <div class="mb-1">
-        <label for="url-input">
+        <label for="source-url-input">
             {{#str}} entersource, tiny_media {{/str}}
         </label>
         <div class="input-group input-append w-100">
-            <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
+            <input id="source-url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
             <span class="input-group-append">
                 <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
             </span>
diff --git a/lib/editor/tiny/plugins/media/templates/embed_media_modal_video.mustache b/lib/editor/tiny/plugins/media/templates/embed_media_modal_video.mustache
index c25b4b447cf..928e6e385b8 100644
--- a/lib/editor/tiny/plugins/media/templates/embed_media_modal_video.mustache
+++ b/lib/editor/tiny/plugins/media/templates/embed_media_modal_video.mustache
@@ -27,11 +27,11 @@
 {{#video.sources}}
     <div class="tiny_media_source tiny_media_media_source">
         <div class="mb-1">
-            <label for="url-input">
+            <label for="video-video-url-input">
                 {{#str}} videosourcelabel, tiny_media {{/str}}
             </label>
             <div class="input-group input-append w-100">
-                <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{.}}"/>
+                <input id="video-video-url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{.}}"/>
                 <span class="input-group-append">
                     <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
                 </span>
@@ -55,11 +55,11 @@
 {{^video}}
     <div class="tiny_media_source tiny_media_media_source">
         <div class="mb-1">
-            <label for="url-input">
+            <label for="video-video-url-input">
                 {{#str}} videosourcelabel, tiny_media {{/str}}
             </label>
             <div class="input-group input-append w-100">
-                <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
+                <input id="video-video-url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
                 <span class="input-group-append">
                 <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
             </span>
@@ -128,11 +128,11 @@
             <div class="clearfix"></div>
             <div class="tiny_media_source tiny_media_poster_source">
                 <div class="mb-1">
-                    <label for="url-input">
+                    <label for="display-video-url-input">
                         {{#str}} entersource, tiny_media {{/str}}
                     </label>
                     <div class="input-group input-append w-100">
-                        <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{video.poster}}"/>
+                        <input id="display-video-url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{video.poster}}"/>
                         <span class="input-group-append">
                 <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
             </span>
@@ -271,11 +271,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="subtitle-video-url-input">
                                     {{#str}} subtitlessourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
+                                    <input id="subtitle-video-url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
                                     <span class="input-group-append">
                     <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
                 </span>
@@ -283,8 +283,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
+                            <label class="w-100" for="subtitle-video-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="subtitle-video-lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -298,8 +298,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
+                            <label class="w-100" for="subtitle-video-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="subtitle-video-track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default" {{# defaultTrack }}checked{{/ defaultTrack }}/>
@@ -321,11 +321,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="subtitle-video-url-input">
                                     {{#str}} subtitlessourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
+                                    <input id="subtitle-video-url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
                                     <span class="input-group-append">
                 <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
             </span>
@@ -333,8 +333,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry">
+                            <label class="w-100" for="subtitle-video-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="subtitle-video-lang-input" class="custom-select tiny_media_track_lang_entry">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -348,8 +348,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text"/>
+                            <label class="w-100" for="subtitle-video-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="subtitle-video-track-input" class="form-control tiny_media_track_label_entry" type="text"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default"/>
@@ -379,11 +379,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="caption-video-url-input">
                                     {{#str}} captionssourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
+                                    <input id="caption-video-url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
                                     <span class="input-group-append">
                     <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
                 </span>
@@ -391,8 +391,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
+                            <label class="w-100" for="caption-video-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="caption-video-lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -406,8 +406,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
+                            <label class="w-100" for="caption-video-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="caption-video-track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default" {{# defaultTrack }}checked{{/ defaultTrack }}/>
@@ -429,11 +429,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="caption-video-url-input">
                                     {{#str}} captionssourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
+                                    <input id="caption-video-url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
                                     <span class="input-group-append">
                 <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
             </span>
@@ -441,8 +441,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry">
+                            <label class="w-100" for="caption-video-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="caption-video-lang-input" class="custom-select tiny_media_track_lang_entry">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -456,8 +456,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text"/>
+                            <label class="w-100" for="caption-video-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="caption-video-track-input" class="form-control tiny_media_track_label_entry" type="text"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default"/>
@@ -487,11 +487,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="description-video-url-input">
                                     {{#str}} descriptionssourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
+                                    <input id="description-video-url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
                                     <span class="input-group-append">
                     <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
                 </span>
@@ -499,8 +499,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
+                            <label class="w-100" for="description-video-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="description-video-ang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -514,8 +514,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
+                            <label class="w-100" for="description-video-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="description-video-track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default" {{# defaultTrack }}checked{{/ defaultTrack }}/>
@@ -537,11 +537,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="description-video-url-input">
                                     {{#str}} descriptionssourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
+                                    <input id="description-video-url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
                                     <span class="input-group-append">
                 <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
             </span>
@@ -549,8 +549,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry">
+                            <label class="w-100" for="description-video-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="description-video-lang-input" class="custom-select tiny_media_track_lang_entry">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -564,8 +564,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text"/>
+                            <label class="w-100" for="description-video-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="description-video-track-input" class="form-control tiny_media_track_label_entry" type="text"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default"/>
@@ -595,11 +595,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="chapter-video-url-input">
                                     {{#str}} chapterssourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
+                                    <input id="chapter-video-url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
                                     <span class="input-group-append">
                     <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
                 </span>
@@ -607,8 +607,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
+                            <label class="w-100" for="chapter-video-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="chapter-video-lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -622,8 +622,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
+                            <label class="w-100" for="chapter-video-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="chapter-video-track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default" {{# defaultTrack }}checked{{/ defaultTrack }}/>
@@ -645,11 +645,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="chapter-video-url-input">
                                     {{#str}} chapterssourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
+                                    <input id="chapter-video-url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
                                     <span class="input-group-append">
                 <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
             </span>
@@ -657,8 +657,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry">
+                            <label class="w-100" for="chapter-video-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="chapter-video-lang-input" class="custom-select tiny_media_track_lang_entry">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -672,8 +672,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text"/>
+                            <label class="w-100" for="chapter-video-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="chapter-video-track-input" class="form-control tiny_media_track_label_entry" type="text"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default"/>
@@ -704,11 +704,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="metadata-video-url-input">
                                     {{#str}} metadatasourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
+                                    <input id="metadata-video-url-input" class="form-control tiny_media_url_entry" type="url" size="32" value="{{src}}"/>
                                     <span class="input-group-append">
                     <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
                 </span>
@@ -716,8 +716,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
+                            <label class="w-100" for="metadata-video-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="metadata-video-lang-input" class="custom-select tiny_media_track_lang_entry" data-value="{{srclang}}">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -731,8 +731,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
+                            <label class="w-100" for="metadata-video-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="metadata-video-track-input" class="form-control tiny_media_track_label_entry" type="text" value="{{label}}"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default" {{# defaultTrack }}checked{{/ defaultTrack }}/>
@@ -754,11 +754,11 @@
                     <div class="mb-1 tiny_media_track">
                         <div class="tiny_media_source tiny_media_track_source">
                             <div class="mb-1">
-                                <label for="url-input">
+                                <label for="metadata-video-url-input">
                                     {{#str}} metadatasourcelabel, tiny_media {{/str}}
                                 </label>
                                 <div class="input-group input-append w-100">
-                                    <input id="url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
+                                    <input id="metadata-video-url-input" class="form-control tiny_media_url_entry" type="url" size="32"/>
                                     <span class="input-group-append">
                     <button class="btn btn-secondary openmediabrowser" type="button">{{#str}} browserepositories, tiny_media {{/str}}</button>
                 </span>
@@ -766,8 +766,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
-                            <select id="lang-input" class="custom-select tiny_media_track_lang_entry">
+                            <label class="w-100" for="metadata-video-lang-input">{{#str}} srclang, tiny_media {{/str}}</label>
+                            <select id="metadata-video-lang-input" class="custom-select tiny_media_track_lang_entry">
                                 <optgroup label="{{#str}} languagesinstalled, tiny_media {{/str}}">
                                     {{#langsinstalled}}
                                         <option value="{{code}}" {{#default}}selected="selected"{{/default}}>{{lang}}</option>
@@ -781,8 +781,8 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="w-100" for="track-input">{{#str}} label, tiny_media {{/str}}</label>
-                            <input id="track-input" class="form-control tiny_media_track_label_entry" type="text"/>
+                            <label class="w-100" for="metadata-video-track-input">{{#str}} label, tiny_media {{/str}}</label>
+                            <input id="metadata-video-track-input" class="form-control tiny_media_track_label_entry" type="text"/>
                         </div>
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input tiny_media_track_default"/>

From bd35a360ca86fb9927a4435c23cfc0f5d8e90ee0 Mon Sep 17 00:00:00 2001
From: Meirza <meirza.arson@moodle.com>
Date: Thu, 16 Feb 2023 09:46:59 +0700
Subject: [PATCH 3/3] MDL-76825 tiny: restyling link on focus for sufficient
 colour contrast.

Text elements must have sufficient colour contrast against the background,
restyling the link element when it is focused is to ensure colour contrast of at least 4.5:1
---
 lib/editor/tiny/editor_styles.css | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/editor/tiny/editor_styles.css b/lib/editor/tiny/editor_styles.css
index 14325e61ea7..84bc14158b7 100644
--- a/lib/editor/tiny/editor_styles.css
+++ b/lib/editor/tiny/editor_styles.css
@@ -2,3 +2,12 @@ body.mce-content-body {
     margin: revert;
     text-align: initial;
 }
+
+/** Web Accessibility - color contrast. */
+body.mce-content-body a[data-mce-selected="inline-boundary"] {
+    background-color: unset;
+}
+body.mce-content-body a {
+    color: #0f6cbf;
+}
+/** */
\ No newline at end of file