From 3d8cf610d954928f3ca939cdfb76c5d58a6bb0a0 Mon Sep 17 00:00:00 2001
From: Sara Arjona <sara@moodle.com>
Date: Fri, 15 Mar 2019 14:39:34 +0100
Subject: [PATCH] MDL-65087 message: add aria-label to some buttons on
 bootstrapbase

The aria-label has been added to the settings and search buttons and
also to the starred image displayed when a conversation is favourited.
---
 ...awer_view_conversation_header_content_type_private.mustache | 3 ++-
 ...nversation_header_content_type_private_no_controls.mustache | 3 ++-
 ...rawer_view_conversation_header_content_type_public.mustache | 3 ++-
 .../core_message/message_drawer_view_overview_header.mustache  | 1 +
 .../core_message/message_drawer_view_search_header.mustache    | 1 +
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache
index 5b66b84ff1b..d69d8188900 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache
@@ -62,7 +62,8 @@
             <div class="w-100 text-truncate ml-2">
                 <div class="d-flex">
                     <strong class="m-0 text-truncate">{{name}}</strong>
-                    <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
+                    <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container"
+                    aria-label="{{#str}} favourites, core {{/str}}">
                         {{#pix}} i/star, core {{/pix}}
                     </span>
                     <span class="{{^ismuted}}hidden{{/ismuted}} ml-1 text-primary" data-region="muted-icon-container">
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private_no_controls.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private_no_controls.mustache
index 21fb692ac76..1445deb6c11 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private_no_controls.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private_no_controls.mustache
@@ -61,7 +61,8 @@
         <div class="w-100 text-truncate ml-2">
             <div class="d-flex">
                 <strong class="m-0 text-truncate">{{name}}</strong>
-                <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
+                <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container"
+                aria-label="{{#str}} favourites, core {{/str}}">
                     {{#pix}} i/star, core {{/pix}}
                 </span>
                 <span class="{{^ismuted}}hidden{{/ismuted}} ml-1 text-primary" data-region="muted-icon-container">
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
index 45181a601f8..794cfe160f9 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
@@ -60,7 +60,8 @@
                 <div class="w-100 text-truncate ml-2">
                     <div class="d-flex">
                         <strong class="m-0 text-truncate">{{name}}</strong>
-                        <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
+                        <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary"
+                        data-region="favourite-icon-container" aria-label="{{#str}} favourites, core {{/str}}">
                             {{#pix}} i/star, core {{/pix}}
                         </span>
                         <span class="{{^ismuted}}hidden{{/ismuted}} ml-1 text-primary" data-region="muted-icon-container">
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_overview_header.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_overview_header.mustache
index 834e9de20b7..34494307dcd 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_overview_header.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_overview_header.mustache
@@ -57,6 +57,7 @@
                 href="#"
                 data-route="view-settings"
                 data-route-param="{{loggedinuser.id}}"
+                aria-label="{{#str}} settings, core_message {{/str}}"
                 role="button"
             >
                 {{#pix}} t/edit, core {{/pix}}
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_search_header.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_search_header.mustache
index aa94c21ad40..a8a62c9bca0 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_search_header.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_search_header.mustache
@@ -62,6 +62,7 @@
                 class="btn m-0"
                 type="button"
                 data-action="search"
+                aria-label="{{#str}} search, core_search {{/str}}"
             >
                 <span data-region="search-icon-container">
                     {{#pix}} a/search, core {{/pix}}