From e2d400a136677c0f79de1f336971d22c706b965d Mon Sep 17 00:00:00 2001 From: Sara Arjona Date: Mon, 4 Mar 2019 14:37:35 +0100 Subject: [PATCH] MDL-64985 message: add better aria labels to the actions menu Add better aria labels to the action menus in messaging, renaming some labels and declaring it as a menu. --- lang/en/message.php | 7 ++-- ...ation_header_content_type_private.mustache | 38 +++++++++++-------- ...sation_header_content_type_public.mustache | 21 ++++++---- ...ation_header_content_type_private.mustache | 23 ++++++----- ...sation_header_content_type_public.mustache | 13 ++++--- 5 files changed, 60 insertions(+), 42 deletions(-) diff --git a/lang/en/message.php b/lang/en/message.php index 86370803198b3..c548459f3abd5 100644 --- a/lang/en/message.php +++ b/lang/en/message.php @@ -27,7 +27,7 @@ $string['addcontactconfirm'] = 'Are you sure you want to add {$a} to your contacts?'; $string['addtoyourcontacts'] = 'Add to contacts'; $string['addtoyourcontactsandmessage'] = 'Add to contacts and message'; -$string['addtofavourites'] = 'Star'; +$string['addtofavourites'] = 'Star conversation'; $string['ago'] = '{$a} ago'; $string['allusers'] = 'All messages from all users'; $string['backto'] = 'Back to {$a}'; @@ -48,6 +48,7 @@ $string['contactrequests'] = 'Contact requests'; $string['contactrequestsent'] = 'Contact request sent'; $string['contacts'] = 'Contacts'; +$string['conversationactions'] = 'Conversation actions menu'; $string['decline'] = 'Decline'; $string['defaultmessageoutputs'] = 'Default message outputs'; $string['defaults'] = 'Defaults'; @@ -84,7 +85,7 @@ $string['hidemessagewindow'] = 'Hide message window'; $string['hidenotificationwindow'] = 'Hide notification window'; $string['individualconversations'] = 'Private'; -$string['info'] = 'Info'; +$string['info'] = 'User info'; $string['isnotinyourcontacts'] = '{$a} is not in your contacts'; $string['loadmore'] = 'Load more'; $string['loggedin'] = 'Online'; @@ -203,7 +204,7 @@ $string['removecontactconfirm'] = 'Are you sure you want to remove {$a} from your contacts?'; $string['removecoursefilter'] = 'Remove filter for course {$a}'; $string['removefromyourcontacts'] = 'Remove from contacts'; -$string['removefromfavourites'] = 'Unstar'; +$string['removefromfavourites'] = 'Unstar conversation'; $string['requirecontacttomessage'] = 'You need to request {$a} to add you as a contact to be able to message them.'; $string['requiresconfiguration'] = 'Requires configuration'; $string['searchforuser'] = 'Search for a user'; diff --git a/message/templates/message_drawer_view_conversation_header_content_type_private.mustache b/message/templates/message_drawer_view_conversation_header_content_type_private.mustache index 2988f3c7f1205..ccdc5a4dd9309 100644 --- a/message/templates/message_drawer_view_conversation_header_content_type_private.mustache +++ b/message/templates/message_drawer_view_conversation_header_content_type_private.mustache @@ -72,33 +72,39 @@
- -
- +
diff --git a/message/templates/message_drawer_view_conversation_header_content_type_public.mustache b/message/templates/message_drawer_view_conversation_header_content_type_public.mustache index e63098eae405e..75da2d312af26 100644 --- a/message/templates/message_drawer_view_conversation_header_content_type_public.mustache +++ b/message/templates/message_drawer_view_conversation_header_content_type_public.mustache @@ -66,18 +66,23 @@
- -
- +
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 8902838034c70..6909dec29a100 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 @@ -77,47 +77,50 @@
- -
- -