From 8896d073e22a1ff049d89043ee65970b82189b5b Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Fri, 13 Mar 2020 17:02:52 +0800
Subject: [PATCH] MDL-67663 mod_forum: Designate forum grading landmark regions

Adding the following landmark regions for easier keyboard navigation:
* Forum grading navigation
* User's forum posts
* Forum grading panel
---
 mod/forum/lang/en/forum.php                                    | 3 +++
 mod/forum/templates/local/grades/local/grader/content.mustache | 2 +-
 mod/forum/templates/local/grades/local/grader/grading.mustache | 2 +-
 .../templates/local/grades/local/grader/navigation.mustache    | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php
index baa4e462888..b6114d70712 100644
--- a/mod/forum/lang/en/forum.php
+++ b/mod/forum/lang/en/forum.php
@@ -299,6 +299,8 @@ $string['forum:exportdiscussion'] = 'Export whole discussion';
 $string['forum:exportforum'] = 'Export forum';
 $string['forum:exportownpost'] = 'Export own post';
 $string['forum:exportpost'] = 'Export post';
+$string['forumgradingnavigation'] = 'Forum grading navigation';
+$string['forumgradingpanel'] = 'Forum grading panel';
 $string['forumintro'] = 'Description';
 $string['forum:managesubscriptions'] = 'Manage subscribers';
 $string['forum:movediscussions'] = 'Move discussions';
@@ -729,6 +731,7 @@ $string['unsubscribeshort'] = 'Unsubscribe';
 $string['useexperimentalui'] = 'Use experimental nested discussion view';
 $string['usermarksread'] = 'Manual message read marking';
 $string['usernavigation'] = 'User navigation';
+$string['usersforumposts'] = 'User\'s forum posts';
 $string['unpindiscussion'] = 'Unpin this discussion';
 $string['viewalldiscussions'] = 'View all discussions';
 $string['viewparentpost'] = 'View parent post';
diff --git a/mod/forum/templates/local/grades/local/grader/content.mustache b/mod/forum/templates/local/grades/local/grader/content.mustache
index 665399eadff..944fbe9ce2c 100644
--- a/mod/forum/templates/local/grades/local/grader/content.mustache
+++ b/mod/forum/templates/local/grades/local/grader/content.mustache
@@ -30,7 +30,7 @@
     {
     }
 }}
-<div class="grader-module-content w-100 h-100" data-region="module_content_container">
+<div class="grader-module-content w-100 h-100" data-region="module_content_container" role="region" aria-label="{{#str}} usersforumposts, mod_forum {{/str}}">
     <div data-region="module_content" class="grader-module-content-display">
         {{> mod_forum/local/grades/local/grader/module_content_placeholder }}
     </div>
diff --git a/mod/forum/templates/local/grades/local/grader/grading.mustache b/mod/forum/templates/local/grades/local/grader/grading.mustache
index 0e6030f665d..bf6831b1240 100644
--- a/mod/forum/templates/local/grades/local/grader/grading.mustache
+++ b/mod/forum/templates/local/grades/local/grader/grading.mustache
@@ -36,7 +36,7 @@
     {{$drawerid}}grading-drawer-{{uniqid}}{{/drawerid}}
     {{$drawerclasses}}grader-grading-panel flex-shrink-0{{/drawerclasses}}
     {{$drawercontent}}
-        <div class="h-100 w-100 bg-white d-flex flex-column">
+        <div class="h-100 w-100 bg-white d-flex flex-column" role="region" aria-label="{{#str}} forumgradingpanel, mod_forum {{/str}}">
             <div class="flex-shrink-0 d-flex flex-column">
                 <div class="header-container bg-light">
                     <div class="info-container d-flex align-items-center">
diff --git a/mod/forum/templates/local/grades/local/grader/navigation.mustache b/mod/forum/templates/local/grades/local/grader/navigation.mustache
index 7c2ccfb3699..44bf9428a11 100644
--- a/mod/forum/templates/local/grades/local/grader/navigation.mustache
+++ b/mod/forum/templates/local/grades/local/grader/navigation.mustache
@@ -34,7 +34,7 @@
         "moduleName": "Chef the Forum"
     }
 }}
-<nav id="nav-container-{{uniqid}}" class="grader-grading_navigation navbar">
+<nav id="nav-container-{{uniqid}}" class="grader-grading_navigation navbar" aria-label="{{#str}} forumgradingnavigation, mod_forum {{/str}}">
     <div class="d-none d-sm-flex align-items-center">
         <a href="{{{courseUrl}}}" class="btn btn-link px-2 colour-inherit">
             <h5 class="d-inline px-0 mb-0">{{courseName}}</h5>