From 0d285e9334109cdb0d8af098a5d2ccb2fd980e1c Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 18 Dec 2019 13:40:59 +0800
Subject: [PATCH] MDL-67544 mod_forum: Add missing menuitem roles

---
 ...m_discussion_nested_v2_first_post.mustache |  2 +-
 .../templates/forum_discussion_post.mustache  | 20 ++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/mod/forum/templates/forum_discussion_nested_v2_first_post.mustache b/mod/forum/templates/forum_discussion_nested_v2_first_post.mustache
index 66d9855ae7e..6d0a27fa7d5 100644
--- a/mod/forum/templates/forum_discussion_nested_v2_first_post.mustache
+++ b/mod/forum/templates/forum_discussion_nested_v2_first_post.mustache
@@ -151,7 +151,7 @@
                                             {{#pix}} i/moremenu {{/pix}}
                                         </button>
                                         <!-- inline style to fix RTL placement bug -->
-                                        <div class="dropdown-menu dropdown-menu-right rounded-lg shadow border-0" aria-labelledby="post-actions-menu-{{uniqid}}" style="right: auto">
+                                        <div class="dropdown-menu dropdown-menu-right rounded-lg shadow border-0" aria-labelledby="post-actions-menu-{{uniqid}}" style="right: auto" role="menubar">
                                             {{#capabilities}}
                                                 {{#view}}
                                                     <a
diff --git a/mod/forum/templates/forum_discussion_post.mustache b/mod/forum/templates/forum_discussion_post.mustache
index d842836c139..91cdbfde20d 100644
--- a/mod/forum/templates/forum_discussion_post.mustache
+++ b/mod/forum/templates/forum_discussion_post.mustache
@@ -200,6 +200,7 @@
                                                     class="btn btn-link"
                                                     title="{{#str}} permanentlinktopost, mod_forum {{/str}}"
                                                     aria-label="{{#str}} permanentlinktopost, mod_forum {{/str}}"
+                                                    role="menuitem"
                                                 >
                                                     {{#str}} permalink, mod_forum {{/str}}
                                                 </a>
@@ -210,6 +211,7 @@
                                                         data-region="post-action"
                                                         href="{{{urls.markasread}}}"
                                                         class="btn btn-link"
+                                                        role="menuitem"
                                                     >
                                                         {{#str}} markread, mod_forum {{/str}}
                                                     </a>
@@ -219,6 +221,7 @@
                                                         data-region="post-action"
                                                         href="{{{urls.markasunread}}}"
                                                         class="btn btn-link"
+                                                        role="menuitem"
                                                     >
                                                         {{#str}} markunread, mod_forum {{/str}}
                                                     </a>
@@ -231,6 +234,7 @@
                                                     class="btn btn-link"
                                                     title="{{#str}} permanentlinktoparentpost, mod_forum {{/str}}"
                                                     aria-label="{{#str}} permanentlinktoparentpost, mod_forum {{/str}}"
+                                                    role="menuitem"
                                                 >
                                                     {{#str}} parent, mod_forum {{/str}}
                                                 </a>
@@ -240,6 +244,7 @@
                                                     data-region="post-action"
                                                     href="{{{urls.edit}}}"
                                                     class="btn btn-link"
+                                                    role="menuitem"
                                                 >
                                                     {{#str}} edit, mod_forum {{/str}}
                                                 </a>
@@ -249,6 +254,7 @@
                                                     data-region="post-action"
                                                     href="{{{urls.split}}}"
                                                     class="btn btn-link"
+                                                    role="menuitem"
                                                 >
                                                     {{#str}} prune, mod_forum {{/str}}
                                                 </a>
@@ -258,6 +264,7 @@
                                                     data-region="post-action"
                                                     href="{{{urls.delete}}}"
                                                     class="btn btn-link"
+                                                    role="menuitem"
                                                 >
                                                     {{#str}} delete, mod_forum {{/str}}
                                                 </a>
@@ -272,6 +279,7 @@
                                                         data-action="collapsible-link"
                                                         data-can-reply-privately="{{canreplyprivately}}"
                                                         title="{{#str}} reply, mod_forum {{/str}}"
+                                                        role="menuitem"
                                                     >
                                                         {{#str}} reply, mod_forum {{/str}}
                                                     </a>
@@ -281,11 +289,12 @@
                                                 {{#selfenrol}}
                                                     {{$replyoutput}}
                                                         <a
-                                                                href="{{{urls.reply}}}"
-                                                                class="btn btn-link"
-                                                                data-post-id="{{id}}"
-                                                                data-can-reply-privately="{{canreplyprivately}}"
-                                                                title="{{#str}} reply, mod_forum {{/str}}"
+                                                            href="{{{urls.reply}}}"
+                                                            class="btn btn-link"
+                                                            data-post-id="{{id}}"
+                                                            data-can-reply-privately="{{canreplyprivately}}"
+                                                            title="{{#str}} reply, mod_forum {{/str}}"
+                                                            role="menuitem"
                                                         >
                                                             {{#str}} reply, mod_forum {{/str}}
                                                         </a>
@@ -297,6 +306,7 @@
                                                     data-region="post-action"
                                                     href="{{{urls.export}}}"
                                                     class="btn btn-link"
+                                                    role="menuitem"
                                                 >
                                                     {{#str}} addtoportfolio, core_portfolio {{/str}}
                                                 </a>