From 9cf2fb6436bb30875386a4e878340f03cbd90c90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 23 Jan 2020 10:04:04 +0100
Subject: [PATCH] MOBILE-3301 ux: Add aria-label to context more buttons

---
 scripts/langindex.json                                        | 1 +
 .../mod/forum/components/index/addon-mod-forum-index.html     | 2 +-
 src/addon/mod/forum/components/post/addon-mod-forum-post.html | 4 ++--
 src/app/app.scss                                              | 1 +
 src/assets/lang/en.json                                       | 1 +
 src/components/context-menu/context-menu.ts                   | 2 +-
 .../course-progress/core-courses-course-progress.html         | 2 +-
 src/lang/en.json                                              | 1 +
 8 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 944b7ea67..e5da36167 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1475,6 +1475,7 @@
   "core.digitalminor_desc": "moodle",
   "core.discard": "local_moodlemobileapp",
   "core.dismiss": "local_moodlemobileapp",
+  "core.displayoptions": "atto_media",
   "core.done": "survey",
   "core.download": "moodle",
   "core.downloaded": "local_moodlemobileapp",
diff --git a/src/addon/mod/forum/components/index/addon-mod-forum-index.html b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
index a2444345a..e941c514a 100644
--- a/src/addon/mod/forum/components/index/addon-mod-forum-index.html
+++ b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
@@ -67,7 +67,7 @@
                                 <core-icon name="fa-star" class="addon-forum-star" *ngIf="!discussion.pinned && discussion.starred"></core-icon>
                                 <core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
                             </h2>
-                            <button ion-button icon-only clear color="dark" (click)="showOptionsMenu($event, discussion)" *ngIf="canPin || discussion.canlock || discussion.canfavourite">
+                            <button ion-button icon-only clear color="dark" (click)="showOptionsMenu($event, discussion)" *ngIf="canPin || discussion.canlock || discussion.canfavourite" [attr.aria-label]="('core.displayoptions' | translate)">
                                 <core-icon name="more"></core-icon>
                             </button>
                         </div>
diff --git a/src/addon/mod/forum/components/post/addon-mod-forum-post.html b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
index 4aec682b6..02a3bbe42 100644
--- a/src/addon/mod/forum/components/post/addon-mod-forum-post.html
+++ b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
@@ -10,7 +10,7 @@
                 <ion-note float-end padding-left text-end *ngIf="trackPosts && !post.postread" [attr.aria-label]="'addon.mod_forum.unread' | translate">
                     <core-icon name="fa-circle" color="primary"></core-icon>
                 </ion-note>
-                <button ion-button icon-only clear color="dark" (click)="showOptionsMenu($event)" *ngIf="optionsMenuEnabled">
+                <button ion-button icon-only clear color="dark" (click)="showOptionsMenu($event)" *ngIf="optionsMenuEnabled" [attr.aria-label]="('core.displayoptions' | translate)">
                     <core-icon name="more"></core-icon>
                 </button>
             </div>
@@ -26,7 +26,7 @@
                     <ion-note float-end padding-left text-end *ngIf="trackPosts && !post.postread" [attr.aria-label]="'addon.mod_forum.unread' | translate">
                         <core-icon name="fa-circle" color="primary"></core-icon>
                     </ion-note>
-                    <button ion-button icon-only clear color="dark" (click)="showOptionsMenu($event)" *ngIf="optionsMenuEnabled">
+                    <button ion-button icon-only clear color="dark" (click)="showOptionsMenu($event)" *ngIf="optionsMenuEnabled" [attr.aria-label]="('core.displayoptions' | translate)">
                         <core-icon name="more"></core-icon>
                     </button>
                 </ng-container>
diff --git a/src/app/app.scss b/src/app/app.scss
index 25ddf5749..c972e59f9 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -679,6 +679,7 @@ ion-app.app-root {
 
   .alert-message {
       overflow-y: auto;
+      user-select: text;
   }
   ion-alert.core-nohead {
 
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index c7614adfe..ceb6d1582 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1475,6 +1475,7 @@
     "core.digitalminor_desc": "Please ask your parent/guardian to contact:",
     "core.discard": "Discard",
     "core.dismiss": "Dismiss",
+    "core.displayoptions": "Display options",
     "core.done": "Done",
     "core.download": "Download",
     "core.downloaded": "Downloaded",
diff --git a/src/components/context-menu/context-menu.ts b/src/components/context-menu/context-menu.ts
index 49f7a1e43..7dd28b31a 100644
--- a/src/components/context-menu/context-menu.ts
+++ b/src/components/context-menu/context-menu.ts
@@ -70,7 +70,7 @@ export class CoreContextMenuComponent implements OnInit, OnDestroy {
      */
     ngOnInit(): void {
         this.icon = this.icon || 'more';
-        this.ariaLabel = this.ariaLabel || this.title || this.translate.instant('core.info');
+        this.ariaLabel = this.ariaLabel || this.title || this.translate.instant('core.displayoptions');
     }
 
     /**
diff --git a/src/core/courses/components/course-progress/core-courses-course-progress.html b/src/core/courses/components/course-progress/core-courses-course-progress.html
index 646d9edcb..6818d7be4 100644
--- a/src/core/courses/components/course-progress/core-courses-course-progress.html
+++ b/src/core/courses/components/course-progress/core-courses-course-progress.html
@@ -33,7 +33,7 @@
              <ion-icon *ngIf="downloadCourseEnabled && prefetchCourseData.downloadSucceeded && !showSpinner" class="core-icon-downloaded" name="cloud-done" color="success" [attr.aria-label]="'core.downloaded' | translate" role="status"></ion-icon>
 
             <!-- Options menu. -->
-            <button ion-button icon-only clear color="dark" (click)="showCourseOptionsMenu($event)" *ngIf="!showSpinner">
+            <button ion-button icon-only clear color="dark" (click)="showCourseOptionsMenu($event)" *ngIf="!showSpinner" [attr.aria-label]="('core.displayoptions' | translate)">
                 <core-icon name="more"></core-icon>
             </button>
         </div>
diff --git a/src/lang/en.json b/src/lang/en.json
index 34a7890d1..c88ac9e16 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -73,6 +73,7 @@
     "digitalminor_desc": "Please ask your parent/guardian to contact:",
     "discard": "Discard",
     "dismiss": "Dismiss",
+    "displayoptions": "Display options",
     "done": "Done",
     "download": "Download",
     "downloaded": "Downloaded",