diff --git a/grade/grading/form/guide/templates/grades/grader/gradingpanel.mustache b/grade/grading/form/guide/templates/grades/grader/gradingpanel.mustache
index 7d816e66af1..8b5fc972353 100644
--- a/grade/grading/form/guide/templates/grades/grader/gradingpanel.mustache
+++ b/grade/grading/form/guide/templates/grades/grader/gradingpanel.mustache
@@ -61,19 +61,35 @@
 <form id="gradingform_guide-{{uniqid}}">
   <input type="hidden" name="instanceid" value="{{instanceid}}">
   {{#criterion}}
-    <div data-gradingform-guide-role="criterion">
-      <h5>
-        {{name}}
-        <a
-          href="#gradingform_guide-{{uniqid}}-criteria-{{id}}-description"
-          aria-controls="gradingform_guide-{{uniqid}}-criteria-{{id}}-description"
-          aria-expanded="false"
-          data-toggle="collapse"
-          role="button"
+    <div class="mb-3 criterion" data-gradingform-guide-role="criterion">
+      <div class="d-flex align-items-center">
+        <h5 class="description font-weight-bold mb-0">{{name}}</h5>
+        <button
+            class="btn btn-link px-1"
+            aria-controls="gradingform_guide-{{uniqid}}-criteria-{{id}}-description"
+            aria-expanded="false"
+            data-target="#gradingform_guide-{{uniqid}}-criteria-{{id}}-description"
+            data-toggle="collapse"
+            type="button"
           >
             {{# pix }} info, gradingform_guide {{/ pix }}
-        </a>
-      </h5>
+        </button>
+        <button class="criterion-toggle btn btn-icon icon-no-margin text-reset p-0 font-weight-bold mb-0 ml-auto"
+                type="button"
+                data-toggle="collapse"
+                data-target="#criteria-{{id}}"
+                aria-expanded="true"
+                aria-controls="criteria-{{id}}">
+                <span class="collapsed-icon">
+                    {{#pix}} t/collapsed, core {{/pix}}
+                    <span class="sr-only">{{#str}} expandcriterion, core_grades {{/str}}</span>
+                </span>
+                <span class="expanded-icon">
+                    {{#pix}} t/expanded, core {{/pix}}
+                    <span class="sr-only">{{#str}} collapsecriterion, core_grades {{/str}}</span>
+                </span>
+        </button>
+      </div>
       <div class="collapse" id="gradingform_guide-{{uniqid}}-criteria-{{id}}-description">
           <div class="border p-3 mb-3 bg-white rounded">
               {{{description}}}
@@ -83,52 +99,59 @@
               {{/descriptionmarkers}}
           </div>
       </div>
-      <div class="form-group">
-        <label for="gradingform_guide-{{uniqid}}-criteria-{{id}}-score">{{#str}}outof, gradingform_guide, {{maxscore}}{{/str}}</label>
-        <input class="form-control" type="number" name="advancedgrading[criteria][{{id}}][score]" value="{{score}}"
-            id="gradingform_guide-{{uniqid}}-criteria-{{id}}-score"
-            aria-describedby="gradingform_guide-{{uniqid}}-help-{{id}}-score">
-        <small id="gradingform_guide-{{uniqid}}-help-{{id}}-score" class="sr-only">{{#str}}grade_help, gradingform_guide{{/str}}</small>
-      </div>
-      <div class="form-group ">
-        <label for="gradingform_guide-{{uniqid}}-criteria-{{id}}-remark">{{#str}}additionalcomments, gradingform_guide{{/str}}</label>
-        <div class="input-group mb-3 form-inset form-inset-right">
-          <textarea class="form-control" type="text" name="advancedgrading[criteria][{{id}}][remark]"
-              id="gradingform_guide-{{uniqid}}-criteria-{{id}}-remark"
-              aria-describedby="gradingform_guide-{{uniqid}}-help-{{id}}-remark"
-              data-gradingform-guide-role="remark"
-              >{{remark}}</textarea>
-          {{#hascomments}}
-            <a
-              class="form-inset-item"
-              href="#gradingform_guide-{{uniqid}}-criteria-{{id}}-remark-frequent-comments"
-              aria-controls="gradingform_guide-{{uniqid}}-criteria-{{id}}-remark-frequent-comments"
-              aria-expanded="false"
-              data-toggle="collapse"
-              role="button"
-              >
-                {{#pix}}plus, gradingform_guide{{/pix}}
-            </a>
-          {{/hascomments}}
+      <div class="collapse show" id="criteria-{{id}}">
+        <div class="form-group">
+          <label for="gradingform_guide-{{uniqid}}-criteria-{{id}}-score">{{#str}}outof, gradingform_guide, {{maxscore}}{{/str}}</label>
+          <input class="form-control" type="number" name="advancedgrading[criteria][{{id}}][score]" value="{{score}}"
+              id="gradingform_guide-{{uniqid}}-criteria-{{id}}-score"
+              aria-describedby="gradingform_guide-{{uniqid}}-help-{{id}}-score">
+          <small id="gradingform_guide-{{uniqid}}-help-{{id}}-score" class="sr-only">{{#str}}grade_help, gradingform_guide{{/str}}</small>
         </div>
-        {{#hascomments}}
-          <div class="collapse" id="gradingform_guide-{{uniqid}}-criteria-{{id}}-remark-frequent-comments">
-            <div data-gradingform_guide-frequent-comments="gradingform_guide-{{uniqid}}-criteria-{{id}}-remark">
-              <div class="list-group">
-                {{#comments}}
-                  <button type="button" class="list-group-item list-group-item-action" data-gradingform_guide-role="frequent-comment">{{description}}</button>
-                {{/comments}}
+        <div class="form-group ">
+          <label class="text-muted" for="gradingform_guide-{{uniqid}}-criteria-{{id}}-remark">{{#str}}additionalcomments, gradingform_guide{{/str}}</label>
+          <div class="input-group mb-3 form-inset form-inset-right">
+            <textarea class="form-control" type="text" name="advancedgrading[criteria][{{id}}][remark]"
+                id="gradingform_guide-{{uniqid}}-criteria-{{id}}-remark"
+                aria-describedby="gradingform_guide-{{uniqid}}-help-{{id}}-remark"
+                data-gradingform-guide-role="remark"
+                rows="2"
+                data-max-rows="5"
+                data-auto-rows
+                >{{remark}}</textarea>
+            {{#hascomments}}
+              <button
+                class="btn btn-icon form-inset-item icon-no-margin p-0 mt-1 mr-1 text-reset collapsed"
+                aria-controls="gradingform_guide-{{uniqid}}-criteria-{{id}}-remark-frequent-comments"
+                aria-expanded="false"
+                data-toggle="collapse"
+                data-target="#gradingform_guide-{{uniqid}}-criteria-{{id}}-remark-frequent-comments"
+                type="button"
+              >
+                  {{#pix}}plus, gradingform_guide{{/pix}}
+              </button>
+            {{/hascomments}}
+          </div>
+          {{#hascomments}}
+            <div class="collapse" id="gradingform_guide-{{uniqid}}-criteria-{{id}}-remark-frequent-comments">
+              <div data-gradingform_guide-frequent-comments="gradingform_guide-{{uniqid}}-criteria-{{id}}-remark">
+                  <h6>{{#str}}comments, gradingform_guide{{/str}}</h6>
+                <div class="list-group">
+                  {{#comments}}
+                    <button type="button" class="list-group-item list-group-item-action" data-gradingform_guide-role="frequent-comment">{{description}}</button>
+                  {{/comments}}
+                </div>
               </div>
             </div>
-          </div>
-        {{/hascomments}}
-        <small id="gradingform_guide-{{uniqid}}-help-{{id}}-remark" class="sr-only">{{#str}}grade_help, gradingform_guide{{/str}}</small>
+          {{/hascomments}}
+          <small id="gradingform_guide-{{uniqid}}-help-{{id}}-remark" class="sr-only">{{#str}}grade_help, gradingform_guide{{/str}}</small>
+        </div>
       </div>
     </div>
   {{/criterion}}
 </form>
 {{#js}}
-require(['gradingform_guide/grades/grader/gradingpanel/comments'], function(Comments) {
+require(['gradingform_guide/grades/grader/gradingpanel/comments', 'core/auto_rows'], function(Comments, AutoRows) {
   Comments.init('gradingform_guide-{{uniqid}}');
+  AutoRows.init(document.getElementById('gradingform_guide-{{uniqid}}'));
 });
 {{/js}}
diff --git a/grade/grading/form/rubric/templates/grades/grader/gradingpanel.mustache b/grade/grading/form/rubric/templates/grades/grader/gradingpanel.mustache
index 94845f15866..a3d31cbda0d 100644
--- a/grade/grading/form/rubric/templates/grades/grader/gradingpanel.mustache
+++ b/grade/grading/form/rubric/templates/grades/grader/gradingpanel.mustache
@@ -57,49 +57,71 @@
     <input type="hidden" name="instanceid" value="{{instanceid}}">
     <div id="rubric-advancedgrading-{{uniqid}}" class="criterion">
         {{#criteria}}
-            <div class="d-block mb-2">
-                <h5 class="d-inline px-0 font-weight-bold mb-0">{{{description}}}</h5>
-                <button class="d-inline btn p-0 font-weight-bold mb-0 pull-right collapse"
-                        type="button"
-                        data-toggle="collapse"
-                        data-target="#criteria-{{id}}"
-                        aria-expanded="true"
-                        aria-controls="criteria-{{id}}">
-                </button>
-            </div>
-            <div class="collapse show" id="criteria-{{id}}">
-                {{#levels}}
-                    <div class="form-check">
-                        <input class="form-check-input level"
-                               type="radio"
-                               name="advancedgrading[criteria][{{criterionid}}][levelid]"
-                               id="advancedgrading-criteria-{{criterionid}}-levels-{{id}}-definition"
-                               value="{{id}}"
-                                {{#checked}}
-                                    aria-checked="true"
-                                    tabindex="0"
-                                    checked
-                                {{/checked}}
-                                {{^checked}}
-                                    aria-checked="false"
-                                    tabindex="-1"
-                                {{/checked}}
-                        >
-                        <label class="w-100" for="advancedgrading-criteria-{{criterionid}}-levels-{{id}}-definition">
-                            <label class="font-weight-bold">
-                                {{{definition}}}
+            <div class="mb-3">
+                <div class="d-flex align-items-center mb-2">
+                    <h5 class="px-0 mb-0 description font-weight-bold">{{{description}}}</h5>
+                    <button class="criterion-toggle btn btn-icon icon-no-margin text-reset p-0 font-weight-bold mb-0 ml-auto"
+                            type="button"
+                            data-toggle="collapse"
+                            data-target="#criteria-{{id}}"
+                            aria-expanded="true"
+                            aria-controls="criteria-{{id}}">
+                            <span class="collapsed-icon">
+                                {{#pix}} t/collapsed, core {{/pix}}
+                                <span class="sr-only">{{#str}} expandcriterion, core_grades {{/str}}</span>
+                            </span>
+                            <span class="expanded-icon">
+                                {{#pix}} t/expanded, core {{/pix}}
+                                <span class="sr-only">{{#str}} collapsecriterion, core_grades {{/str}}</span>
+                            </span>
+                    </button>
+                </div>
+                <div class="collapse show" id="criteria-{{id}}">
+                    {{#levels}}
+                        <div class="form-check">
+                            <input class="form-check-input level"
+                                   type="radio"
+                                   name="advancedgrading[criteria][{{criterionid}}][levelid]"
+                                   id="advancedgrading-criteria-{{criterionid}}-levels-{{id}}-definition"
+                                   value="{{id}}"
+                                    {{#checked}}
+                                        aria-checked="true"
+                                        tabindex="0"
+                                        checked
+                                    {{/checked}}
+                                    {{^checked}}
+                                        aria-checked="false"
+                                        tabindex="-1"
+                                    {{/checked}}
+                            >
+                            <label class="w-100" for="advancedgrading-criteria-{{criterionid}}-levels-{{id}}-definition">
+                                <span>
+                                    {{{definition}}}
+                                </span>
+                                <span class="pull-right">
+                                    {{#str}}pointsvalue, gradingform_rubric, {{score}}{{/str}}
+                                </span>
                             </label>
-                            <label class="pull-right font-weight-bold">
-                                {{#str}}pointsvalue, gradingform_rubric, {{score}}{{/str}}
-                            </label>
-                        </label>
+                        </div>
+                    {{/levels}}
+                    <div class="form-group">
+                        <label class="text-muted" for="advancedgrading-criteria-{{id}}-remark">{{#str}} additionalfeedback, core_grades {{/str}}</label>
+                        <textarea class="form-control"
+                                  name="advancedgrading[criteria][{{id}}][remark]"
+                                  id="advancedgrading-criteria-{{id}}-remark"
+                                  cols="10"
+                                  rows="1"
+                                  data-max-rows="5"
+                                  data-auto-rows="true"
+                        >{{{remark}}}</textarea>
                     </div>
-                {{/levels}}
-                <div class="form-group">
-                    <label for="advancedgrading-criteria-{{id}}-remark">Additional feedback</label>
-                    <textarea class="form-control" name="advancedgrading[criteria][{{id}}][remark]" id="advancedgrading-criteria-{{id}}-remark" cols="10" rows="5">{{{remark}}}</textarea>
                 </div>
             </div>
         {{/criteria}}
     </div>
 </form>
+{{#js}}
+require(['core/auto_rows'], function(AutoRows) {
+    AutoRows.init(document.getElementById('gradingform_rubric-{{uniqid}}'));
+});
+{{/js}}
\ No newline at end of file
diff --git a/lang/en/grades.php b/lang/en/grades.php
index 8afc3ed4bc7..63f2b000431 100644
--- a/lang/en/grades.php
+++ b/lang/en/grades.php
@@ -30,6 +30,7 @@ $string['addfeedback'] = 'Add feedback';
 $string['addgradeletter'] = 'Add a grade letter';
 $string['addidnumbers'] = 'Add ID numbers';
 $string['additem'] = 'Add grade item';
+$string['additionalfeedback'] = 'Additional feedback';
 $string['addoutcome'] = 'Add an outcome';
 $string['addoutcomeitem'] = 'Add outcome item';
 $string['addscale'] = 'Add a scale';
@@ -118,6 +119,7 @@ $string['categoryname'] = 'Category name';
 $string['categorytotal'] = 'Category total';
 $string['categorytotalname'] = 'Category total name';
 $string['categorytotalfull'] = '{$a->category} total';
+$string['collapsecriterion'] = 'Collapse criterion';
 $string['combo'] = 'Tabs and drop-down menu';
 $string['compact'] = 'Compact';
 $string['componentcontrolsvisibility'] = 'Whether this grade item is hidden is controlled by the activity settings.';
@@ -207,6 +209,7 @@ $string['eventusergraded'] = 'User graded';
 $string['excluded'] = 'Excluded';
 $string['excluded_help'] = 'If ticked, the grade will not be included in any aggregation.';
 $string['expand'] = 'Expand category';
+$string['expandcriterion'] = 'Expand criterion';
 $string['export'] = 'Export';
 $string['exportalloutcomes'] = 'Export all outcomes';
 $string['exportfeedback'] = 'Include feedback in export';
@@ -354,6 +357,7 @@ $string['gradevaluetoobig'] = 'One of the grade values is larger than the allowe
 $string['gradeview'] = 'View grade';
 $string['gradewasmodifiedduringediting'] = 'The grade entered for {$a->itemname} for {$a->username} was ignored because it was more recently updated by someone else.';
 $string['gradeweighthelp'] = 'Grade weight help';
+$string['gradingmodulename'] = 'Grading ({$a})';
 $string['groupavg'] = 'Group average';
 $string['hidden'] = 'Hidden';
 $string['hidden_help'] = 'If ticked, grades are hidden from students. A hidden until date may be set if desired, to release grades after grading is completed.';
diff --git a/lib/amd/build/modal.min.js b/lib/amd/build/modal.min.js
index f8be0bcf20e..833b5c9f7fb 100644
--- a/lib/amd/build/modal.min.js
+++ b/lib/amd/build/modal.min.js
@@ -1,2 +1,2 @@
-function _typeof(a){if("function"==typeof Symbol&&"symbol"==typeof Symbol.iterator){_typeof=function(a){return typeof a}}else{_typeof=function(a){return a&&"function"==typeof Symbol&&a.constructor===Symbol&&a!==Symbol.prototype?"symbol":typeof a}}return _typeof(a)}define ("core/modal",["jquery","core/templates","core/notification","core/key_codes","core/custom_interaction_events","core/modal_backdrop","core/event","core/modal_events"],function(a,b,c,d,e,f,g,h){var i={CONTAINER:"[data-region=\"modal-container\"]",MODAL:"[data-region=\"modal\"]",HEADER:"[data-region=\"header\"]",TITLE:"[data-region=\"title\"]",BODY:"[data-region=\"body\"]",FOOTER:"[data-region=\"footer\"]",HIDE:"[data-action=\"hide\"]",DIALOG:"[role=dialog]",FORM:"form",MENU_BAR:"[role=menubar]",HAS_Z_INDEX:".moodle-has-zindex",CAN_RECEIVE_FOCUS:"input:not([type=\"hidden\"]), a[href], button, textarea, select, [tabindex]"},j={LOADING:"core/loading",BACKDROP:"core/modal_backdrop"},k,l=0,m=function(b){this.root=a(b);this.modal=this.root.find(i.MODAL);this.header=this.modal.find(i.HEADER);this.title=this.header.find(i.TITLE);this.body=this.modal.find(i.BODY);this.footer=this.modal.find(i.FOOTER);this.hiddenSiblings=[];this.isAttached=!1;this.bodyJS=null;this.footerJS=null;this.modalCount=l++;if(!this.root.is(i.CONTAINER)){c.exception({message:"Element is not a modal container"})}if(!this.modal.length){c.exception({message:"Container does not contain a modal"})}if(!this.header.length){c.exception({message:"Modal is missing a header region"})}if(!this.title.length){c.exception({message:"Modal header is missing a title region"})}if(!this.body.length){c.exception({message:"Modal is missing a body region"})}if(!this.footer.length){c.exception({message:"Modal is missing a footer region"})}this.registerEventListeners()};m.prototype.attachToDOM=function(){if(this.isAttached){return}a("body").append(this.root);if(this.bodyJS){b.runTemplateJS(this.bodyJS);this.bodyJS=null}if(this.footerJS){b.runTemplateJS(this.footerJS);this.footerJS=null}this.isAttached=!0};m.prototype.countOtherVisibleModals=function(){var b=0;a("body").find(i.CONTAINER).each(function(c,d){d=a(d);if(!this.root.is(d)&&d.hasClass("show")){b++}}.bind(this));return b};m.prototype.getBackdrop=function(){if(!k){k=b.render(j.BACKDROP,{}).then(function(b){var c=a(b);return new f(c)}).fail(c.exception)}return k};m.prototype.getRoot=function(){return this.root};m.prototype.getModal=function(){return this.modal};m.prototype.getTitle=function(){return this.title};m.prototype.getBody=function(){return this.body};m.prototype.getFooter=function(){return this.footer};m.prototype.getModalCount=function(){return this.modalCount};m.prototype.setTitle=function(a){var b=this.getTitle();this.asyncSet(a,b.html.bind(b))};m.prototype.setBody=function(d){var e=this.getBody();if("string"==typeof d){e.html(d);g.notifyFilterContentUpdated(e);this.getRoot().trigger(h.bodyRendered,this)}else{var f="amd-modal-js-pending-id-"+this.getModalCount();M.util.js_pending(f);var i=null;e.css("overflow","hidden");if("pending"==d.state()){var k=e.innerHeight();if(100>k){k=100}e.animate({height:k+"px"},150);e.html("");i=b.render(j.LOADING,{}).then(function(b){var c=a(b).hide();e.html(c);c.fadeIn(150);return a.when(c.promise(),d)}).then(function(a){return a.fadeOut(100).promise()}).then(function(){return d})}else{i=d}i.then(function(a,c){var d=null;if(this.isVisible()){e.css("opacity",0);var f=e.innerHeight();e.html(a);e.css("height","");var i=e.innerHeight();e.css("height",f+"px");d=e.animate({height:i+"px",opacity:1},{duration:150,queue:!1}).promise()}else{e.html(a)}if(c){if(this.isAttached){b.runTemplateJS(c)}else{this.bodyJS=c}}g.notifyFilterContentUpdated(e);this.getRoot().trigger(h.bodyRendered,this);return d}.bind(this)).fail(c.exception).always(function(){e.css("height","");e.css("overflow","");e.css("opacity","");M.util.js_complete(f)}).fail(c.exception)}};m.prototype.setFooter=function(a){this.showFooter();var c=this.getFooter();if("string"==typeof a){c.html(a)}else{b.render(j.LOADING,{}).done(function(d){c.html(d);a.done(function(a,d){c.html(a);if(d){if(this.isAttached){b.runTemplateJS(d)}else{this.footerJS=d}}}.bind(this))}.bind(this))}};m.prototype.hasFooterContent=function(){return this.getFooter().children().length?!0:!1};m.prototype.hideFooter=function(){this.getFooter().addClass("hidden")};m.prototype.showFooter=function(){this.getFooter().removeClass("hidden")};m.prototype.setLarge=function(){if(this.isLarge()){return}this.getModal().addClass("modal-lg")};m.prototype.isLarge=function(){return this.getModal().hasClass("modal-lg")};m.prototype.setSmall=function(){if(this.isSmall()){return}this.getModal().removeClass("modal-lg")};m.prototype.isSmall=function(){return!this.getModal().hasClass("modal-lg")};m.prototype.calculateZIndex=function(){var b=a(i.DIALOG+", "+i.MENU_BAR+", "+i.HAS_Z_INDEX),c=parseInt(this.root.css("z-index"));b.each(function(b,d){d=a(d);var e=d.css("z-index")?parseInt(d.css("z-index")):0;if(e>c){c=e}});return c};m.prototype.isVisible=function(){return this.root.hasClass("show")};m.prototype.hasFocus=function(){var b=a(document.activeElement);return this.root.is(b)||this.root.has(b).length};m.prototype.hasTransitions=function(){return this.getRoot().hasClass("fade")};m.prototype.show=function(){if(this.isVisible()){return}if(this.hasFooterContent()){this.showFooter()}else{this.hideFooter()}if(!this.isAttached){this.attachToDOM()}this.getBackdrop().done(function(b){var c=this.calculateZIndex(),d=c+2;this.root.css("z-index",d);b.setZIndex(d-1);b.show();this.root.removeClass("hide").addClass("show");this.accessibilityShow();this.getModal().focus();a("body").addClass("modal-open");this.root.trigger(h.shown,this)}.bind(this))};m.prototype.hideIfNotForm=function(){var a=this.modal.find(i.FORM);if(0==a.length){this.hide()}};m.prototype.hide=function(){this.getBackdrop().done(function(b){if(!this.countOtherVisibleModals()){b.hide();a("body").removeClass("modal-open")}var c=parseInt(this.root.css("z-index"));this.root.css("z-index","");b.setZIndex(c-3);this.accessibilityHide();if(this.hasTransitions()){this.getRoot().one("transitionend webkitTransitionEnd oTransitionEnd",function(){this.getRoot().removeClass("show").addClass("hide")}.bind(this))}else{this.getRoot().removeClass("show").addClass("hide")}this.root.trigger(h.hidden,this)}.bind(this))};m.prototype.destroy=function(){this.root.remove();this.root.trigger(h.destroyed,this)};m.prototype.accessibilityShow=function(){a("body").children().each(function(b,c){if(!this.root.is(c)){c=a(c);var d=c.attr("aria-hidden");if("true"!==d){c.data("previous-aria-hidden",d);this.hiddenSiblings.push(c);c.attr("aria-hidden","true")}}}.bind(this));this.root.attr("aria-hidden","false")};m.prototype.accessibilityHide=function(){this.root.attr("aria-hidden","true");a.each(this.hiddenSiblings,function(b,c){c=a(c);var d=c.data("previous-aria-hidden");if("undefined"==typeof d){c.removeAttr("aria-hidden")}else{c.attr("aria-hidden",d)}});this.hiddenSiblings=[]};m.prototype.handleTabLock=function(b){if(!this.hasFocus()){return}var c=a(document.activeElement),d=this.modal.find(i.CAN_RECEIVE_FOCUS),e=d.first(),f=d.last();if(c.is(e)&&b.shiftKey){f.focus();b.preventDefault()}else if(c.is(f)&&!b.shiftKey){e.focus();b.preventDefault()}};m.prototype.registerEventListeners=function(){this.getRoot().on("keydown",function(a){if(!this.isVisible()){return}if(a.keyCode==d.tab){this.handleTabLock(a)}else if(a.keyCode==d.escape){this.hide()}}.bind(this));this.getRoot().click(function(b){if(!a(b.target).closest(i.MODAL).length){if(a(b.target).closest(i.CONTAINER).length){this.hideIfNotForm()}}}.bind(this));e.define(this.getModal(),[e.events.activate]);this.getModal().on(e.events.activate,i.HIDE,function(a,b){this.hide();b.originalEvent.preventDefault()}.bind(this))};m.prototype.asyncSet=function(b,d){var e=b;if("object"!==_typeof(b)||!b.hasOwnProperty("then")){e=a.Deferred();e.resolve(b)}e.then(function(a){d(a)}).fail(c.exception);return e};return m});
+function _typeof(a){if("function"==typeof Symbol&&"symbol"==typeof Symbol.iterator){_typeof=function(a){return typeof a}}else{_typeof=function(a){return a&&"function"==typeof Symbol&&a.constructor===Symbol&&a!==Symbol.prototype?"symbol":typeof a}}return _typeof(a)}define ("core/modal",["jquery","core/templates","core/notification","core/key_codes","core/custom_interaction_events","core/modal_backdrop","core/event","core/modal_events"],function(a,b,c,d,e,f,g,h){var i={CONTAINER:"[data-region=\"modal-container\"]",MODAL:"[data-region=\"modal\"]",HEADER:"[data-region=\"header\"]",TITLE:"[data-region=\"title\"]",BODY:"[data-region=\"body\"]",FOOTER:"[data-region=\"footer\"]",HIDE:"[data-action=\"hide\"]",DIALOG:"[role=dialog]",FORM:"form",MENU_BAR:"[role=menubar]",HAS_Z_INDEX:".moodle-has-zindex",CAN_RECEIVE_FOCUS:"input:not([type=\"hidden\"]), a[href], button, textarea, select, [tabindex]"},j={LOADING:"core/loading",BACKDROP:"core/modal_backdrop"},k,l=0,m=function(b){this.root=a(b);this.modal=this.root.find(i.MODAL);this.header=this.modal.find(i.HEADER);this.title=this.header.find(i.TITLE);this.body=this.modal.find(i.BODY);this.footer=this.modal.find(i.FOOTER);this.hiddenSiblings=[];this.isAttached=!1;this.bodyJS=null;this.footerJS=null;this.modalCount=l++;if(!this.root.is(i.CONTAINER)){c.exception({message:"Element is not a modal container"})}if(!this.modal.length){c.exception({message:"Container does not contain a modal"})}if(!this.header.length){c.exception({message:"Modal is missing a header region"})}if(!this.title.length){c.exception({message:"Modal header is missing a title region"})}if(!this.body.length){c.exception({message:"Modal is missing a body region"})}if(!this.footer.length){c.exception({message:"Modal is missing a footer region"})}this.registerEventListeners()};m.prototype.attachToDOM=function(){if(this.isAttached){return}a("body").append(this.root);if(this.bodyJS){b.runTemplateJS(this.bodyJS);this.bodyJS=null}if(this.footerJS){b.runTemplateJS(this.footerJS);this.footerJS=null}this.isAttached=!0};m.prototype.countOtherVisibleModals=function(){var b=0;a("body").find(i.CONTAINER).each(function(c,d){d=a(d);if(!this.root.is(d)&&d.hasClass("show")){b++}}.bind(this));return b};m.prototype.getBackdrop=function(){if(!k){k=b.render(j.BACKDROP,{}).then(function(b){var c=a(b);return new f(c)}).fail(c.exception)}return k};m.prototype.getRoot=function(){return this.root};m.prototype.getModal=function(){return this.modal};m.prototype.getTitle=function(){return this.title};m.prototype.getBody=function(){return this.body};m.prototype.getFooter=function(){return this.footer};m.prototype.getModalCount=function(){return this.modalCount};m.prototype.setTitle=function(a){var b=this.getTitle();this.asyncSet(a,b.html.bind(b))};m.prototype.setBody=function(d){var e=this.getBody();if("string"==typeof d){e.html(d);g.notifyFilterContentUpdated(e);this.getRoot().trigger(h.bodyRendered,this)}else{var f="amd-modal-js-pending-id-"+this.getModalCount();M.util.js_pending(f);var i=null;e.css("overflow","hidden");if("pending"==d.state()){var k=e.innerHeight();if(100>k){k=100}e.animate({height:k+"px"},150);e.html("");i=b.render(j.LOADING,{}).then(function(b){var c=a(b).hide();e.html(c);c.fadeIn(150);return a.when(c.promise(),d)}).then(function(a){return a.fadeOut(100).promise()}).then(function(){return d})}else{i=d}i.then(function(a,c){var d=null;if(this.isVisible()){e.css("opacity",0);var f=e.innerHeight();e.html(a);e.css("height","");var g=e.innerHeight();e.css("height",f+"px");d=e.animate({height:g+"px",opacity:1},{duration:150,queue:!1}).promise()}else{e.html(a)}if(c){if(this.isAttached){b.runTemplateJS(c)}else{this.bodyJS=c}}return d}.bind(this)).then(function(a){g.notifyFilterContentUpdated(e);this.getRoot().trigger(h.bodyRendered,this);return a}.bind(this)).fail(c.exception).always(function(){e.css("height","");e.css("overflow","");e.css("opacity","");M.util.js_complete(f)}).fail(c.exception)}};m.prototype.setFooter=function(a){this.showFooter();var c=this.getFooter();if("string"==typeof a){c.html(a)}else{b.render(j.LOADING,{}).done(function(d){c.html(d);a.done(function(a,d){c.html(a);if(d){if(this.isAttached){b.runTemplateJS(d)}else{this.footerJS=d}}}.bind(this))}.bind(this))}};m.prototype.hasFooterContent=function(){return this.getFooter().children().length?!0:!1};m.prototype.hideFooter=function(){this.getFooter().addClass("hidden")};m.prototype.showFooter=function(){this.getFooter().removeClass("hidden")};m.prototype.setLarge=function(){if(this.isLarge()){return}this.getModal().addClass("modal-lg")};m.prototype.isLarge=function(){return this.getModal().hasClass("modal-lg")};m.prototype.setSmall=function(){if(this.isSmall()){return}this.getModal().removeClass("modal-lg")};m.prototype.isSmall=function(){return!this.getModal().hasClass("modal-lg")};m.prototype.calculateZIndex=function(){var b=a(i.DIALOG+", "+i.MENU_BAR+", "+i.HAS_Z_INDEX),c=parseInt(this.root.css("z-index"));b.each(function(b,d){d=a(d);var e=d.css("z-index")?parseInt(d.css("z-index")):0;if(e>c){c=e}});return c};m.prototype.isVisible=function(){return this.root.hasClass("show")};m.prototype.hasFocus=function(){var b=a(document.activeElement);return this.root.is(b)||this.root.has(b).length};m.prototype.hasTransitions=function(){return this.getRoot().hasClass("fade")};m.prototype.show=function(){if(this.isVisible()){return}if(this.hasFooterContent()){this.showFooter()}else{this.hideFooter()}if(!this.isAttached){this.attachToDOM()}this.getBackdrop().done(function(b){var c=this.calculateZIndex(),d=c+2;this.root.css("z-index",d);b.setZIndex(d-1);b.show();this.root.removeClass("hide").addClass("show");this.accessibilityShow();this.getModal().focus();a("body").addClass("modal-open");this.root.trigger(h.shown,this)}.bind(this))};m.prototype.hideIfNotForm=function(){var a=this.modal.find(i.FORM);if(0==a.length){this.hide()}};m.prototype.hide=function(){this.getBackdrop().done(function(b){if(!this.countOtherVisibleModals()){b.hide();a("body").removeClass("modal-open")}var c=parseInt(this.root.css("z-index"));this.root.css("z-index","");b.setZIndex(c-3);this.accessibilityHide();if(this.hasTransitions()){this.getRoot().one("transitionend webkitTransitionEnd oTransitionEnd",function(){this.getRoot().removeClass("show").addClass("hide")}.bind(this))}else{this.getRoot().removeClass("show").addClass("hide")}this.root.trigger(h.hidden,this)}.bind(this))};m.prototype.destroy=function(){this.root.remove();this.root.trigger(h.destroyed,this)};m.prototype.accessibilityShow=function(){a("body").children().each(function(b,c){if(!this.root.is(c)){c=a(c);var d=c.attr("aria-hidden");if("true"!==d){c.data("previous-aria-hidden",d);this.hiddenSiblings.push(c);c.attr("aria-hidden","true")}}}.bind(this));this.root.attr("aria-hidden","false")};m.prototype.accessibilityHide=function(){this.root.attr("aria-hidden","true");a.each(this.hiddenSiblings,function(b,c){c=a(c);var d=c.data("previous-aria-hidden");if("undefined"==typeof d){c.removeAttr("aria-hidden")}else{c.attr("aria-hidden",d)}});this.hiddenSiblings=[]};m.prototype.handleTabLock=function(b){if(!this.hasFocus()){return}var c=a(document.activeElement),d=this.modal.find(i.CAN_RECEIVE_FOCUS),e=d.first(),f=d.last();if(c.is(e)&&b.shiftKey){f.focus();b.preventDefault()}else if(c.is(f)&&!b.shiftKey){e.focus();b.preventDefault()}};m.prototype.registerEventListeners=function(){this.getRoot().on("keydown",function(a){if(!this.isVisible()){return}if(a.keyCode==d.tab){this.handleTabLock(a)}else if(a.keyCode==d.escape){this.hide()}}.bind(this));this.getRoot().click(function(b){if(!a(b.target).closest(i.MODAL).length){if(a(b.target).closest(i.CONTAINER).length){this.hideIfNotForm()}}}.bind(this));e.define(this.getModal(),[e.events.activate]);this.getModal().on(e.events.activate,i.HIDE,function(a,b){this.hide();b.originalEvent.preventDefault()}.bind(this))};m.prototype.asyncSet=function(b,d){var e=b;if("object"!==_typeof(b)||!b.hasOwnProperty("then")){e=a.Deferred();e.resolve(b)}e.then(function(a){d(a)}).fail(c.exception);return e};return m});
 //# sourceMappingURL=modal.min.js.map
diff --git a/lib/amd/build/modal.min.js.map b/lib/amd/build/modal.min.js.map
index 8f8bf40acea..33a5e2c31ca 100644
--- a/lib/amd/build/modal.min.js.map
+++ b/lib/amd/build/modal.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../src/modal.js"],"names":["define","$","Templates","Notification","KeyCodes","CustomEvents","ModalBackdrop","Event","ModalEvents","SELECTORS","CONTAINER","MODAL","HEADER","TITLE","BODY","FOOTER","HIDE","DIALOG","FORM","MENU_BAR","HAS_Z_INDEX","CAN_RECEIVE_FOCUS","TEMPLATES","LOADING","BACKDROP","backdropPromise","modalCounter","Modal","root","modal","find","header","title","body","footer","hiddenSiblings","isAttached","bodyJS","footerJS","modalCount","is","exception","message","length","registerEventListeners","prototype","attachToDOM","append","runTemplateJS","countOtherVisibleModals","count","each","index","element","hasClass","bind","getBackdrop","render","then","html","fail","getRoot","getModal","getTitle","getBody","getFooter","getModalCount","setTitle","value","asyncSet","setBody","notifyFilterContentUpdated","trigger","bodyRendered","jsPendingId","M","util","js_pending","contentPromise","css","state","height","innerHeight","animate","loadingIcon","hide","fadeIn","when","promise","fadeOut","js","result","isVisible","currentHeight","newHeight","opacity","duration","queue","always","js_complete","setFooter","showFooter","done","hasFooterContent","children","hideFooter","addClass","removeClass","setLarge","isLarge","setSmall","isSmall","calculateZIndex","items","zIndex","parseInt","item","itemZIndex","hasFocus","target","document","activeElement","has","hasTransitions","show","backdrop","currentIndex","newIndex","setZIndex","accessibilityShow","focus","shown","hideIfNotForm","formElement","accessibilityHide","one","hidden","destroy","remove","destroyed","child","attr","data","push","sibling","previousValue","removeAttr","handleTabLock","e","focusableElements","firstFocusable","first","lastFocusable","last","shiftKey","preventDefault","on","keyCode","tab","escape","click","closest","events","activate","originalEvent","setFunction","p","hasOwnProperty","Deferred","resolve","content"],"mappings":"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","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Contain the logic for modals.\n *\n * @module     core/modal\n * @class      modal\n * @package    core\n * @copyright  2016 Ryan Wyllie <ryan@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\ndefine(['jquery', 'core/templates', 'core/notification', 'core/key_codes',\n        'core/custom_interaction_events', 'core/modal_backdrop', 'core/event', 'core/modal_events'],\n     function($, Templates, Notification, KeyCodes, CustomEvents, ModalBackdrop, Event, ModalEvents) {\n\n    var SELECTORS = {\n        CONTAINER: '[data-region=\"modal-container\"]',\n        MODAL: '[data-region=\"modal\"]',\n        HEADER: '[data-region=\"header\"]',\n        TITLE: '[data-region=\"title\"]',\n        BODY: '[data-region=\"body\"]',\n        FOOTER: '[data-region=\"footer\"]',\n        HIDE: '[data-action=\"hide\"]',\n        DIALOG: '[role=dialog]',\n        FORM: 'form',\n        MENU_BAR: '[role=menubar]',\n        HAS_Z_INDEX: '.moodle-has-zindex',\n        CAN_RECEIVE_FOCUS: 'input:not([type=\"hidden\"]), a[href], button, textarea, select, [tabindex]',\n    };\n\n    var TEMPLATES = {\n        LOADING: 'core/loading',\n        BACKDROP: 'core/modal_backdrop',\n    };\n\n    /**\n     * Module singleton for the backdrop to be reused by all Modal instances.\n     */\n    var backdropPromise;\n\n    /**\n     * A counter that gets incremented for each modal created. This can be\n     * used to generate unique values for the modals.\n     */\n    var modalCounter = 0;\n\n    /**\n     * Constructor for the Modal.\n     *\n     * @param {object} root The root jQuery element for the modal\n     */\n    var Modal = function(root) {\n        this.root = $(root);\n        this.modal = this.root.find(SELECTORS.MODAL);\n        this.header = this.modal.find(SELECTORS.HEADER);\n        this.title = this.header.find(SELECTORS.TITLE);\n        this.body = this.modal.find(SELECTORS.BODY);\n        this.footer = this.modal.find(SELECTORS.FOOTER);\n        this.hiddenSiblings = [];\n        this.isAttached = false;\n        this.bodyJS = null;\n        this.footerJS = null;\n        this.modalCount = modalCounter++;\n\n        if (!this.root.is(SELECTORS.CONTAINER)) {\n            Notification.exception({message: 'Element is not a modal container'});\n        }\n\n        if (!this.modal.length) {\n            Notification.exception({message: 'Container does not contain a modal'});\n        }\n\n        if (!this.header.length) {\n            Notification.exception({message: 'Modal is missing a header region'});\n        }\n\n        if (!this.title.length) {\n            Notification.exception({message: 'Modal header is missing a title region'});\n        }\n\n        if (!this.body.length) {\n            Notification.exception({message: 'Modal is missing a body region'});\n        }\n\n        if (!this.footer.length) {\n            Notification.exception({message: 'Modal is missing a footer region'});\n        }\n\n        this.registerEventListeners();\n    };\n\n    /**\n     * Add the modal to the page, if it hasn't already been added. This includes running any\n     * javascript that has been cached until now.\n     *\n     * @method attachToDOM\n     */\n    Modal.prototype.attachToDOM = function() {\n        if (this.isAttached) {\n            return;\n        }\n\n        $('body').append(this.root);\n\n        // If we'd cached any JS then we can run it how that the modal is\n        // attached to the DOM.\n        if (this.bodyJS) {\n            Templates.runTemplateJS(this.bodyJS);\n            this.bodyJS = null;\n        }\n\n        if (this.footerJS) {\n            Templates.runTemplateJS(this.footerJS);\n            this.footerJS = null;\n        }\n\n        this.isAttached = true;\n    };\n\n    /**\n     * Count the number of other visible modals (not including this one).\n     *\n     * @method countOtherVisibleModals\n     * @return {int}\n     */\n    Modal.prototype.countOtherVisibleModals = function() {\n        var count = 0;\n        $('body').find(SELECTORS.CONTAINER).each(function(index, element) {\n            element = $(element);\n\n            // If we haven't found ourself and the element is visible.\n            if (!this.root.is(element) && element.hasClass('show')) {\n                count++;\n            }\n        }.bind(this));\n\n        return count;\n    };\n\n    /**\n     * Get the modal backdrop.\n     *\n     * @method getBackdrop\n     * @return {object} jQuery promise\n     */\n    Modal.prototype.getBackdrop = function() {\n        if (!backdropPromise) {\n            backdropPromise = Templates.render(TEMPLATES.BACKDROP, {})\n                .then(function(html) {\n                    var element = $(html);\n\n                    return new ModalBackdrop(element);\n                })\n                .fail(Notification.exception);\n        }\n\n        return backdropPromise;\n    };\n\n    /**\n     * Get the root element of this modal.\n     *\n     * @method getRoot\n     * @return {object} jQuery object\n     */\n    Modal.prototype.getRoot = function() {\n        return this.root;\n    };\n\n    /**\n     * Get the modal element of this modal.\n     *\n     * @method getModal\n     * @return {object} jQuery object\n     */\n    Modal.prototype.getModal = function() {\n        return this.modal;\n    };\n\n    /**\n     * Get the modal title element.\n     *\n     * @method getTitle\n     * @return {object} jQuery object\n     */\n    Modal.prototype.getTitle = function() {\n        return this.title;\n    };\n\n    /**\n     * Get the modal body element.\n     *\n     * @method getBody\n     * @return {object} jQuery object\n     */\n    Modal.prototype.getBody = function() {\n        return this.body;\n    };\n\n    /**\n     * Get the modal footer element.\n     *\n     * @method getFooter\n     * @return {object} jQuery object\n     */\n    Modal.prototype.getFooter = function() {\n        return this.footer;\n    };\n\n    /**\n     * Get the unique modal count.\n     *\n     * @method getModalCount\n     * @return {int}\n     */\n    Modal.prototype.getModalCount = function() {\n        return this.modalCount;\n    };\n\n    /**\n     * Set the modal title element.\n     *\n     * This method is overloaded to take either a string value for the title or a jQuery promise that is resolved with\n     * HTML most commonly from a Str.get_string call.\n     *\n     * @method setTitle\n     * @param {(string|object)} value The title string or jQuery promise which resolves to the title.\n     */\n    Modal.prototype.setTitle = function(value) {\n        var title = this.getTitle();\n\n        this.asyncSet(value, title.html.bind(title));\n    };\n\n    /**\n     * Set the modal body element.\n     *\n     * This method is overloaded to take either a string value for the body or a jQuery promise that is resolved with\n     * HTML and Javascript most commonly from a Templates.render call.\n     *\n     * @method setBody\n     * @param {(string|object)} value The body string or jQuery promise which resolves to the body.\n     */\n    Modal.prototype.setBody = function(value) {\n        var body = this.getBody();\n\n        if (typeof value === 'string') {\n            // Just set the value if it's a string.\n            body.html(value);\n            Event.notifyFilterContentUpdated(body);\n            this.getRoot().trigger(ModalEvents.bodyRendered, this);\n        } else {\n            var jsPendingId = 'amd-modal-js-pending-id-' + this.getModalCount();\n            M.util.js_pending(jsPendingId);\n            // Otherwise we assume it's a promise to be resolved with\n            // html and javascript.\n            var contentPromise = null;\n            body.css('overflow', 'hidden');\n\n            if (value.state() == 'pending') {\n                // We're still waiting for the body promise to resolve so\n                // let's show a loading icon.\n                var height = body.innerHeight();\n                if (height < 100) {\n                    height = 100;\n                }\n\n                body.animate({height: height + 'px'}, 150);\n\n                body.html('');\n                contentPromise = Templates.render(TEMPLATES.LOADING, {})\n                    .then(function(html) {\n                        var loadingIcon = $(html).hide();\n                        body.html(loadingIcon);\n                        loadingIcon.fadeIn(150);\n\n                        // We only want the loading icon to fade out\n                        // when the content for the body has finished\n                        // loading.\n                        return $.when(loadingIcon.promise(), value);\n                    })\n                    .then(function(loadingIcon) {\n                        // Once the content has finished loading and\n                        // the loading icon has been shown then we can\n                        // fade the icon away to reveal the content.\n                        return loadingIcon.fadeOut(100).promise();\n                    })\n                    .then(function() {\n                        return value;\n                    });\n            } else {\n                // The content is already loaded so let's just display\n                // it to the user. No need for a loading icon.\n                contentPromise = value;\n            }\n\n            // Now we can actually display the content.\n            contentPromise.then(function(html, js) {\n                var result = null;\n\n                if (this.isVisible()) {\n                    // If the modal is visible then we should display\n                    // the content gracefully for the user.\n                    body.css('opacity', 0);\n                    var currentHeight = body.innerHeight();\n                    body.html(html);\n                    // We need to clear any height values we've set here\n                    // in order to measure the height of the content being\n                    // added. This then allows us to animate the height\n                    // transition.\n                    body.css('height', '');\n                    var newHeight = body.innerHeight();\n                    body.css('height', currentHeight + 'px');\n                    result = body.animate(\n                        {height: newHeight + 'px', opacity: 1},\n                        {duration: 150, queue: false}\n                    ).promise();\n                } else {\n                    // Since the modal isn't visible we can just immediately\n                    // set the content. No need to animate it.\n                    body.html(html);\n                }\n\n                if (js) {\n                    if (this.isAttached) {\n                        // If we're in the DOM then run the JS immediately.\n                        Templates.runTemplateJS(js);\n                    } else {\n                        // Otherwise cache it to be run when we're attached.\n                        this.bodyJS = js;\n                    }\n                }\n                Event.notifyFilterContentUpdated(body);\n                this.getRoot().trigger(ModalEvents.bodyRendered, this);\n\n                return result;\n            }.bind(this))\n            .fail(Notification.exception)\n            .always(function() {\n                // When we're done displaying all of the content we need\n                // to clear the custom values we've set here.\n                body.css('height', '');\n                body.css('overflow', '');\n                body.css('opacity', '');\n                M.util.js_complete(jsPendingId);\n\n                return;\n            })\n            .fail(Notification.exception);\n        }\n    };\n\n    /**\n     * Set the modal footer element. The footer element is made visible, if it\n     * isn't already.\n     *\n     * This method is overloaded to take either a string\n     * value for the body or a jQuery promise that is resolved with HTML and Javascript\n     * most commonly from a Templates.render call.\n     *\n     * @method setFooter\n     * @param {(string|object)} value The footer string or jQuery promise\n     */\n    Modal.prototype.setFooter = function(value) {\n        // Make sure the footer is visible.\n        this.showFooter();\n\n        var footer = this.getFooter();\n\n        if (typeof value === 'string') {\n            // Just set the value if it's a string.\n            footer.html(value);\n        } else {\n            // Otherwise we assume it's a promise to be resolved with\n            // html and javascript.\n            Templates.render(TEMPLATES.LOADING, {}).done(function(html) {\n                footer.html(html);\n\n                value.done(function(html, js) {\n                    footer.html(html);\n\n                    if (js) {\n                        if (this.isAttached) {\n                            // If we're in the DOM then run the JS immediately.\n                            Templates.runTemplateJS(js);\n                        } else {\n                            // Otherwise cache it to be run when we're attached.\n                            this.footerJS = js;\n                        }\n                    }\n                }.bind(this));\n            }.bind(this));\n        }\n    };\n\n    /**\n     * Check if the footer has any content in it.\n     *\n     * @method hasFooterContent\n     * @return {bool}\n     */\n    Modal.prototype.hasFooterContent = function() {\n        return this.getFooter().children().length ? true : false;\n    };\n\n    /**\n     * Hide the footer element.\n     *\n     * @method hideFooter\n     */\n    Modal.prototype.hideFooter = function() {\n        this.getFooter().addClass('hidden');\n    };\n\n    /**\n     * Show the footer element.\n     *\n     * @method showFooter\n     */\n    Modal.prototype.showFooter = function() {\n        this.getFooter().removeClass('hidden');\n    };\n\n    /**\n     * Mark the modal as a large modal.\n     *\n     * @method setLarge\n     */\n    Modal.prototype.setLarge = function() {\n        if (this.isLarge()) {\n            return;\n        }\n\n        this.getModal().addClass('modal-lg');\n    };\n\n    /**\n     * Check if the modal is a large modal.\n     *\n     * @method isLarge\n     * @return {bool}\n     */\n    Modal.prototype.isLarge = function() {\n        return this.getModal().hasClass('modal-lg');\n    };\n\n    /**\n     * Mark the modal as a small modal.\n     *\n     * @method setSmall\n     */\n    Modal.prototype.setSmall = function() {\n        if (this.isSmall()) {\n            return;\n        }\n\n        this.getModal().removeClass('modal-lg');\n    };\n\n    /**\n     * Check if the modal is a small modal.\n     *\n     * @method isSmall\n     * @return {bool}\n     */\n    Modal.prototype.isSmall = function() {\n        return !this.getModal().hasClass('modal-lg');\n    };\n\n    /**\n     * Determine the highest z-index value currently on the page.\n     *\n     * @method calculateZIndex\n     * @return {int}\n     */\n    Modal.prototype.calculateZIndex = function() {\n        var items = $(SELECTORS.DIALOG + ', ' + SELECTORS.MENU_BAR + ', ' + SELECTORS.HAS_Z_INDEX);\n        var zIndex = parseInt(this.root.css('z-index'));\n\n        items.each(function(index, item) {\n            item = $(item);\n            // Note that webkit browsers won't return the z-index value from the CSS stylesheet\n            // if the element doesn't have a position specified. Instead it'll return \"auto\".\n            var itemZIndex = item.css('z-index') ? parseInt(item.css('z-index')) : 0;\n\n            if (itemZIndex > zIndex) {\n                zIndex = itemZIndex;\n            }\n        });\n\n        return zIndex;\n    };\n\n    /**\n     * Check if this modal is visible.\n     *\n     * @method isVisible\n     * @return {bool}\n     */\n    Modal.prototype.isVisible = function() {\n        return this.root.hasClass('show');\n    };\n\n    /**\n     * Check if this modal has focus.\n     *\n     * @method hasFocus\n     * @return {bool}\n     */\n    Modal.prototype.hasFocus = function() {\n        var target = $(document.activeElement);\n        return this.root.is(target) || this.root.has(target).length;\n    };\n\n    /**\n     * Check if this modal has CSS transitions applied.\n     *\n     * @method hasTransitions\n     * @return {bool}\n     */\n    Modal.prototype.hasTransitions = function() {\n        return this.getRoot().hasClass('fade');\n    };\n\n    /**\n     * Display this modal. The modal will be attached to the DOM if it hasn't\n     * already been.\n     *\n     * @method show\n     */\n    Modal.prototype.show = function() {\n        if (this.isVisible()) {\n            return;\n        }\n\n        if (this.hasFooterContent()) {\n            this.showFooter();\n        } else {\n            this.hideFooter();\n        }\n\n        if (!this.isAttached) {\n            this.attachToDOM();\n        }\n\n        this.getBackdrop().done(function(backdrop) {\n            var currentIndex = this.calculateZIndex();\n            var newIndex = currentIndex + 2;\n            var newBackdropIndex = newIndex - 1;\n            this.root.css('z-index', newIndex);\n            backdrop.setZIndex(newBackdropIndex);\n            backdrop.show();\n\n            this.root.removeClass('hide').addClass('show');\n            this.accessibilityShow();\n            this.getModal().focus();\n            $('body').addClass('modal-open');\n            this.root.trigger(ModalEvents.shown, this);\n        }.bind(this));\n    };\n\n    /**\n     * Hide this modal if it does not contain a form.\n     *\n     * @method hideIfNotForm\n     */\n    Modal.prototype.hideIfNotForm = function() {\n        var formElement = this.modal.find(SELECTORS.FORM);\n        if (formElement.length == 0) {\n            this.hide();\n        }\n    };\n\n    /**\n     * Hide this modal.\n     *\n     * @method hide\n     */\n    Modal.prototype.hide = function() {\n        this.getBackdrop().done(function(backdrop) {\n            if (!this.countOtherVisibleModals()) {\n                // Hide the backdrop if we're the last open modal.\n                backdrop.hide();\n                $('body').removeClass('modal-open');\n            }\n\n            var currentIndex = parseInt(this.root.css('z-index'));\n            this.root.css('z-index', '');\n            backdrop.setZIndex(currentIndex - 3);\n\n            this.accessibilityHide();\n\n            if (this.hasTransitions()) {\n                // Wait for CSS transitions to complete before hiding the element.\n                this.getRoot().one('transitionend webkitTransitionEnd oTransitionEnd', function() {\n                    this.getRoot().removeClass('show').addClass('hide');\n                }.bind(this));\n            } else {\n                this.getRoot().removeClass('show').addClass('hide');\n            }\n\n            this.root.trigger(ModalEvents.hidden, this);\n        }.bind(this));\n    };\n\n    /**\n     * Remove this modal from the DOM.\n     *\n     * @method destroy\n     */\n    Modal.prototype.destroy = function() {\n        this.root.remove();\n        this.root.trigger(ModalEvents.destroyed, this);\n    };\n\n    /**\n     * Sets the appropriate aria attributes on this dialogue and the other\n     * elements in the DOM to ensure that screen readers are able to navigate\n     * the dialogue popup correctly.\n     *\n     * @method accessibilityShow\n     */\n    Modal.prototype.accessibilityShow = function() {\n        // We need to get a list containing each sibling element and the shallowest\n        // non-ancestral nodes in the DOM. We can shortcut this a little by leveraging\n        // the fact that this dialogue is always appended to the document body therefore\n        // it's siblings are the shallowest non-ancestral nodes. If that changes then\n        // this code should also be updated.\n        $('body').children().each(function(index, child) {\n            // Skip the current modal.\n            if (!this.root.is(child)) {\n                child = $(child);\n                var hidden = child.attr('aria-hidden');\n                // If they are already hidden we can ignore them.\n                if (hidden !== 'true') {\n                    // Save their current state.\n                    child.data('previous-aria-hidden', hidden);\n                    this.hiddenSiblings.push(child);\n\n                    // Hide this node from screen readers.\n                    child.attr('aria-hidden', 'true');\n                }\n            }\n        }.bind(this));\n\n        // Make us visible to screen readers.\n        this.root.attr('aria-hidden', 'false');\n    };\n\n    /**\n     * Restores the aria visibility on the DOM elements changed when displaying\n     * the dialogue popup and makes the dialogue aria hidden to allow screen\n     * readers to navigate the main page correctly when the dialogue is closed.\n     *\n     * @method accessibilityHide\n     */\n    Modal.prototype.accessibilityHide = function() {\n        this.root.attr('aria-hidden', 'true');\n\n        // Restore the sibling nodes back to their original values.\n        $.each(this.hiddenSiblings, function(index, sibling) {\n            sibling = $(sibling);\n            var previousValue = sibling.data('previous-aria-hidden');\n            // If the element didn't previously have an aria-hidden attribute\n            // then we can just remove the one we set.\n            if (typeof previousValue == 'undefined') {\n                sibling.removeAttr('aria-hidden');\n            } else {\n                // Otherwise set it back to the old value (which will be false).\n                sibling.attr('aria-hidden', previousValue);\n            }\n        });\n\n        // Clear the cache. No longer need to store these.\n        this.hiddenSiblings = [];\n    };\n\n    /**\n     * Handle the tab event to lock focus within this modal.\n     *\n     * @method handleTabLock\n     * @param {event} e The tab key jQuery event\n     */\n    Modal.prototype.handleTabLock = function(e) {\n        if (!this.hasFocus()) {\n            return;\n        }\n\n        var target = $(document.activeElement);\n        var focusableElements = this.modal.find(SELECTORS.CAN_RECEIVE_FOCUS);\n        var firstFocusable = focusableElements.first();\n        var lastFocusable = focusableElements.last();\n\n        if (target.is(firstFocusable) && e.shiftKey) {\n            lastFocusable.focus();\n            e.preventDefault();\n        } else if (target.is(lastFocusable) && !e.shiftKey) {\n            firstFocusable.focus();\n            e.preventDefault();\n        }\n    };\n\n    /**\n     * Set up all of the event handling for the modal.\n     *\n     * @method registerEventListeners\n     */\n    Modal.prototype.registerEventListeners = function() {\n        this.getRoot().on('keydown', function(e) {\n            if (!this.isVisible()) {\n                return;\n            }\n\n            if (e.keyCode == KeyCodes.tab) {\n                this.handleTabLock(e);\n            } else if (e.keyCode == KeyCodes.escape) {\n                this.hide();\n            }\n        }.bind(this));\n\n        // Listen for clicks on the modal container.\n        this.getRoot().click(function(e) {\n            // If the click wasn't inside the modal element then we should\n            // hide the modal.\n            if (!$(e.target).closest(SELECTORS.MODAL).length) {\n                // The check above fails to detect the click was inside the modal when the DOM tree is already changed.\n                // So, we check if we can still find the container element or not. If not, then the DOM tree is changed.\n                // It's best not to hide the modal in that case.\n                if ($(e.target).closest(SELECTORS.CONTAINER).length) {\n                    this.hideIfNotForm();\n                }\n            }\n        }.bind(this));\n\n        CustomEvents.define(this.getModal(), [CustomEvents.events.activate]);\n        this.getModal().on(CustomEvents.events.activate, SELECTORS.HIDE, function(e, data) {\n            this.hide();\n            data.originalEvent.preventDefault();\n        }.bind(this));\n    };\n\n    /**\n     * Set or resolve and set the value using the function.\n     *\n     * @method asyncSet\n     * @param {(string|object)} value The string or jQuery promise.\n     * @param {function} setFunction The setter\n     * @return {Promise}\n     */\n    Modal.prototype.asyncSet = function(value, setFunction) {\n        var p = value;\n        if (typeof value !== 'object' || !value.hasOwnProperty('then')) {\n            p = $.Deferred();\n            p.resolve(value);\n        }\n\n        p.then(function(content) {\n            setFunction(content);\n\n            return;\n        })\n        .fail(Notification.exception);\n\n        return p;\n    };\n\n    return Modal;\n});\n"],"file":"modal.min.js"}
\ No newline at end of file
+{"version":3,"sources":["../src/modal.js"],"names":["define","$","Templates","Notification","KeyCodes","CustomEvents","ModalBackdrop","Event","ModalEvents","SELECTORS","CONTAINER","MODAL","HEADER","TITLE","BODY","FOOTER","HIDE","DIALOG","FORM","MENU_BAR","HAS_Z_INDEX","CAN_RECEIVE_FOCUS","TEMPLATES","LOADING","BACKDROP","backdropPromise","modalCounter","Modal","root","modal","find","header","title","body","footer","hiddenSiblings","isAttached","bodyJS","footerJS","modalCount","is","exception","message","length","registerEventListeners","prototype","attachToDOM","append","runTemplateJS","countOtherVisibleModals","count","each","index","element","hasClass","bind","getBackdrop","render","then","html","fail","getRoot","getModal","getTitle","getBody","getFooter","getModalCount","setTitle","value","asyncSet","setBody","notifyFilterContentUpdated","trigger","bodyRendered","jsPendingId","M","util","js_pending","contentPromise","css","state","height","innerHeight","animate","loadingIcon","hide","fadeIn","when","promise","fadeOut","js","result","isVisible","currentHeight","newHeight","opacity","duration","queue","always","js_complete","setFooter","showFooter","done","hasFooterContent","children","hideFooter","addClass","removeClass","setLarge","isLarge","setSmall","isSmall","calculateZIndex","items","zIndex","parseInt","item","itemZIndex","hasFocus","target","document","activeElement","has","hasTransitions","show","backdrop","currentIndex","newIndex","setZIndex","accessibilityShow","focus","shown","hideIfNotForm","formElement","accessibilityHide","one","hidden","destroy","remove","destroyed","child","attr","data","push","sibling","previousValue","removeAttr","handleTabLock","e","focusableElements","firstFocusable","first","lastFocusable","last","shiftKey","preventDefault","on","keyCode","tab","escape","click","closest","events","activate","originalEvent","setFunction","p","hasOwnProperty","Deferred","resolve","content"],"mappings":"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","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Contain the logic for modals.\n *\n * @module     core/modal\n * @class      modal\n * @package    core\n * @copyright  2016 Ryan Wyllie <ryan@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\ndefine(['jquery', 'core/templates', 'core/notification', 'core/key_codes',\n        'core/custom_interaction_events', 'core/modal_backdrop', 'core/event', 'core/modal_events'],\n     function($, Templates, Notification, KeyCodes, CustomEvents, ModalBackdrop, Event, ModalEvents) {\n\n    var SELECTORS = {\n        CONTAINER: '[data-region=\"modal-container\"]',\n        MODAL: '[data-region=\"modal\"]',\n        HEADER: '[data-region=\"header\"]',\n        TITLE: '[data-region=\"title\"]',\n        BODY: '[data-region=\"body\"]',\n        FOOTER: '[data-region=\"footer\"]',\n        HIDE: '[data-action=\"hide\"]',\n        DIALOG: '[role=dialog]',\n        FORM: 'form',\n        MENU_BAR: '[role=menubar]',\n        HAS_Z_INDEX: '.moodle-has-zindex',\n        CAN_RECEIVE_FOCUS: 'input:not([type=\"hidden\"]), a[href], button, textarea, select, [tabindex]',\n    };\n\n    var TEMPLATES = {\n        LOADING: 'core/loading',\n        BACKDROP: 'core/modal_backdrop',\n    };\n\n    /**\n     * Module singleton for the backdrop to be reused by all Modal instances.\n     */\n    var backdropPromise;\n\n    /**\n     * A counter that gets incremented for each modal created. This can be\n     * used to generate unique values for the modals.\n     */\n    var modalCounter = 0;\n\n    /**\n     * Constructor for the Modal.\n     *\n     * @param {object} root The root jQuery element for the modal\n     */\n    var Modal = function(root) {\n        this.root = $(root);\n        this.modal = this.root.find(SELECTORS.MODAL);\n        this.header = this.modal.find(SELECTORS.HEADER);\n        this.title = this.header.find(SELECTORS.TITLE);\n        this.body = this.modal.find(SELECTORS.BODY);\n        this.footer = this.modal.find(SELECTORS.FOOTER);\n        this.hiddenSiblings = [];\n        this.isAttached = false;\n        this.bodyJS = null;\n        this.footerJS = null;\n        this.modalCount = modalCounter++;\n\n        if (!this.root.is(SELECTORS.CONTAINER)) {\n            Notification.exception({message: 'Element is not a modal container'});\n        }\n\n        if (!this.modal.length) {\n            Notification.exception({message: 'Container does not contain a modal'});\n        }\n\n        if (!this.header.length) {\n            Notification.exception({message: 'Modal is missing a header region'});\n        }\n\n        if (!this.title.length) {\n            Notification.exception({message: 'Modal header is missing a title region'});\n        }\n\n        if (!this.body.length) {\n            Notification.exception({message: 'Modal is missing a body region'});\n        }\n\n        if (!this.footer.length) {\n            Notification.exception({message: 'Modal is missing a footer region'});\n        }\n\n        this.registerEventListeners();\n    };\n\n    /**\n     * Add the modal to the page, if it hasn't already been added. This includes running any\n     * javascript that has been cached until now.\n     *\n     * @method attachToDOM\n     */\n    Modal.prototype.attachToDOM = function() {\n        if (this.isAttached) {\n            return;\n        }\n\n        $('body').append(this.root);\n\n        // If we'd cached any JS then we can run it how that the modal is\n        // attached to the DOM.\n        if (this.bodyJS) {\n            Templates.runTemplateJS(this.bodyJS);\n            this.bodyJS = null;\n        }\n\n        if (this.footerJS) {\n            Templates.runTemplateJS(this.footerJS);\n            this.footerJS = null;\n        }\n\n        this.isAttached = true;\n    };\n\n    /**\n     * Count the number of other visible modals (not including this one).\n     *\n     * @method countOtherVisibleModals\n     * @return {int}\n     */\n    Modal.prototype.countOtherVisibleModals = function() {\n        var count = 0;\n        $('body').find(SELECTORS.CONTAINER).each(function(index, element) {\n            element = $(element);\n\n            // If we haven't found ourself and the element is visible.\n            if (!this.root.is(element) && element.hasClass('show')) {\n                count++;\n            }\n        }.bind(this));\n\n        return count;\n    };\n\n    /**\n     * Get the modal backdrop.\n     *\n     * @method getBackdrop\n     * @return {object} jQuery promise\n     */\n    Modal.prototype.getBackdrop = function() {\n        if (!backdropPromise) {\n            backdropPromise = Templates.render(TEMPLATES.BACKDROP, {})\n                .then(function(html) {\n                    var element = $(html);\n\n                    return new ModalBackdrop(element);\n                })\n                .fail(Notification.exception);\n        }\n\n        return backdropPromise;\n    };\n\n    /**\n     * Get the root element of this modal.\n     *\n     * @method getRoot\n     * @return {object} jQuery object\n     */\n    Modal.prototype.getRoot = function() {\n        return this.root;\n    };\n\n    /**\n     * Get the modal element of this modal.\n     *\n     * @method getModal\n     * @return {object} jQuery object\n     */\n    Modal.prototype.getModal = function() {\n        return this.modal;\n    };\n\n    /**\n     * Get the modal title element.\n     *\n     * @method getTitle\n     * @return {object} jQuery object\n     */\n    Modal.prototype.getTitle = function() {\n        return this.title;\n    };\n\n    /**\n     * Get the modal body element.\n     *\n     * @method getBody\n     * @return {object} jQuery object\n     */\n    Modal.prototype.getBody = function() {\n        return this.body;\n    };\n\n    /**\n     * Get the modal footer element.\n     *\n     * @method getFooter\n     * @return {object} jQuery object\n     */\n    Modal.prototype.getFooter = function() {\n        return this.footer;\n    };\n\n    /**\n     * Get the unique modal count.\n     *\n     * @method getModalCount\n     * @return {int}\n     */\n    Modal.prototype.getModalCount = function() {\n        return this.modalCount;\n    };\n\n    /**\n     * Set the modal title element.\n     *\n     * This method is overloaded to take either a string value for the title or a jQuery promise that is resolved with\n     * HTML most commonly from a Str.get_string call.\n     *\n     * @method setTitle\n     * @param {(string|object)} value The title string or jQuery promise which resolves to the title.\n     */\n    Modal.prototype.setTitle = function(value) {\n        var title = this.getTitle();\n\n        this.asyncSet(value, title.html.bind(title));\n    };\n\n    /**\n     * Set the modal body element.\n     *\n     * This method is overloaded to take either a string value for the body or a jQuery promise that is resolved with\n     * HTML and Javascript most commonly from a Templates.render call.\n     *\n     * @method setBody\n     * @param {(string|object)} value The body string or jQuery promise which resolves to the body.\n     */\n    Modal.prototype.setBody = function(value) {\n        var body = this.getBody();\n\n        if (typeof value === 'string') {\n            // Just set the value if it's a string.\n            body.html(value);\n            Event.notifyFilterContentUpdated(body);\n            this.getRoot().trigger(ModalEvents.bodyRendered, this);\n        } else {\n            var jsPendingId = 'amd-modal-js-pending-id-' + this.getModalCount();\n            M.util.js_pending(jsPendingId);\n            // Otherwise we assume it's a promise to be resolved with\n            // html and javascript.\n            var contentPromise = null;\n            body.css('overflow', 'hidden');\n\n            if (value.state() == 'pending') {\n                // We're still waiting for the body promise to resolve so\n                // let's show a loading icon.\n                var height = body.innerHeight();\n                if (height < 100) {\n                    height = 100;\n                }\n\n                body.animate({height: height + 'px'}, 150);\n\n                body.html('');\n                contentPromise = Templates.render(TEMPLATES.LOADING, {})\n                    .then(function(html) {\n                        var loadingIcon = $(html).hide();\n                        body.html(loadingIcon);\n                        loadingIcon.fadeIn(150);\n\n                        // We only want the loading icon to fade out\n                        // when the content for the body has finished\n                        // loading.\n                        return $.when(loadingIcon.promise(), value);\n                    })\n                    .then(function(loadingIcon) {\n                        // Once the content has finished loading and\n                        // the loading icon has been shown then we can\n                        // fade the icon away to reveal the content.\n                        return loadingIcon.fadeOut(100).promise();\n                    })\n                    .then(function() {\n                        return value;\n                    });\n            } else {\n                // The content is already loaded so let's just display\n                // it to the user. No need for a loading icon.\n                contentPromise = value;\n            }\n\n            // Now we can actually display the content.\n            contentPromise.then(function(html, js) {\n                var result = null;\n\n                if (this.isVisible()) {\n                    // If the modal is visible then we should display\n                    // the content gracefully for the user.\n                    body.css('opacity', 0);\n                    var currentHeight = body.innerHeight();\n                    body.html(html);\n                    // We need to clear any height values we've set here\n                    // in order to measure the height of the content being\n                    // added. This then allows us to animate the height\n                    // transition.\n                    body.css('height', '');\n                    var newHeight = body.innerHeight();\n                    body.css('height', currentHeight + 'px');\n                    result = body.animate(\n                        {height: newHeight + 'px', opacity: 1},\n                        {duration: 150, queue: false}\n                    ).promise();\n                } else {\n                    // Since the modal isn't visible we can just immediately\n                    // set the content. No need to animate it.\n                    body.html(html);\n                }\n\n                if (js) {\n                    if (this.isAttached) {\n                        // If we're in the DOM then run the JS immediately.\n                        Templates.runTemplateJS(js);\n                    } else {\n                        // Otherwise cache it to be run when we're attached.\n                        this.bodyJS = js;\n                    }\n                }\n\n                return result;\n            }.bind(this))\n            .then(function(result) {\n                Event.notifyFilterContentUpdated(body);\n                this.getRoot().trigger(ModalEvents.bodyRendered, this);\n                return result;\n            }.bind(this))\n            .fail(Notification.exception)\n            .always(function() {\n                // When we're done displaying all of the content we need\n                // to clear the custom values we've set here.\n                body.css('height', '');\n                body.css('overflow', '');\n                body.css('opacity', '');\n                M.util.js_complete(jsPendingId);\n\n                return;\n            })\n            .fail(Notification.exception);\n        }\n    };\n\n    /**\n     * Set the modal footer element. The footer element is made visible, if it\n     * isn't already.\n     *\n     * This method is overloaded to take either a string\n     * value for the body or a jQuery promise that is resolved with HTML and Javascript\n     * most commonly from a Templates.render call.\n     *\n     * @method setFooter\n     * @param {(string|object)} value The footer string or jQuery promise\n     */\n    Modal.prototype.setFooter = function(value) {\n        // Make sure the footer is visible.\n        this.showFooter();\n\n        var footer = this.getFooter();\n\n        if (typeof value === 'string') {\n            // Just set the value if it's a string.\n            footer.html(value);\n        } else {\n            // Otherwise we assume it's a promise to be resolved with\n            // html and javascript.\n            Templates.render(TEMPLATES.LOADING, {}).done(function(html) {\n                footer.html(html);\n\n                value.done(function(html, js) {\n                    footer.html(html);\n\n                    if (js) {\n                        if (this.isAttached) {\n                            // If we're in the DOM then run the JS immediately.\n                            Templates.runTemplateJS(js);\n                        } else {\n                            // Otherwise cache it to be run when we're attached.\n                            this.footerJS = js;\n                        }\n                    }\n                }.bind(this));\n            }.bind(this));\n        }\n    };\n\n    /**\n     * Check if the footer has any content in it.\n     *\n     * @method hasFooterContent\n     * @return {bool}\n     */\n    Modal.prototype.hasFooterContent = function() {\n        return this.getFooter().children().length ? true : false;\n    };\n\n    /**\n     * Hide the footer element.\n     *\n     * @method hideFooter\n     */\n    Modal.prototype.hideFooter = function() {\n        this.getFooter().addClass('hidden');\n    };\n\n    /**\n     * Show the footer element.\n     *\n     * @method showFooter\n     */\n    Modal.prototype.showFooter = function() {\n        this.getFooter().removeClass('hidden');\n    };\n\n    /**\n     * Mark the modal as a large modal.\n     *\n     * @method setLarge\n     */\n    Modal.prototype.setLarge = function() {\n        if (this.isLarge()) {\n            return;\n        }\n\n        this.getModal().addClass('modal-lg');\n    };\n\n    /**\n     * Check if the modal is a large modal.\n     *\n     * @method isLarge\n     * @return {bool}\n     */\n    Modal.prototype.isLarge = function() {\n        return this.getModal().hasClass('modal-lg');\n    };\n\n    /**\n     * Mark the modal as a small modal.\n     *\n     * @method setSmall\n     */\n    Modal.prototype.setSmall = function() {\n        if (this.isSmall()) {\n            return;\n        }\n\n        this.getModal().removeClass('modal-lg');\n    };\n\n    /**\n     * Check if the modal is a small modal.\n     *\n     * @method isSmall\n     * @return {bool}\n     */\n    Modal.prototype.isSmall = function() {\n        return !this.getModal().hasClass('modal-lg');\n    };\n\n    /**\n     * Determine the highest z-index value currently on the page.\n     *\n     * @method calculateZIndex\n     * @return {int}\n     */\n    Modal.prototype.calculateZIndex = function() {\n        var items = $(SELECTORS.DIALOG + ', ' + SELECTORS.MENU_BAR + ', ' + SELECTORS.HAS_Z_INDEX);\n        var zIndex = parseInt(this.root.css('z-index'));\n\n        items.each(function(index, item) {\n            item = $(item);\n            // Note that webkit browsers won't return the z-index value from the CSS stylesheet\n            // if the element doesn't have a position specified. Instead it'll return \"auto\".\n            var itemZIndex = item.css('z-index') ? parseInt(item.css('z-index')) : 0;\n\n            if (itemZIndex > zIndex) {\n                zIndex = itemZIndex;\n            }\n        });\n\n        return zIndex;\n    };\n\n    /**\n     * Check if this modal is visible.\n     *\n     * @method isVisible\n     * @return {bool}\n     */\n    Modal.prototype.isVisible = function() {\n        return this.root.hasClass('show');\n    };\n\n    /**\n     * Check if this modal has focus.\n     *\n     * @method hasFocus\n     * @return {bool}\n     */\n    Modal.prototype.hasFocus = function() {\n        var target = $(document.activeElement);\n        return this.root.is(target) || this.root.has(target).length;\n    };\n\n    /**\n     * Check if this modal has CSS transitions applied.\n     *\n     * @method hasTransitions\n     * @return {bool}\n     */\n    Modal.prototype.hasTransitions = function() {\n        return this.getRoot().hasClass('fade');\n    };\n\n    /**\n     * Display this modal. The modal will be attached to the DOM if it hasn't\n     * already been.\n     *\n     * @method show\n     */\n    Modal.prototype.show = function() {\n        if (this.isVisible()) {\n            return;\n        }\n\n        if (this.hasFooterContent()) {\n            this.showFooter();\n        } else {\n            this.hideFooter();\n        }\n\n        if (!this.isAttached) {\n            this.attachToDOM();\n        }\n\n        this.getBackdrop().done(function(backdrop) {\n            var currentIndex = this.calculateZIndex();\n            var newIndex = currentIndex + 2;\n            var newBackdropIndex = newIndex - 1;\n            this.root.css('z-index', newIndex);\n            backdrop.setZIndex(newBackdropIndex);\n            backdrop.show();\n\n            this.root.removeClass('hide').addClass('show');\n            this.accessibilityShow();\n            this.getModal().focus();\n            $('body').addClass('modal-open');\n            this.root.trigger(ModalEvents.shown, this);\n        }.bind(this));\n    };\n\n    /**\n     * Hide this modal if it does not contain a form.\n     *\n     * @method hideIfNotForm\n     */\n    Modal.prototype.hideIfNotForm = function() {\n        var formElement = this.modal.find(SELECTORS.FORM);\n        if (formElement.length == 0) {\n            this.hide();\n        }\n    };\n\n    /**\n     * Hide this modal.\n     *\n     * @method hide\n     */\n    Modal.prototype.hide = function() {\n        this.getBackdrop().done(function(backdrop) {\n            if (!this.countOtherVisibleModals()) {\n                // Hide the backdrop if we're the last open modal.\n                backdrop.hide();\n                $('body').removeClass('modal-open');\n            }\n\n            var currentIndex = parseInt(this.root.css('z-index'));\n            this.root.css('z-index', '');\n            backdrop.setZIndex(currentIndex - 3);\n\n            this.accessibilityHide();\n\n            if (this.hasTransitions()) {\n                // Wait for CSS transitions to complete before hiding the element.\n                this.getRoot().one('transitionend webkitTransitionEnd oTransitionEnd', function() {\n                    this.getRoot().removeClass('show').addClass('hide');\n                }.bind(this));\n            } else {\n                this.getRoot().removeClass('show').addClass('hide');\n            }\n\n            this.root.trigger(ModalEvents.hidden, this);\n        }.bind(this));\n    };\n\n    /**\n     * Remove this modal from the DOM.\n     *\n     * @method destroy\n     */\n    Modal.prototype.destroy = function() {\n        this.root.remove();\n        this.root.trigger(ModalEvents.destroyed, this);\n    };\n\n    /**\n     * Sets the appropriate aria attributes on this dialogue and the other\n     * elements in the DOM to ensure that screen readers are able to navigate\n     * the dialogue popup correctly.\n     *\n     * @method accessibilityShow\n     */\n    Modal.prototype.accessibilityShow = function() {\n        // We need to get a list containing each sibling element and the shallowest\n        // non-ancestral nodes in the DOM. We can shortcut this a little by leveraging\n        // the fact that this dialogue is always appended to the document body therefore\n        // it's siblings are the shallowest non-ancestral nodes. If that changes then\n        // this code should also be updated.\n        $('body').children().each(function(index, child) {\n            // Skip the current modal.\n            if (!this.root.is(child)) {\n                child = $(child);\n                var hidden = child.attr('aria-hidden');\n                // If they are already hidden we can ignore them.\n                if (hidden !== 'true') {\n                    // Save their current state.\n                    child.data('previous-aria-hidden', hidden);\n                    this.hiddenSiblings.push(child);\n\n                    // Hide this node from screen readers.\n                    child.attr('aria-hidden', 'true');\n                }\n            }\n        }.bind(this));\n\n        // Make us visible to screen readers.\n        this.root.attr('aria-hidden', 'false');\n    };\n\n    /**\n     * Restores the aria visibility on the DOM elements changed when displaying\n     * the dialogue popup and makes the dialogue aria hidden to allow screen\n     * readers to navigate the main page correctly when the dialogue is closed.\n     *\n     * @method accessibilityHide\n     */\n    Modal.prototype.accessibilityHide = function() {\n        this.root.attr('aria-hidden', 'true');\n\n        // Restore the sibling nodes back to their original values.\n        $.each(this.hiddenSiblings, function(index, sibling) {\n            sibling = $(sibling);\n            var previousValue = sibling.data('previous-aria-hidden');\n            // If the element didn't previously have an aria-hidden attribute\n            // then we can just remove the one we set.\n            if (typeof previousValue == 'undefined') {\n                sibling.removeAttr('aria-hidden');\n            } else {\n                // Otherwise set it back to the old value (which will be false).\n                sibling.attr('aria-hidden', previousValue);\n            }\n        });\n\n        // Clear the cache. No longer need to store these.\n        this.hiddenSiblings = [];\n    };\n\n    /**\n     * Handle the tab event to lock focus within this modal.\n     *\n     * @method handleTabLock\n     * @param {event} e The tab key jQuery event\n     */\n    Modal.prototype.handleTabLock = function(e) {\n        if (!this.hasFocus()) {\n            return;\n        }\n\n        var target = $(document.activeElement);\n        var focusableElements = this.modal.find(SELECTORS.CAN_RECEIVE_FOCUS);\n        var firstFocusable = focusableElements.first();\n        var lastFocusable = focusableElements.last();\n\n        if (target.is(firstFocusable) && e.shiftKey) {\n            lastFocusable.focus();\n            e.preventDefault();\n        } else if (target.is(lastFocusable) && !e.shiftKey) {\n            firstFocusable.focus();\n            e.preventDefault();\n        }\n    };\n\n    /**\n     * Set up all of the event handling for the modal.\n     *\n     * @method registerEventListeners\n     */\n    Modal.prototype.registerEventListeners = function() {\n        this.getRoot().on('keydown', function(e) {\n            if (!this.isVisible()) {\n                return;\n            }\n\n            if (e.keyCode == KeyCodes.tab) {\n                this.handleTabLock(e);\n            } else if (e.keyCode == KeyCodes.escape) {\n                this.hide();\n            }\n        }.bind(this));\n\n        // Listen for clicks on the modal container.\n        this.getRoot().click(function(e) {\n            // If the click wasn't inside the modal element then we should\n            // hide the modal.\n            if (!$(e.target).closest(SELECTORS.MODAL).length) {\n                // The check above fails to detect the click was inside the modal when the DOM tree is already changed.\n                // So, we check if we can still find the container element or not. If not, then the DOM tree is changed.\n                // It's best not to hide the modal in that case.\n                if ($(e.target).closest(SELECTORS.CONTAINER).length) {\n                    this.hideIfNotForm();\n                }\n            }\n        }.bind(this));\n\n        CustomEvents.define(this.getModal(), [CustomEvents.events.activate]);\n        this.getModal().on(CustomEvents.events.activate, SELECTORS.HIDE, function(e, data) {\n            this.hide();\n            data.originalEvent.preventDefault();\n        }.bind(this));\n    };\n\n    /**\n     * Set or resolve and set the value using the function.\n     *\n     * @method asyncSet\n     * @param {(string|object)} value The string or jQuery promise.\n     * @param {function} setFunction The setter\n     * @return {Promise}\n     */\n    Modal.prototype.asyncSet = function(value, setFunction) {\n        var p = value;\n        if (typeof value !== 'object' || !value.hasOwnProperty('then')) {\n            p = $.Deferred();\n            p.resolve(value);\n        }\n\n        p.then(function(content) {\n            setFunction(content);\n\n            return;\n        })\n        .fail(Notification.exception);\n\n        return p;\n    };\n\n    return Modal;\n});\n"],"file":"modal.min.js"}
\ No newline at end of file
diff --git a/lib/amd/src/modal.js b/lib/amd/src/modal.js
index 4e61d10ac26..a44a43ad9a0 100644
--- a/lib/amd/src/modal.js
+++ b/lib/amd/src/modal.js
@@ -343,9 +343,12 @@ define(['jquery', 'core/templates', 'core/notification', 'core/key_codes',
                         this.bodyJS = js;
                     }
                 }
+
+                return result;
+            }.bind(this))
+            .then(function(result) {
                 Event.notifyFilterContentUpdated(body);
                 this.getRoot().trigger(ModalEvents.bodyRendered, this);
-
                 return result;
             }.bind(this))
             .fail(Notification.exception)
diff --git a/lib/classes/output/icon_system_fontawesome.php b/lib/classes/output/icon_system_fontawesome.php
index 84a6cbb89cf..661f0bccfec 100644
--- a/lib/classes/output/icon_system_fontawesome.php
+++ b/lib/classes/output/icon_system_fontawesome.php
@@ -195,6 +195,7 @@ class icon_system_fontawesome extends icon_system_font {
             'core:i/assignroles' => 'fa-user-plus',
             'core:i/backup' => 'fa-file-zip-o',
             'core:i/badge' => 'fa-shield',
+            'core:i/breadcrumbdivider' => 'fa-angle-right',
             'core:i/calc' => 'fa-calculator',
             'core:i/calendar' => 'fa-calendar',
             'core:i/calendareventdescription' => 'fa-align-left',
@@ -241,6 +242,7 @@ class icon_system_fontawesome extends icon_system_font {
             'core:i/grade_incorrect' => 'fa-remove text-danger',
             'core:i/grade_partiallycorrect' => 'fa-check-square',
             'core:i/grades' => 'fa-table',
+            'core:i/grading' => 'fa-magic',
             'core:i/groupevent' => 'fa-group',
             'core:i/groupn' => 'fa-user',
             'core:i/group' => 'fa-users',
diff --git a/lib/templates/drawer.mustache b/lib/templates/drawer.mustache
index 39c237490e3..e21fd2f037f 100644
--- a/lib/templates/drawer.mustache
+++ b/lib/templates/drawer.mustache
@@ -33,9 +33,9 @@
 }}
 <div
     id="{{$drawerid}}drawer-{{uniqid}}{{/drawerid}}"
-    class="{{$drawerclasses}}{{/drawerclasses}} drawer bg-white hidden"
-    aria-expanded="false"
-    aria-hidden="true"
+    class="{{$drawerclasses}}{{/drawerclasses}} drawer bg-white {{^show}}hidden{{/show}}"
+    aria-expanded="{{#show}}true{{/show}}{{^show}}false{{/show}}"
+    aria-hidden="{{#show}}false{{/show}}{{^show}}true{{/show}}"
     data-region="right-hand-drawer"
     role="region"
     tabindex="-1"
diff --git a/mod/forum/amd/build/grades/expandconversation.min.js b/mod/forum/amd/build/grades/expandconversation.min.js
index 4e07f093d2d..3a23728bb86 100644
--- a/mod/forum/amd/build/grades/expandconversation.min.js
+++ b/mod/forum/amd/build/grades/expandconversation.min.js
@@ -1,2 +1,2 @@
-define ("mod_forum/grades/expandconversation",["exports","./grader/selectors","mod_forum/repository","core/notification","core/templates","core/modal_factory","core/modal_events"],function(a,b,c,d,e,f,g){"use strict";Object.defineProperty(a,"__esModule",{value:!0});a.registerEventListeners=void 0;b=i(b);c=h(c);e=h(e);f=i(f);g=i(g);function h(a){return a&&a.__esModule?a:{default:a}}function i(a){if(a&&a.__esModule){return a}else{var b={};if(null!=a){for(var c in a){if(Object.prototype.hasOwnProperty.call(a,c)){var d=Object.defineProperty&&Object.getOwnPropertyDescriptor?Object.getOwnPropertyDescriptor(a,c):{};if(d.get||d.set){Object.defineProperty(b,c,d)}else{b[c]=a[c]}}}}b.default=a;return b}}function j(a,b){return m(a)||l(a,b)||k()}function k(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}function l(a,b){var c=[],d=!0,e=!1,f=void 0;try{for(var g=a[Symbol.iterator](),h;!(d=(h=g.next()).done);d=!0){c.push(h.value);if(b&&c.length===b)break}}catch(a){e=!0;f=a}finally{try{if(!d&&null!=g["return"])g["return"]()}finally{if(e)throw f}}return c}function m(a){if(Array.isArray(a))return a}function n(a,b,c,d,e,f,g){try{var h=a[f](g),i=h.value}catch(a){c(a);return}if(h.done){b(i)}else{Promise.resolve(i).then(d,e)}}function o(a){return function(){var b=this,c=arguments;return new Promise(function(d,e){var h=a.apply(b,c);function f(a){n(h,d,e,f,g,"next",a)}function g(a){n(h,d,e,f,g,"throw",a)}f(void 0)})}}var p=function(a){return a.closest(b.expandConversation)},q=function(){var a=o(regeneratorRuntime.mark(function a(b){var d,h,i,k,l,m,n,o,p;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:d=b.dataset.postid;h=b.dataset.discussionid;i=b.dataset.name;a.next=5;return Promise.all([c.default.getDiscussionPosts(parseInt(h)),f.create({title:i,large:!0,type:f.types.CANCEL})]);case 5:k=a.sent;l=j(k,2);m=l[0];n=l[1];o=m.posts.map(function(a){a.subject=null;a.readonly=!0;a.html.rating=null;return a});n.getRoot().on(g.hidden,function(){n.destroy()});n.show();p=e.default.render("mod_forum/grades/grader/discussion/post_modal",o);n.setBody(p);p.then(function(){var a=n.getRoot()[0].querySelector("#p".concat(d));if(a){a.scrollIntoView({behavior:"smooth"})}return});case 15:case"end":return a.stop();}}},a)}));return function(){return a.apply(this,arguments)}}();a.registerEventListeners=function registerEventListeners(a){a.addEventListener("click",function(a){var b=p(a.target);if(b){a.preventDefault();try{q(b)}catch(a){(0,d.exception)(a)}}})}});
+define ("mod_forum/grades/expandconversation",["exports","./grader/selectors","mod_forum/repository","core/notification","core/templates","core/modal_factory","core/modal_events"],function(a,b,c,d,e,f,g){"use strict";Object.defineProperty(a,"__esModule",{value:!0});a.registerEventListeners=void 0;b=i(b);c=h(c);e=h(e);f=i(f);g=i(g);function h(a){return a&&a.__esModule?a:{default:a}}function i(a){if(a&&a.__esModule){return a}else{var b={};if(null!=a){for(var c in a){if(Object.prototype.hasOwnProperty.call(a,c)){var d=Object.defineProperty&&Object.getOwnPropertyDescriptor?Object.getOwnPropertyDescriptor(a,c):{};if(d.get||d.set){Object.defineProperty(b,c,d)}else{b[c]=a[c]}}}}b.default=a;return b}}function j(a,b){return m(a)||l(a,b)||k()}function k(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}function l(a,b){var c=[],d=!0,e=!1,f=void 0;try{for(var g=a[Symbol.iterator](),h;!(d=(h=g.next()).done);d=!0){c.push(h.value);if(b&&c.length===b)break}}catch(a){e=!0;f=a}finally{try{if(!d&&null!=g["return"])g["return"]()}finally{if(e)throw f}}return c}function m(a){if(Array.isArray(a))return a}function n(a,b,c,d,e,f,g){try{var h=a[f](g),i=h.value}catch(a){c(a);return}if(h.done){b(i)}else{Promise.resolve(i).then(d,e)}}function o(a){return function(){var b=this,c=arguments;return new Promise(function(d,e){var h=a.apply(b,c);function f(a){n(h,d,e,f,g,"next",a)}function g(a){n(h,d,e,f,g,"throw",a)}f(void 0)})}}var p=function(a){return a.closest(b.expandConversation)},q=function(){var a=o(regeneratorRuntime.mark(function a(b){var d,h,i,k,l,m,n,o,p,q,r;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:d=b.dataset.postid;h=b.dataset.discussionid;i=b.dataset.name;k="1"==b.dataset.experimentalDisplayMode;a.next=6;return Promise.all([c.default.getDiscussionPosts(parseInt(h)),f.create({title:i,large:!0,type:f.types.CANCEL})]);case 6:l=a.sent;m=j(l,2);n=m[0];o=m[1];p=new Map(n.posts.map(function(a){a.readonly=!0;a.hasreplies=!1;a.replies=[];return[a.id,a]}));q=[];n.posts.forEach(function(a){if(a.parentid){var b=p.get(a.parentid);if(b){a.parentauthorname=b.author.fullname;b.hasreplies=!0;b.replies.push(a)}else{q.push(a)}}else{q.push(a)}});o.getRoot().on(g.hidden,function(){o.destroy()});o.getRoot().on(g.bodyRendered,function(){var a=o.getRoot()[0].querySelector("#p".concat(d));if(a){a.scrollIntoView({behavior:"smooth"})}});o.show();r=e.default.render("mod_forum/grades/grader/discussion/post_modal",{posts:q,experimentaldisplaymode:k});o.setBody(r);case 18:case"end":return a.stop();}}},a)}));return function(){return a.apply(this,arguments)}}();a.registerEventListeners=function registerEventListeners(a){a.addEventListener("click",function(a){var b=p(a.target);if(b){a.preventDefault();try{q(b)}catch(a){(0,d.exception)(a)}}})}});
 //# sourceMappingURL=expandconversation.min.js.map
diff --git a/mod/forum/amd/build/grades/expandconversation.min.js.map b/mod/forum/amd/build/grades/expandconversation.min.js.map
index 1f1bf289264..83788db5786 100644
--- a/mod/forum/amd/build/grades/expandconversation.min.js.map
+++ b/mod/forum/amd/build/grades/expandconversation.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../../src/grades/expandconversation.js"],"names":["findGradableNode","node","closest","ForumSelectors","expandConversation","showPostInContext","rootNode","postId","dataset","postid","discussionId","discussionid","discussionName","name","Promise","all","Repository","getDiscussionPosts","parseInt","Modal","create","title","large","type","types","CANCEL","allPosts","modal","userPosts","posts","map","post","subject","readonly","html","rating","getRoot","on","ModalEvents","hidden","destroy","show","templatePromise","Templates","render","setBody","then","relevantPost","querySelector","scrollIntoView","behavior","registerEventListeners","addEventListener","e","target","preventDefault","err"],"mappings":"0SAuBA,OACA,OAEA,OACA,OACA,O,4lCAQMA,CAAAA,CAAgB,CAAG,SAAAC,CAAI,QAAIA,CAAAA,CAAI,CAACC,OAAL,CAAaC,CAAc,CAACC,kBAA5B,CAAJ,C,CAOvBC,CAAiB,4CAAG,WAAMC,CAAN,yGAChBC,CADgB,CACPD,CAAQ,CAACE,OAAT,CAAiBC,MADV,CAEhBC,CAFgB,CAEDJ,CAAQ,CAACE,OAAT,CAAiBG,YAFhB,CAGhBC,CAHgB,CAGCN,CAAQ,CAACE,OAAT,CAAiBK,IAHlB,gBAQZC,CAAAA,OAAO,CAACC,GAAR,CAAY,CAClBC,UAAWC,kBAAX,CAA8BC,QAAQ,CAACR,CAAD,CAAtC,CADkB,CAElBS,CAAK,CAACC,MAAN,CAAa,CACTC,KAAK,CAAET,CADE,CAETU,KAAK,GAFI,CAGTC,IAAI,CAAEJ,CAAK,CAACK,KAAN,CAAYC,MAHT,CAAb,CAFkB,CAAZ,CARY,0BAMlBC,CANkB,MAOlBC,CAPkB,MAiBhBC,CAjBgB,CAiBJF,CAAQ,CAACG,KAAT,CAAeC,GAAf,CAAmB,SAACC,CAAD,CAAU,CAC3CA,CAAI,CAACC,OAAL,CAAe,IAAf,CACAD,CAAI,CAACE,QAAL,IACAF,CAAI,CAACG,IAAL,CAAUC,MAAV,CAAmB,IAAnB,CAEA,MAAOJ,CAAAA,CACV,CANiB,CAjBI,CA0BtBJ,CAAK,CAACS,OAAN,GAAgBC,EAAhB,CAAmBC,CAAW,CAACC,MAA/B,CAAuC,UAAW,CAE9CZ,CAAK,CAACa,OAAN,EACH,CAHD,EAKAb,CAAK,CAACc,IAAN,GAGMC,CAlCgB,CAkCEC,UAAUC,MAAV,CAAiB,+CAAjB,CAAkEhB,CAAlE,CAlCF,CAmCtBD,CAAK,CAACkB,OAAN,CAAcH,CAAd,EAEAA,CAAe,CAACI,IAAhB,CAAqB,UAAM,CACvB,GAAMC,CAAAA,CAAY,CAAGpB,CAAK,CAACS,OAAN,GAAgB,CAAhB,EAAmBY,aAAnB,aAAsCzC,CAAtC,EAArB,CACA,GAAIwC,CAAJ,CAAkB,CACdA,CAAY,CAACE,cAAb,CAA4B,CAACC,QAAQ,CAAE,QAAX,CAA5B,CACH,CAED,MACH,CAPD,EArCsB,yCAAH,uD,0BAoDe,QAAzBC,CAAAA,sBAAyB,CAAC7C,CAAD,CAAc,CAChDA,CAAQ,CAAC8C,gBAAT,CAA0B,OAA1B,CAAmC,SAACC,CAAD,CAAO,CACtC,GAAM/C,CAAAA,CAAQ,CAAGN,CAAgB,CAACqD,CAAC,CAACC,MAAH,CAAjC,CAEA,GAAIhD,CAAJ,CAAc,CACV+C,CAAC,CAACE,cAAF,GAEA,GAAI,CACAlD,CAAiB,CAACC,CAAD,CACpB,CAAC,MAAOkD,CAAP,CAAY,CACV,gBAAcA,CAAd,CACH,CACJ,CACJ,CAZD,CAaH,C","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * This module handles the creation of a Modal that shows the user's post in context of the entire discussion.\n *\n * @module     mod_forum/grades/expandconversation\n * @package    mod_forum\n * @copyright  2019 Mathew May <mathew.solutions>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\nimport * as ForumSelectors from './grader/selectors';\nimport Repository from 'mod_forum/repository';\nimport {exception as showException} from \"core/notification\";\nimport Templates from 'core/templates';\nimport * as Modal from 'core/modal_factory';\nimport * as ModalEvents from 'core/modal_events';\n\n/**\n * Find the Node containing the gradable details from the provided node by searching up the tree.\n *\n * @param {HTMLElement} node\n * @returns {HTMLElement}\n */\nconst findGradableNode = node => node.closest(ForumSelectors.expandConversation);\n\n/**\n * Show the post in context in a modal.\n *\n * @param {HTMLElement} rootNode The button that has been clicked\n */\nconst showPostInContext = async(rootNode) => {\n    const postId = rootNode.dataset.postid;\n    const discussionId = rootNode.dataset.discussionid;\n    const discussionName = rootNode.dataset.name;\n\n    const [\n        allPosts,\n        modal,\n    ] = await Promise.all([\n        Repository.getDiscussionPosts(parseInt(discussionId)),\n        Modal.create({\n            title: discussionName,\n            large: true,\n            type: Modal.types.CANCEL\n        }),\n    ]);\n\n    const userPosts = allPosts.posts.map((post) => {\n        post.subject = null;\n        post.readonly = true;\n        post.html.rating = null;\n\n        return post;\n    });\n\n    // Handle hidden event.\n    modal.getRoot().on(ModalEvents.hidden, function() {\n        // Destroy when hidden.\n        modal.destroy();\n    });\n\n    modal.show();\n\n    // Note: We do not use await here because it messes with the Modal transitions.\n    const templatePromise = Templates.render('mod_forum/grades/grader/discussion/post_modal', userPosts);\n    modal.setBody(templatePromise);\n    // eslint-disable-next-line promise/catch-or-return\n    templatePromise.then(() => {\n        const relevantPost = modal.getRoot()[0].querySelector(`#p${postId}`);\n        if (relevantPost) {\n            relevantPost.scrollIntoView({behavior: \"smooth\"});\n        }\n\n        return;\n    });\n};\n\n/**\n * Register event listeners for the expand conversations button.\n *\n * @param {HTMLElement} rootNode The root to listen to.\n */\nexport const registerEventListeners = (rootNode) => {\n    rootNode.addEventListener('click', (e) => {\n        const rootNode = findGradableNode(e.target);\n\n        if (rootNode) {\n            e.preventDefault();\n\n            try {\n                showPostInContext(rootNode);\n            } catch (err) {\n                showException(err);\n            }\n        }\n    });\n};\n"],"file":"expandconversation.min.js"}
\ No newline at end of file
+{"version":3,"sources":["../../src/grades/expandconversation.js"],"names":["findGradableNode","node","closest","ForumSelectors","expandConversation","showPostInContext","rootNode","postId","dataset","postid","discussionId","discussionid","discussionName","name","experimentalDisplayMode","Promise","all","Repository","getDiscussionPosts","parseInt","Modal","create","title","large","type","types","CANCEL","allPosts","modal","postsById","Map","posts","map","post","readonly","hasreplies","replies","id","forEach","parentid","parent","get","parentauthorname","author","fullname","push","getRoot","on","ModalEvents","hidden","destroy","bodyRendered","relevantPost","querySelector","scrollIntoView","behavior","show","templatePromise","Templates","render","experimentaldisplaymode","setBody","registerEventListeners","addEventListener","e","target","preventDefault","err"],"mappings":"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","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * This module handles the creation of a Modal that shows the user's post in context of the entire discussion.\n *\n * @module     mod_forum/grades/expandconversation\n * @package    mod_forum\n * @copyright  2019 Mathew May <mathew.solutions>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\nimport * as ForumSelectors from './grader/selectors';\nimport Repository from 'mod_forum/repository';\nimport {exception as showException} from \"core/notification\";\nimport Templates from 'core/templates';\nimport * as Modal from 'core/modal_factory';\nimport * as ModalEvents from 'core/modal_events';\n\n/**\n * Find the Node containing the gradable details from the provided node by searching up the tree.\n *\n * @param {HTMLElement} node\n * @returns {HTMLElement}\n */\nconst findGradableNode = node => node.closest(ForumSelectors.expandConversation);\n\n/**\n * Show the post in context in a modal.\n *\n * @param {HTMLElement} rootNode The button that has been clicked\n */\nconst showPostInContext = async(rootNode) => {\n    const postId = rootNode.dataset.postid;\n    const discussionId = rootNode.dataset.discussionid;\n    const discussionName = rootNode.dataset.name;\n    const experimentalDisplayMode = rootNode.dataset.experimentalDisplayMode == \"1\";\n\n    const [\n        allPosts,\n        modal,\n    ] = await Promise.all([\n        Repository.getDiscussionPosts(parseInt(discussionId)),\n        Modal.create({\n            title: discussionName,\n            large: true,\n            type: Modal.types.CANCEL\n        }),\n    ]);\n\n    const postsById = new Map(allPosts.posts.map(post => {\n        post.readonly = true;\n        post.hasreplies = false;\n        post.replies = [];\n        return [post.id, post];\n    }));\n\n    let posts = [];\n    allPosts.posts.forEach(post => {\n        if (post.parentid) {\n            const parent = postsById.get(post.parentid);\n            if (parent) {\n                post.parentauthorname = parent.author.fullname;\n                parent.hasreplies = true;\n                parent.replies.push(post);\n            } else {\n                posts.push(post);\n            }\n        } else {\n            posts.push(post);\n        }\n    });\n\n    // Handle hidden event.\n    modal.getRoot().on(ModalEvents.hidden, function() {\n        // Destroy when hidden.\n        modal.destroy();\n    });\n\n    modal.getRoot().on(ModalEvents.bodyRendered, () => {\n        const relevantPost = modal.getRoot()[0].querySelector(`#p${postId}`);\n        if (relevantPost) {\n            relevantPost.scrollIntoView({behavior: \"smooth\"});\n        }\n    });\n\n    modal.show();\n\n    // Note: We do not use await here because it messes with the Modal transitions.\n    const templatePromise = Templates.render('mod_forum/grades/grader/discussion/post_modal', {\n        posts,\n        experimentaldisplaymode: experimentalDisplayMode\n    });\n    modal.setBody(templatePromise);\n};\n\n/**\n * Register event listeners for the expand conversations button.\n *\n * @param {HTMLElement} rootNode The root to listen to.\n */\nexport const registerEventListeners = (rootNode) => {\n    rootNode.addEventListener('click', (e) => {\n        const rootNode = findGradableNode(e.target);\n\n        if (rootNode) {\n            e.preventDefault();\n\n            try {\n                showPostInContext(rootNode);\n            } catch (err) {\n                showException(err);\n            }\n        }\n    });\n};\n"],"file":"expandconversation.min.js"}
\ No newline at end of file
diff --git a/mod/forum/amd/build/grades/grader.min.js b/mod/forum/amd/build/grades/grader.min.js
index 72dc9e00ee2..47b12c8a7c9 100644
--- a/mod/forum/amd/build/grades/grader.min.js
+++ b/mod/forum/amd/build/grades/grader.min.js
@@ -1,2 +1,2 @@
-define ("mod_forum/grades/grader",["exports","./grader/selectors","mod_forum/repository","core/templates","../local/grades/grader","core/notification","core_course/repository"],function(a,b,c,d,e,f,g){"use strict";Object.defineProperty(a,"__esModule",{value:!0});a.registerLaunchListeners=void 0;b=i(b);c=h(c);d=h(d);e=i(e);f=h(f);g=h(g);function h(a){return a&&a.__esModule?a:{default:a}}function i(a){if(a&&a.__esModule){return a}else{var b={};if(null!=a){for(var c in a){if(Object.prototype.hasOwnProperty.call(a,c)){var d=Object.defineProperty&&Object.getOwnPropertyDescriptor?Object.getOwnPropertyDescriptor(a,c):{};if(d.get||d.set){Object.defineProperty(b,c,d)}else{b[c]=a[c]}}}}b.default=a;return b}}function j(a,b,c,d,e,f,g){try{var h=a[f](g),i=h.value}catch(a){c(a);return}if(h.done){b(i)}else{Promise.resolve(i).then(d,e)}}function k(a){return function(){var b=this,c=arguments;return new Promise(function(d,e){var h=a.apply(b,c);function f(a){j(h,d,e,f,g,"next",a)}function g(a){j(h,d,e,f,g,"throw",a)}f(void 0)})}}var l={contentRegion:"mod_forum/grades/grader/discussion/posts"},m=function(a){return function(b){return c.default.getDiscussionByUserID(b,a).then(function(a){a.discussions=a.discussions.map(p);return d.default.render(l.contentRegion,a)}).catch(f.default.exception)}},n=function(a,b){return k(regeneratorRuntime.mark(function c(){var d;return regeneratorRuntime.wrap(function(c){while(1){switch(c.prev=c.next){case 0:c.next=2;return g.default.getUsersFromCourseModuleID(a,b);case 2:d=c.sent;return c.abrupt("return",d.users);case 4:case"end":return c.stop();}}},c)}))},o=function(a){return a.closest(b.gradableItem)},p=function(a){var b=new Map;a.posts.parentposts.forEach(function(a){return b.set(a.id,a)});var c=a.posts.userposts.map(function(a){a.subject=null;a.readonly=!0;a.starter=!a.parentid;a.parent=b.get(a.parentid);a.html.rating=null;return a});return{id:a.id,name:a.name,posts:c}},q=function(){var a=k(regeneratorRuntime.mark(function a(b){var c,d,f;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:c=b.dataset;a.next=3;return e.getGradingPanelFunctions("mod_forum",c.contextid,c.gradingComponent,c.gradingComponentSubtype,c.gradableItemtype);case 3:d=a.sent;f=c.group?c.group:0;a.next=7;return e.launch(n(c.cmid,f),m(c.cmid),d.getter,d.setter,{groupid:c.groupid,initialUserId:c.initialuserid,moduleName:c.name});case 7:case"end":return a.stop();}}},a)}));return function(){return a.apply(this,arguments)}}();a.registerLaunchListeners=function registerLaunchListeners(){document.addEventListener("click",function(){var a=k(regeneratorRuntime.mark(function a(c){var d;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:if(!c.target.matches(b.launch)){a.next=17;break}d=o(c.target);if(d){a.next=4;break}throw Error("Unable to find a gradable item");case 4:if(!d.matches(b.gradableItems.wholeForum)){a.next=16;break}c.preventDefault();a.prev=6;a.next=9;return q(d);case 9:a.next=14;break;case 11:a.prev=11;a.t0=a["catch"](6);f.default.exception(a.t0);case 14:a.next=17;break;case 16:throw Error("Unable to find a valid gradable item");case 17:case"end":return a.stop();}}},a,null,[[6,11]])}));return function(){return a.apply(this,arguments)}}())}});
+define ("mod_forum/grades/grader",["exports","./grader/selectors","mod_forum/repository","core/templates","../local/grades/grader","core/notification","core_course/repository","core/url"],function(a,b,c,d,e,f,g,h){"use strict";Object.defineProperty(a,"__esModule",{value:!0});a.registerLaunchListeners=void 0;b=j(b);c=i(c);d=i(d);e=j(e);f=i(f);g=i(g);function i(a){return a&&a.__esModule?a:{default:a}}function j(a){if(a&&a.__esModule){return a}else{var b={};if(null!=a){for(var c in a){if(Object.prototype.hasOwnProperty.call(a,c)){var d=Object.defineProperty&&Object.getOwnPropertyDescriptor?Object.getOwnPropertyDescriptor(a,c):{};if(d.get||d.set){Object.defineProperty(b,c,d)}else{b[c]=a[c]}}}}b.default=a;return b}}function k(a){for(var b=1;b<arguments.length;b++){var c=null!=arguments[b]?arguments[b]:{},d=Object.keys(c);if("function"==typeof Object.getOwnPropertySymbols){d=d.concat(Object.getOwnPropertySymbols(c).filter(function(a){return Object.getOwnPropertyDescriptor(c,a).enumerable}))}d.forEach(function(b){l(a,b,c[b])})}return a}function l(a,b,c){if(b in a){Object.defineProperty(a,b,{value:c,enumerable:!0,configurable:!0,writable:!0})}else{a[b]=c}return a}function m(a,b,c,d,e,f,g){try{var h=a[f](g),i=h.value}catch(a){c(a);return}if(h.done){b(i)}else{Promise.resolve(i).then(d,e)}}function n(a){return function(){var b=this,c=arguments;return new Promise(function(d,e){var h=a.apply(b,c);function f(a){m(h,d,e,f,g,"next",a)}function g(a){m(h,d,e,f,g,"throw",a)}f(void 0)})}}var o={contentRegion:"mod_forum/grades/grader/discussion/posts"},p=function(a,b){return function(e){return c.default.getDiscussionByUserID(e,a).then(function(a){a.discussions=a.discussions.map(s);a.experimentaldisplaymode=b?!0:!1;return d.default.render(o.contentRegion,a)}).catch(f.default.exception)}},q=function(a,b){return n(regeneratorRuntime.mark(function c(){var d;return regeneratorRuntime.wrap(function(c){while(1){switch(c.prev=c.next){case 0:c.next=2;return g.default.getUsersFromCourseModuleID(a,b);case 2:d=c.sent;return c.abrupt("return",d.users);case 4:case"end":return c.stop();}}},c)}))},r=function(a){return a.closest(b.gradableItem)},s=function(a){var b=new Map;a.posts.parentposts.forEach(function(a){return b.set(a.id,a)});var c=a.posts.userposts.map(function(a){a.readonly=!0;a.hasreplies=!1;a.replies=[];var c=a.parentid?b.get(a.parentid):null;if(c){c.hasreplies=!1;c.replies=[];c.readonly=!0;a.parentauthorname=c.author.fullname}return{parent:c,post:a}});return k({},a,{posts:c})},t=function(){var a=n(regeneratorRuntime.mark(function a(b){var c,d,f;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:c=b.dataset;a.next=3;return e.getGradingPanelFunctions("mod_forum",c.contextid,c.gradingComponent,c.gradingComponentSubtype,c.gradableItemtype);case 3:d=a.sent;f=c.group?c.group:0;a.next=7;return e.launch(q(c.cmid,f),p(c.cmid,"1"==c.experimentalDisplayMode),d.getter,d.setter,{groupid:c.groupid,initialUserId:c.initialuserid,moduleName:c.name,courseName:c.courseName,courseUrl:(0,h.relativeUrl)("/course/view.php",{id:c.courseId})});case 7:case"end":return a.stop();}}},a)}));return function(){return a.apply(this,arguments)}}();a.registerLaunchListeners=function registerLaunchListeners(){document.addEventListener("click",function(){var a=n(regeneratorRuntime.mark(function a(c){var d;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:if(!c.target.matches(b.launch)){a.next=17;break}d=r(c.target);if(d){a.next=4;break}throw Error("Unable to find a gradable item");case 4:if(!d.matches(b.gradableItems.wholeForum)){a.next=16;break}c.preventDefault();a.prev=6;a.next=9;return t(d);case 9:a.next=14;break;case 11:a.prev=11;a.t0=a["catch"](6);f.default.exception(a.t0);case 14:a.next=17;break;case 16:throw Error("Unable to find a valid gradable item");case 17:case"end":return a.stop();}}},a,null,[[6,11]])}));return function(){return a.apply(this,arguments)}}())}});
 //# sourceMappingURL=grader.min.js.map
diff --git a/mod/forum/amd/build/grades/grader.min.js.map b/mod/forum/amd/build/grades/grader.min.js.map
index b904e3bf051..ebc195e1dec 100644
--- a/mod/forum/amd/build/grades/grader.min.js.map
+++ b/mod/forum/amd/build/grades/grader.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../../src/grades/grader.js"],"names":["templateNames","contentRegion","getContentForUserIdFunction","cmid","userid","Repository","getDiscussionByUserID","then","context","discussions","map","discussionPostMapper","Templates","render","catch","Notification","exception","getUsersForCmidFunction","groupID","CourseRepository","getUsersFromCourseModuleID","users","findGradableNode","node","closest","Selectors","gradableItem","discussion","parentMap","Map","posts","parentposts","forEach","post","set","id","userPosts","userposts","subject","readonly","starter","parentid","parent","get","html","rating","name","launchWholeForumGrading","rootNode","data","dataset","Grader","getGradingPanelFunctions","contextid","gradingComponent","gradingComponentSubtype","gradableItemtype","gradingPanelFunctions","group","launch","getter","setter","groupid","initialUserId","initialuserid","moduleName","registerLaunchListeners","document","addEventListener","e","target","matches","Error","gradableItems","wholeForum","preventDefault"],"mappings":"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","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * This module will tie together all of the different calls the gradable module will make.\n *\n * @module     mod_forum/grades/grader\n * @package    mod_forum\n * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\nimport * as Selectors from './grader/selectors';\nimport Repository from 'mod_forum/repository';\nimport Templates from 'core/templates';\nimport * as Grader from '../local/grades/grader';\nimport Notification from 'core/notification';\nimport CourseRepository from 'core_course/repository';\n\nconst templateNames = {\n    contentRegion: 'mod_forum/grades/grader/discussion/posts',\n};\n\n/**\n * Curried function with CMID set, this is then used in unified grader as a fetch a users content.\n *\n * @param {Number} cmid\n * @return {Function}\n */\nconst getContentForUserIdFunction = (cmid) => (userid) => {\n    /**\n     * Given the parent function is called with the second param set execute the partially executed function.\n     *\n     * @param {Number} userid\n     */\n    return Repository.getDiscussionByUserID(userid, cmid)\n        .then(context => {\n            // Rebuild the returned data for the template.\n            context.discussions = context.discussions.map(discussionPostMapper);\n\n            return Templates.render(templateNames.contentRegion, context);\n        })\n        .catch(Notification.exception);\n};\n\n/**\n * Curried function with CMID set, this is then used in unified grader as a fetch users call.\n * The function curried fetches all users in a course for a given CMID.\n *\n * @param {Number} cmid\n * @param {Number} groupID\n * @return {Array} Array of users for a given context.\n */\nconst getUsersForCmidFunction = (cmid, groupID) => async() => {\n    const context = await CourseRepository.getUsersFromCourseModuleID(cmid, groupID);\n\n    return context.users;\n};\n\n\nconst findGradableNode = node => node.closest(Selectors.gradableItem);\n\n/**\n * For a discussion we need to manipulate it's posts to hide certain UI elements.\n *\n * @param {Object} discussion\n * @return {Array} name, id, posts\n */\nconst discussionPostMapper = (discussion) => {\n    // Map postid => post.\n    const parentMap = new Map();\n    discussion.posts.parentposts.forEach(post => parentMap.set(post.id, post));\n    const userPosts = discussion.posts.userposts.map(post => {\n        post.subject = null;\n        post.readonly = true;\n        post.starter = !post.parentid;\n        post.parent = parentMap.get(post.parentid);\n        post.html.rating = null;\n\n        return post;\n    });\n\n    return {\n        id: discussion.id,\n        name: discussion.name,\n        posts: userPosts,\n    };\n};\n\n/**\n * Launch the Grader.\n *\n * @param {HTMLElement} rootNode the root HTML element describing what is to be graded\n */\nconst launchWholeForumGrading = async(rootNode) => {\n    const data = rootNode.dataset;\n    const gradingPanelFunctions = await Grader.getGradingPanelFunctions(\n        'mod_forum',\n        data.contextid,\n        data.gradingComponent,\n        data.gradingComponentSubtype,\n        data.gradableItemtype\n    );\n\n    const groupID = data.group ? data.group : 0;\n\n    await Grader.launch(\n        getUsersForCmidFunction(data.cmid, groupID),\n        getContentForUserIdFunction(data.cmid),\n        gradingPanelFunctions.getter,\n        gradingPanelFunctions.setter,\n        {\n            groupid: data.groupid,\n            initialUserId: data.initialuserid,\n            moduleName: data.name\n        }\n    );\n};\n\n/**\n * Register listeners to launch the grading panel.\n */\nexport const registerLaunchListeners = () => {\n    document.addEventListener('click', async(e) => {\n        if (e.target.matches(Selectors.launch)) {\n            const rootNode = findGradableNode(e.target);\n\n            if (!rootNode) {\n                throw Error('Unable to find a gradable item');\n            }\n\n            if (rootNode.matches(Selectors.gradableItems.wholeForum)) {\n                // Note: The preventDefault must be before any async function calls because the function becomes async\n                // at that point and the default action is implemented.\n                e.preventDefault();\n                try {\n                    await launchWholeForumGrading(rootNode);\n                } catch (error) {\n                    Notification.exception(error);\n                }\n            } else {\n                throw Error('Unable to find a valid gradable item');\n            }\n        }\n    });\n};\n"],"file":"grader.min.js"}
\ No newline at end of file
+{"version":3,"sources":["../../src/grades/grader.js"],"names":["templateNames","contentRegion","getContentForUserIdFunction","cmid","experimentalDisplayMode","userid","Repository","getDiscussionByUserID","then","context","discussions","map","discussionPostMapper","experimentaldisplaymode","Templates","render","catch","Notification","exception","getUsersForCmidFunction","groupID","CourseRepository","getUsersFromCourseModuleID","users","findGradableNode","node","closest","Selectors","gradableItem","discussion","parentMap","Map","posts","parentposts","forEach","post","set","id","userPosts","userposts","readonly","hasreplies","replies","parent","parentid","get","parentauthorname","author","fullname","launchWholeForumGrading","rootNode","data","dataset","Grader","getGradingPanelFunctions","contextid","gradingComponent","gradingComponentSubtype","gradableItemtype","gradingPanelFunctions","group","launch","getter","setter","groupid","initialUserId","initialuserid","moduleName","name","courseName","courseUrl","courseId","registerLaunchListeners","document","addEventListener","e","target","matches","Error","gradableItems","wholeForum","preventDefault"],"mappings":"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","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * This module will tie together all of the different calls the gradable module will make.\n *\n * @module     mod_forum/grades/grader\n * @package    mod_forum\n * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\nimport * as Selectors from './grader/selectors';\nimport Repository from 'mod_forum/repository';\nimport Templates from 'core/templates';\nimport * as Grader from '../local/grades/grader';\nimport Notification from 'core/notification';\nimport CourseRepository from 'core_course/repository';\nimport {relativeUrl} from 'core/url';\n\nconst templateNames = {\n    contentRegion: 'mod_forum/grades/grader/discussion/posts',\n};\n\n/**\n * Curried function with CMID set, this is then used in unified grader as a fetch a users content.\n *\n * @param {Number} cmid\n * @param {Bool} experimentalDisplayMode\n * @return {Function}\n */\nconst getContentForUserIdFunction = (cmid, experimentalDisplayMode) => (userid) => {\n    /**\n     * Given the parent function is called with the second param set execute the partially executed function.\n     *\n     * @param {Number} userid\n     */\n    return Repository.getDiscussionByUserID(userid, cmid)\n        .then(context => {\n            // Rebuild the returned data for the template.\n            context.discussions = context.discussions.map(discussionPostMapper);\n            context.experimentaldisplaymode = experimentalDisplayMode ? true : false;\n\n            return Templates.render(templateNames.contentRegion, context);\n        })\n        .catch(Notification.exception);\n};\n\n/**\n * Curried function with CMID set, this is then used in unified grader as a fetch users call.\n * The function curried fetches all users in a course for a given CMID.\n *\n * @param {Number} cmid\n * @param {Number} groupID\n * @return {Array} Array of users for a given context.\n */\nconst getUsersForCmidFunction = (cmid, groupID) => async() => {\n    const context = await CourseRepository.getUsersFromCourseModuleID(cmid, groupID);\n\n    return context.users;\n};\n\n\nconst findGradableNode = node => node.closest(Selectors.gradableItem);\n\n/**\n * For a discussion we need to manipulate it's posts to hide certain UI elements.\n *\n * @param {Object} discussion\n * @return {Array} name, id, posts\n */\nconst discussionPostMapper = (discussion) => {\n    // Map postid => post.\n    const parentMap = new Map();\n    discussion.posts.parentposts.forEach(post => parentMap.set(post.id, post));\n    const userPosts = discussion.posts.userposts.map(post => {\n        post.readonly = true;\n        post.hasreplies = false;\n        post.replies = [];\n\n        const parent = post.parentid ? parentMap.get(post.parentid) : null;\n        if (parent) {\n            parent.hasreplies = false;\n            parent.replies = [];\n            parent.readonly = true;\n            post.parentauthorname = parent.author.fullname;\n        }\n\n        return {\n            parent,\n            post\n        };\n    });\n\n    return {\n        ...discussion,\n        posts: userPosts,\n    };\n};\n\n/**\n * Launch the Grader.\n *\n * @param {HTMLElement} rootNode the root HTML element describing what is to be graded\n */\nconst launchWholeForumGrading = async(rootNode) => {\n    const data = rootNode.dataset;\n    const gradingPanelFunctions = await Grader.getGradingPanelFunctions(\n        'mod_forum',\n        data.contextid,\n        data.gradingComponent,\n        data.gradingComponentSubtype,\n        data.gradableItemtype\n    );\n\n    const groupID = data.group ? data.group : 0;\n\n    await Grader.launch(\n        getUsersForCmidFunction(data.cmid, groupID),\n        getContentForUserIdFunction(data.cmid, data.experimentalDisplayMode == \"1\"),\n        gradingPanelFunctions.getter,\n        gradingPanelFunctions.setter,\n        {\n            groupid: data.groupid,\n            initialUserId: data.initialuserid,\n            moduleName: data.name,\n            courseName: data.courseName,\n            courseUrl: relativeUrl('/course/view.php', {id: data.courseId})\n        }\n    );\n};\n\n/**\n * Register listeners to launch the grading panel.\n */\nexport const registerLaunchListeners = () => {\n    document.addEventListener('click', async(e) => {\n        if (e.target.matches(Selectors.launch)) {\n            const rootNode = findGradableNode(e.target);\n\n            if (!rootNode) {\n                throw Error('Unable to find a gradable item');\n            }\n\n            if (rootNode.matches(Selectors.gradableItems.wholeForum)) {\n                // Note: The preventDefault must be before any async function calls because the function becomes async\n                // at that point and the default action is implemented.\n                e.preventDefault();\n                try {\n                    await launchWholeForumGrading(rootNode);\n                } catch (error) {\n                    Notification.exception(error);\n                }\n            } else {\n                throw Error('Unable to find a valid gradable item');\n            }\n        }\n    });\n};\n"],"file":"grader.min.js"}
\ No newline at end of file
diff --git a/mod/forum/amd/build/local/grades/grader.min.js b/mod/forum/amd/build/local/grades/grader.min.js
index b3d04c024c8..b6cee866677 100644
--- a/mod/forum/amd/build/local/grades/grader.min.js
+++ b/mod/forum/amd/build/local/grades/grader.min.js
@@ -1,2 +1,2 @@
-define ("mod_forum/local/grades/grader",["exports","core/templates","./local/grader/selectors","./local/grader/user_picker","mod_forum/local/layout/fullscreen","./local/grader/gradingpanel","core/toast","core/str","core_grades/grades/grader/gradingpanel/normalise","core/loadingicon"],function(a,b,c,d,e,f,g,h,i,j){"use strict";Object.defineProperty(a,"__esModule",{value:!0});Object.defineProperty(a,"getGradingPanelFunctions",{enumerable:!0,get:function get(){return f.default}});a.launch=void 0;b=k(b);c=k(c);d=k(d);f=k(f);function k(a){return a&&a.__esModule?a:{default:a}}function l(a){for(var b=1;b<arguments.length;b++){var c=null!=arguments[b]?arguments[b]:{},d=Object.keys(c);if("function"==typeof Object.getOwnPropertySymbols){d=d.concat(Object.getOwnPropertySymbols(c).filter(function(a){return Object.getOwnPropertyDescriptor(c,a).enumerable}))}d.forEach(function(b){m(a,b,c[b])})}return a}function m(a,b,c){if(b in a){Object.defineProperty(a,b,{value:c,enumerable:!0,configurable:!0,writable:!0})}else{a[b]=c}return a}function n(a,b){return q(a)||p(a,b)||o()}function o(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}function p(a,b){var c=[],d=!0,e=!1,f=void 0;try{for(var g=a[Symbol.iterator](),h;!(d=(h=g.next()).done);d=!0){c.push(h.value);if(b&&c.length===b)break}}catch(a){e=!0;f=a}finally{try{if(!d&&null!=g["return"])g["return"]()}finally{if(e)throw f}}return c}function q(a){if(Array.isArray(a))return a}function r(a,b,c,d,e,f,g){try{var h=a[f](g),i=h.value}catch(a){c(a);return}if(h.done){b(i)}else{Promise.resolve(i).then(d,e)}}function s(a){return function(){var b=this,c=arguments;return new Promise(function(d,e){var h=a.apply(b,c);function f(a){r(h,d,e,f,g,"next",a)}function g(a){r(h,d,e,f,g,"throw",a)}f(void 0)})}}var t={grader:{app:"mod_forum/local/grades/grader",gradingPanel:{error:"mod_forum/local/grades/local/grader/gradingpanel/error"}}},u=function(a,d){var e=a.querySelector(c.default.regions.pickerRegion);b.default.replaceNodeContents(e,d,"")},v=function(a,b){return[a,b]},w=function(a,d,e){return function(){var f=s(regeneratorRuntime.mark(function f(g){var h,i,k,l,m,o,p,q,r,s,t;return regeneratorRuntime.wrap(function(f){while(1){switch(f.prev=f.next){case 0:h=(0,j.addIconToContainerWithPromise)(a);f.next=3;return Promise.all([d(g.id).then(v),e(g.id)]);case 3:i=f.sent;k=n(i,2);l=n(k[0],2);m=l[0];o=l[1];p=k[1];b.default.replaceNodeContents(a.querySelector(c.default.regions.moduleReplace),m,o);f.next=12;return b.default.render(p.templatename,p.grade).then(v);case 12:q=f.sent;r=n(q,2);s=r[0];t=r[1];b.default.replaceNodeContents(a.querySelector(c.default.regions.gradingPanel),s,t);h.resolve();case 18:case"end":return f.stop();}}},f)}));return function(){return f.apply(this,arguments)}}()},x=function(a,b,d){var e=a.getContainer();e.addEventListener("click",function(f){if(f.target.closest(c.default.buttons.toggleFullscreen)){f.stopImmediatePropagation();f.preventDefault();a.toggleFullscreen();return}if(f.target.closest(c.default.buttons.closeGrader)){f.stopImmediatePropagation();f.preventDefault();a.close();return}if(f.target.closest(c.default.buttons.saveGrade)){d(b.currentUser)}})},y=function(a,b){return function(){var d=s(regeneratorRuntime.mark(function d(e){var f;return regeneratorRuntime.wrap(function(d){while(1){switch(d.prev=d.next){case 0:d.prev=0;a.querySelector(c.default.regions.gradingPanelErrors).innerHTML="";d.next=4;return b(e.id,a.querySelector(c.default.regions.gradingPanel));case 4:f=d.sent;if(!f.success){d.next=11;break}d.t0=g.add;d.next=9;return(0,h.get_string)("grades:gradesavedfor","mod_forum",e);case 9:d.t1=d.sent;(0,d.t0)(d.t1);case 11:if(f.failed){z(a,e,f.error)}return d.abrupt("return",f);case 15:d.prev=15;d.t2=d["catch"](0);z(a,e,d.t2);return d.abrupt("return",(0,i.failedUpdate)(d.t2));case 19:case"end":return d.stop();}}},d,null,[[0,15]])}));return function(){return d.apply(this,arguments)}}()},z=function(){var a=s(regeneratorRuntime.mark(function a(d,e,f){var i,j,k,m,o,p;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:a.t0=Promise;a.t1=b.default.renderForPromise(t.grader.gradingPanel.error,{error:f});a.next=4;return(0,h.get_string)("grades:gradesavefailed","mod_forum",l({error:f.message},e));case 4:a.t2=a.sent;a.t3=[a.t1,a.t2];a.next=8;return a.t0.all.call(a.t0,a.t3);case 8:i=a.sent;j=n(i,2);k=j[0];m=k.html;o=k.js;p=j[1];b.default.replaceNodeContents(d.querySelector(c.default.regions.gradingPanelErrors),m,o);(0,g.add)(p);case 16:case"end":return a.stop();}}},a)}));return function(){return a.apply(this,arguments)}}(),A=function(){var a=s(regeneratorRuntime.mark(function a(c,f,g,h){var i,j,k,l,m,o,p,q,r,s,v,z,A,B=arguments;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:i=4<B.length&&B[4]!==void 0?B[4]:{},j=i.initialUserId,k=void 0===j?null:j,l=i.moduleName;a.next=3;return Promise.all([(0,e.createLayout)({fullscreen:!1,showLoader:!1}),b.default.render(t.grader.app,{moduleName:l}),c()]);case 3:m=a.sent;o=n(m,3);p=o[0];q=o[1];r=o[2];s=p.getContainer();v=y(s,h);b.default.replaceNodeContents(s,q,"");z=w(s,f,g);a.next=14;return(0,d.default)(r,z,v,{initialUserId:k});case 14:A=a.sent;x(p,A,v);u(s,A.rootNode);case 17:case"end":return a.stop();}}},a)}));return function(){return a.apply(this,arguments)}}();a.launch=A});
+define ("mod_forum/local/grades/grader",["exports","core/templates","./local/grader/selectors","./local/grader/user_picker","mod_forum/local/layout/fullscreen","./local/grader/gradingpanel","core/toast","core/str","core_grades/grades/grader/gradingpanel/normalise","core/loadingicon","core/utils"],function(a,b,c,d,e,f,g,h,i,j,k){"use strict";Object.defineProperty(a,"__esModule",{value:!0});Object.defineProperty(a,"getGradingPanelFunctions",{enumerable:!0,get:function get(){return f.default}});a.launch=void 0;b=l(b);c=l(c);d=l(d);f=l(f);function l(a){return a&&a.__esModule?a:{default:a}}function m(a){for(var b=1;b<arguments.length;b++){var c=null!=arguments[b]?arguments[b]:{},d=Object.keys(c);if("function"==typeof Object.getOwnPropertySymbols){d=d.concat(Object.getOwnPropertySymbols(c).filter(function(a){return Object.getOwnPropertyDescriptor(c,a).enumerable}))}d.forEach(function(b){n(a,b,c[b])})}return a}function n(a,b,c){if(b in a){Object.defineProperty(a,b,{value:c,enumerable:!0,configurable:!0,writable:!0})}else{a[b]=c}return a}function o(a,b){return r(a)||q(a,b)||p()}function p(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}function q(a,b){var c=[],d=!0,e=!1,f=void 0;try{for(var g=a[Symbol.iterator](),h;!(d=(h=g.next()).done);d=!0){c.push(h.value);if(b&&c.length===b)break}}catch(a){e=!0;f=a}finally{try{if(!d&&null!=g["return"])g["return"]()}finally{if(e)throw f}}return c}function r(a){if(Array.isArray(a))return a}function s(a,b,c,d,e,f,g){try{var h=a[f](g),i=h.value}catch(a){c(a);return}if(h.done){b(i)}else{Promise.resolve(i).then(d,e)}}function t(a){return function(){var b=this,c=arguments;return new Promise(function(d,e){var h=a.apply(b,c);function f(a){s(h,d,e,f,g,"next",a)}function g(a){s(h,d,e,f,g,"throw",a)}f(void 0)})}}var u={grader:{app:"mod_forum/local/grades/grader",gradingPanel:{error:"mod_forum/local/grades/local/grader/gradingpanel/error"},searchResults:"mod_forum/local/grades/local/grader/user_picker/user_search",status:"mod_forum/local/grades/local/grader/status"}},v=function(a,d){var e=a.querySelector(c.default.regions.pickerRegion);b.default.replaceNodeContents(e,d,"")},w=function(a,b){return[a,b]},x=function(a,d,e){var f=!0;return function(){var g=t(regeneratorRuntime.mark(function g(h){var i,k,l,m,n,p,q,r,s,t,u,v,x;return regeneratorRuntime.wrap(function(g){while(1){switch(g.prev=g.next){case 0:i=f?null:(0,j.addIconToContainerWithPromise)(a);g.next=3;return Promise.all([d(h.id).then(w),e(h.id)]);case 3:k=g.sent;l=o(k,2);m=o(l[0],2);n=m[0];p=m[1];q=l[1];b.default.replaceNodeContents(a.querySelector(c.default.regions.moduleReplace),n,p);g.next=12;return b.default.render(q.templatename,q.grade).then(w);case 12:r=g.sent;s=o(r,2);t=s[0];u=s[1];v=a.querySelector(c.default.regions.gradingPanelContainer);x=v.querySelector(c.default.regions.gradingPanel);b.default.replaceNodeContents(x,t,u);v.scrollTop=0;f=!1;if(i){i.resolve()}case 22:case"end":return g.stop();}}},g)}));return function(){return g.apply(this,arguments)}}()},y=function(a,b,c){a.classList.add("hidden");b.classList.add("hidden");c.classList.remove("hidden")},z=function(a,b,c){a.classList.remove("hidden");b.classList.remove("hidden");c.classList.add("hidden")},A=function(a,b,c){b.classList.remove("collapsed");a.setAttribute("aria-expanded","true");a.classList.add("expand");a.classList.remove("collapse");c.focus()},B=function(a,b,c){b.classList.add("collapsed");a.setAttribute("aria-expanded","false");a.classList.add("collapse");a.classList.remove("expand");a.focus();c.value=""},C=function(a,b){if(""===b){return a}b=b.toLowerCase();return a.filter(function(a){return a.fullname.toLowerCase().includes(b)})},D=function(){var a=t(regeneratorRuntime.mark(function a(c,d){var e,f,g;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:a.next=2;return b.default.renderForPromise(u.grader.searchResults,{users:d});case 2:e=a.sent;f=e.html;g=e.js;b.default.replaceNodeContents(c,f,g);case 6:case"end":return a.stop();}}},a)}));return function(){return a.apply(this,arguments)}}(),E=function(a,b,d,e){var f=a.getContainer(),g=f.querySelector(c.default.buttons.toggleSearch),h=f.querySelector(c.default.regions.userSearchContainer),i=h.querySelector(c.default.regions.userSearchInput),j=f.querySelector(c.default.regions.bodyContainer),l=f.querySelector(c.default.regions.pickerRegion),m=f.querySelector(c.default.regions.searchResultsContainer);f.addEventListener("click",function(f){if(f.target.closest(c.default.buttons.toggleFullscreen)){f.stopImmediatePropagation();f.preventDefault();a.toggleFullscreen();return}if(f.target.closest(c.default.buttons.closeGrader)){f.stopImmediatePropagation();f.preventDefault();a.close();return}if(f.target.closest(c.default.buttons.saveGrade)){d(b.currentUser)}if(f.target.closest(c.default.buttons.toggleSearch)){if("true"===g.getAttribute("aria-expanded")){B(g,h,i);z(j,l,m);m.innerHTML=""}else{A(g,h,i);y(j,l,m);D(m,e)}return}var k=f.target.closest(c.default.buttons.selectUser);if(k){var n=k.getAttribute("data-userid"),o=e.find(function(a){return a.id==n});b.setUserId(n);b.showUser(o);B(g,h,i);z(j,l,m);m.innerHTML=""}});i.addEventListener("input",(0,k.debounce)(function(){var a=C(e,i.value);D(m,a)},300))},F=function(a,b){return function(){var d=t(regeneratorRuntime.mark(function d(e){var f;return regeneratorRuntime.wrap(function(d){while(1){switch(d.prev=d.next){case 0:d.prev=0;a.querySelector(c.default.regions.gradingPanelErrors).innerHTML="";d.next=4;return b(e.id,a.querySelector(c.default.regions.gradingPanel));case 4:f=d.sent;if(!f.success){d.next=11;break}d.t0=g.add;d.next=9;return(0,h.get_string)("grades:gradesavedfor","mod_forum",e);case 9:d.t1=d.sent;(0,d.t0)(d.t1);case 11:if(f.failed){G(a,e,f.error)}return d.abrupt("return",f);case 15:d.prev=15;d.t2=d["catch"](0);G(a,e,d.t2);return d.abrupt("return",(0,i.failedUpdate)(d.t2));case 19:case"end":return d.stop();}}},d,null,[[0,15]])}));return function(){return d.apply(this,arguments)}}()},G=function(){var a=t(regeneratorRuntime.mark(function a(d,e,f){var i,j,k,l,n,p;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:a.t0=Promise;a.t1=b.default.renderForPromise(u.grader.gradingPanel.error,{error:f});a.next=4;return(0,h.get_string)("grades:gradesavefailed","mod_forum",m({error:f.message},e));case 4:a.t2=a.sent;a.t3=[a.t1,a.t2];a.next=8;return a.t0.all.call(a.t0,a.t3);case 8:i=a.sent;j=o(i,2);k=j[0];l=k.html;n=k.js;p=j[1];b.default.replaceNodeContents(d.querySelector(c.default.regions.gradingPanelErrors),l,n);(0,g.add)(p);case 16:case"end":return a.stop();}}},a)}));return function(){return a.apply(this,arguments)}}(),H=function(){var a=t(regeneratorRuntime.mark(function a(f,g,h,i){var j,k,l,m,n,p,q,r,s,t,w,y,z,A,B,C,D,G,H,I=arguments;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:j=4<I.length&&I[4]!==void 0?I[4]:{},k=j.initialUserId,l=void 0===k?null:k,m=j.moduleName,n=j.courseName,p=j.courseUrl;a.next=3;return Promise.all([(0,e.createLayout)({fullscreen:!1,showLoader:!1}),b.default.renderForPromise(u.grader.app,{moduleName:m,courseName:n,courseUrl:p,drawer:{show:!0}}),f()]);case 3:q=a.sent;r=o(q,3);s=r[0];t=r[1];w=t.html;y=t.js;z=r[2];A=s.getContainer();B=F(A,i);b.default.replaceNodeContents(A,w,y);C=x(A,g,h);D=z.map(function(a){return a.id});G=A.querySelector(c.default.regions.statusContainer);a.next=18;return(0,d.default)(z,function(a){var c={status:null,index:D.indexOf(a.id)+1,total:z.length};b.default.render(u.grader.status,c).then(function(a){G.innerHTML=a;return a}).catch();C(a)},B,{initialUserId:l});case 18:H=a.sent;E(s,H,B,z);v(A,H.rootNode);case 21:case"end":return a.stop();}}},a)}));return function(){return a.apply(this,arguments)}}();a.launch=H});
 //# sourceMappingURL=grader.min.js.map
diff --git a/mod/forum/amd/build/local/grades/grader.min.js.map b/mod/forum/amd/build/local/grades/grader.min.js.map
index c40169a7678..bb34334dc48 100644
--- a/mod/forum/amd/build/local/grades/grader.min.js.map
+++ b/mod/forum/amd/build/local/grades/grader.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../../../src/local/grades/grader.js"],"names":["templateNames","grader","app","gradingPanel","error","displayUserPicker","root","html","pickerRegion","querySelector","Selectors","regions","Templates","replaceNodeContents","fetchContentFromRender","js","getUpdateUserContentFunction","getContentForUser","getGradeForUser","user","spinner","Promise","all","id","then","userGrade","moduleReplace","render","templatename","grade","gradingPanelHtml","gradingPanelJS","resolve","registerEventListeners","graderLayout","userPicker","saveGradeFunction","graderContainer","getContainer","addEventListener","e","target","closest","buttons","toggleFullscreen","stopImmediatePropagation","preventDefault","closeGrader","close","saveGrade","currentUser","getSaveUserGradeFunction","setGradeForUser","gradingPanelErrors","innerHTML","result","success","addToast","failed","displayGradingError","err","renderForPromise","message","errorString","launch","getListOfUsers","initialUserId","moduleName","fullscreen","showLoader","graderHTML","userList","updateUserContent","rootNode"],"mappings":"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","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * This module will tie together all of the different calls the gradable module will make.\n *\n * @module     mod_forum/local/grades/grader\n * @package    mod_forum\n * @copyright  2019 Mathew May <mathew.solutions>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\nimport Templates from 'core/templates';\nimport Selectors from './local/grader/selectors';\nimport getUserPicker from './local/grader/user_picker';\nimport {createLayout as createFullScreenWindow} from 'mod_forum/local/layout/fullscreen';\nimport getGradingPanelFunctions from './local/grader/gradingpanel';\nimport {add as addToast} from 'core/toast';\nimport {get_string as getString} from 'core/str';\nimport {failedUpdate} from 'core_grades/grades/grader/gradingpanel/normalise';\nimport {addIconToContainerWithPromise} from 'core/loadingicon';\n\nconst templateNames = {\n    grader: {\n        app: 'mod_forum/local/grades/grader',\n        gradingPanel: {\n            error: 'mod_forum/local/grades/local/grader/gradingpanel/error',\n        },\n    },\n};\n\n/**\n * Helper function that replaces the user picker placeholder with what we get back from the user picker class.\n *\n * @param {HTMLElement} root\n * @param {String} html\n */\nconst displayUserPicker = (root, html) => {\n    const pickerRegion = root.querySelector(Selectors.regions.pickerRegion);\n    Templates.replaceNodeContents(pickerRegion, html, '');\n};\n\n/**\n * To be removed, this is now done as a part of Templates.renderForPromise()\n *\n * @param {String} html\n * @param {String} js\n * @return {[*, *]}\n */\nconst fetchContentFromRender = (html, js) => {\n    return [html, js];\n};\n\n/**\n * Here we build the function that is passed to the user picker that'll handle updating the user content area\n * of the grading interface.\n *\n * @param {HTMLElement} root\n * @param {Function} getContentForUser\n * @param {Function} getGradeForUser\n * @return {Function}\n */\nconst getUpdateUserContentFunction = (root, getContentForUser, getGradeForUser) => {\n    return async(user) => {\n        const spinner = addIconToContainerWithPromise(root);\n        const [\n            [html, js],\n            userGrade,\n        ] = await Promise.all([\n            getContentForUser(user.id).then(fetchContentFromRender),\n            getGradeForUser(user.id),\n        ]);\n        Templates.replaceNodeContents(root.querySelector(Selectors.regions.moduleReplace), html, js);\n\n        const [\n            gradingPanelHtml,\n            gradingPanelJS\n        ] = await Templates.render(userGrade.templatename, userGrade.grade).then(fetchContentFromRender);\n        Templates.replaceNodeContents(root.querySelector(Selectors.regions.gradingPanel), gradingPanelHtml, gradingPanelJS);\n        spinner.resolve();\n    };\n};\n\n/**\n * Add click handlers to the buttons in the header of the grading interface.\n *\n * @param {HTMLElement} graderLayout\n * @param {Object} userPicker\n * @param {Function} saveGradeFunction\n */\nconst registerEventListeners = (graderLayout, userPicker, saveGradeFunction) => {\n    const graderContainer = graderLayout.getContainer();\n    graderContainer.addEventListener('click', (e) => {\n        if (e.target.closest(Selectors.buttons.toggleFullscreen)) {\n            e.stopImmediatePropagation();\n            e.preventDefault();\n            graderLayout.toggleFullscreen();\n\n            return;\n        }\n\n        if (e.target.closest(Selectors.buttons.closeGrader)) {\n            e.stopImmediatePropagation();\n            e.preventDefault();\n\n            graderLayout.close();\n\n            return;\n        }\n\n        if (e.target.closest(Selectors.buttons.saveGrade)) {\n            saveGradeFunction(userPicker.currentUser);\n        }\n    });\n};\n\n/**\n * Get the function used to save a user grade.\n *\n * @param {HTMLElement} root The container for the grader\n * @param {Function} setGradeForUser The function that will be called.\n * @return {Function}\n */\nconst getSaveUserGradeFunction = (root, setGradeForUser) => {\n    return async(user) => {\n        try {\n            root.querySelector(Selectors.regions.gradingPanelErrors).innerHTML = '';\n            const result = await setGradeForUser(user.id, root.querySelector(Selectors.regions.gradingPanel));\n            if (result.success) {\n                addToast(await getString('grades:gradesavedfor', 'mod_forum', user));\n            }\n            if (result.failed) {\n                displayGradingError(root, user, result.error);\n            }\n\n            return result;\n        } catch (err) {\n            displayGradingError(root, user, err);\n\n            return failedUpdate(err);\n        }\n    };\n};\n\n/**\n * Display a grading error, typically from a failed save.\n *\n * @param {HTMLElement} root The container for the grader\n * @param {Object} user The user who was errored\n * @param {Object} err The details of the error\n */\nconst displayGradingError = async(root, user, err) => {\n    const [\n        {html, js},\n        errorString\n    ] = await Promise.all([\n        Templates.renderForPromise(templateNames.grader.gradingPanel.error, {error: err}),\n        await getString('grades:gradesavefailed', 'mod_forum', {error: err.message, ...user}),\n    ]);\n\n    Templates.replaceNodeContents(root.querySelector(Selectors.regions.gradingPanelErrors), html, js);\n    addToast(errorString);\n};\n\n/**\n * Launch the grader interface with the specified parameters.\n *\n * @param {Function} getListOfUsers A function to get the list of users\n * @param {Function} getContentForUser A function to get the content for a specific user\n * @param {Function} getGradeForUser A function get the grade details for a specific user\n * @param {Function} setGradeForUser A function to set the grade for a specific user\n */\nexport const launch = async(getListOfUsers, getContentForUser, getGradeForUser, setGradeForUser, {\n    initialUserId = null, moduleName\n} = {}) => {\n\n    // We need all of these functions to be executed in series, if one step runs before another the interface\n    // will not work.\n    const [\n        graderLayout,\n        graderHTML,\n        userList,\n    ] = await Promise.all([\n        createFullScreenWindow({fullscreen: false, showLoader: false}),\n        Templates.render(templateNames.grader.app, {moduleName: moduleName}),\n        getListOfUsers(),\n    ]);\n    const graderContainer = graderLayout.getContainer();\n\n    const saveGradeFunction = getSaveUserGradeFunction(graderContainer, setGradeForUser);\n\n    Templates.replaceNodeContents(graderContainer, graderHTML, '');\n    const updateUserContent = getUpdateUserContentFunction(graderContainer, getContentForUser, getGradeForUser);\n\n    // Fetch the userpicker for display.\n    const userPicker = await getUserPicker(\n        userList,\n        updateUserContent,\n        saveGradeFunction,\n        {\n            initialUserId,\n        },\n    );\n\n    // Register all event listeners.\n    registerEventListeners(graderLayout, userPicker, saveGradeFunction);\n\n    // Display the newly created user picker.\n    displayUserPicker(graderContainer, userPicker.rootNode);\n};\n\nexport {getGradingPanelFunctions};\n"],"file":"grader.min.js"}
\ No newline at end of file
+{"version":3,"sources":["../../../src/local/grades/grader.js"],"names":["templateNames","grader","app","gradingPanel","error","searchResults","status","displayUserPicker","root","html","pickerRegion","querySelector","Selectors","regions","Templates","replaceNodeContents","fetchContentFromRender","js","getUpdateUserContentFunction","getContentForUser","getGradeForUser","firstLoad","user","spinner","Promise","all","id","then","userGrade","moduleReplace","render","templatename","grade","gradingPanelHtml","gradingPanelJS","panelContainer","gradingPanelContainer","panel","scrollTop","resolve","showSearchResultContainer","bodyContainer","userPickerContainer","searchResultsContainer","classList","add","remove","hideSearchResultContainer","showUserSearchInput","toggleSearchButton","searchContainer","searchInput","setAttribute","focus","hideUserSearchInput","value","searchForUsers","userList","searchTerm","toLowerCase","filter","fullname","includes","renderSearchResults","users","renderForPromise","registerEventListeners","graderLayout","userPicker","saveGradeFunction","graderContainer","getContainer","buttons","toggleSearch","searchInputContainer","userSearchContainer","userSearchInput","addEventListener","e","target","closest","toggleFullscreen","stopImmediatePropagation","preventDefault","closeGrader","close","saveGrade","currentUser","getAttribute","innerHTML","selectUserButton","selectUser","userId","find","setUserId","showUser","getSaveUserGradeFunction","setGradeForUser","gradingPanelErrors","result","success","addToast","failed","displayGradingError","err","message","errorString","launch","getListOfUsers","initialUserId","moduleName","courseName","courseUrl","fullscreen","showLoader","drawer","show","updateUserContent","userIds","map","statusContainer","renderContext","index","indexOf","total","length","catch","rootNode"],"mappings":"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","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * This module will tie together all of the different calls the gradable module will make.\n *\n * @module     mod_forum/local/grades/grader\n * @package    mod_forum\n * @copyright  2019 Mathew May <mathew.solutions>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\nimport Templates from 'core/templates';\nimport Selectors from './local/grader/selectors';\nimport getUserPicker from './local/grader/user_picker';\nimport {createLayout as createFullScreenWindow} from 'mod_forum/local/layout/fullscreen';\nimport getGradingPanelFunctions from './local/grader/gradingpanel';\nimport {add as addToast} from 'core/toast';\nimport {get_string as getString} from 'core/str';\nimport {failedUpdate} from 'core_grades/grades/grader/gradingpanel/normalise';\nimport {addIconToContainerWithPromise} from 'core/loadingicon';\nimport {debounce} from 'core/utils';\n\nconst templateNames = {\n    grader: {\n        app: 'mod_forum/local/grades/grader',\n        gradingPanel: {\n            error: 'mod_forum/local/grades/local/grader/gradingpanel/error',\n        },\n        searchResults: 'mod_forum/local/grades/local/grader/user_picker/user_search',\n        status: 'mod_forum/local/grades/local/grader/status',\n    },\n};\n\n/**\n * Helper function that replaces the user picker placeholder with what we get back from the user picker class.\n *\n * @param {HTMLElement} root\n * @param {String} html\n */\nconst displayUserPicker = (root, html) => {\n    const pickerRegion = root.querySelector(Selectors.regions.pickerRegion);\n    Templates.replaceNodeContents(pickerRegion, html, '');\n};\n\n/**\n * To be removed, this is now done as a part of Templates.renderForPromise()\n *\n * @param {String} html\n * @param {String} js\n * @return {[*, *]}\n */\nconst fetchContentFromRender = (html, js) => {\n    return [html, js];\n};\n\n/**\n * Here we build the function that is passed to the user picker that'll handle updating the user content area\n * of the grading interface.\n *\n * @param {HTMLElement} root\n * @param {Function} getContentForUser\n * @param {Function} getGradeForUser\n * @return {Function}\n */\nconst getUpdateUserContentFunction = (root, getContentForUser, getGradeForUser) => {\n    let firstLoad = true;\n\n    return async(user) => {\n        const spinner = firstLoad ? null : addIconToContainerWithPromise(root);\n        const [\n            [html, js],\n            userGrade,\n        ] = await Promise.all([\n            getContentForUser(user.id).then(fetchContentFromRender),\n            getGradeForUser(user.id),\n        ]);\n        Templates.replaceNodeContents(root.querySelector(Selectors.regions.moduleReplace), html, js);\n\n        const [\n            gradingPanelHtml,\n            gradingPanelJS\n        ] = await Templates.render(userGrade.templatename, userGrade.grade).then(fetchContentFromRender);\n        const panelContainer = root.querySelector(Selectors.regions.gradingPanelContainer);\n        const panel = panelContainer.querySelector(Selectors.regions.gradingPanel);\n        Templates.replaceNodeContents(panel, gradingPanelHtml, gradingPanelJS);\n        panelContainer.scrollTop = 0;\n        firstLoad = false;\n\n        if (spinner) {\n            spinner.resolve();\n        }\n    };\n};\n\n/**\n * Show the search results container and hide the user picker and body content.\n *\n * @param {HTMLElement} bodyContainer The container element for the body content\n * @param {HTMLElement} userPickerContainer The container element for the user picker\n * @param {HTMLElement} searchResultsContainer The container element for the search results\n */\nconst showSearchResultContainer = (bodyContainer, userPickerContainer, searchResultsContainer) => {\n    bodyContainer.classList.add('hidden');\n    userPickerContainer.classList.add('hidden');\n    searchResultsContainer.classList.remove('hidden');\n};\n\n/**\n * Hide the search results container and show the user picker and body content.\n *\n * @param {HTMLElement} bodyContainer The container element for the body content\n * @param {HTMLElement} userPickerContainer The container element for the user picker\n * @param {HTMLElement} searchResultsContainer The container element for the search results\n */\nconst hideSearchResultContainer = (bodyContainer, userPickerContainer, searchResultsContainer) => {\n    bodyContainer.classList.remove('hidden');\n    userPickerContainer.classList.remove('hidden');\n    searchResultsContainer.classList.add('hidden');\n};\n\n/**\n * Toggles the visibility of the user search.\n *\n * @param {HTMLElement} toggleSearchButton The button that toggles the search\n * @param {HTMLElement} searchContainer The container element for the user search\n * @param {HTMLElement} searchInput The input element for searching\n */\nconst showUserSearchInput = (toggleSearchButton, searchContainer, searchInput) => {\n    searchContainer.classList.remove('collapsed');\n    toggleSearchButton.setAttribute('aria-expanded', 'true');\n    toggleSearchButton.classList.add('expand');\n    toggleSearchButton.classList.remove('collapse');\n    searchInput.focus();\n};\n\n/**\n * Toggles the visibility of the user search.\n *\n * @param {HTMLElement} toggleSearchButton The button that toggles the search\n * @param {HTMLElement} searchContainer The container element for the user search\n * @param {HTMLElement} searchInput The input element for searching\n */\nconst hideUserSearchInput = (toggleSearchButton, searchContainer, searchInput) => {\n    searchContainer.classList.add('collapsed');\n    toggleSearchButton.setAttribute('aria-expanded', 'false');\n    toggleSearchButton.classList.add('collapse');\n    toggleSearchButton.classList.remove('expand');\n    toggleSearchButton.focus();\n    searchInput.value = '';\n};\n\n/**\n * Find the list of users who's names include the given search term.\n *\n * @param {Array} userList List of users for the grader\n * @param {String} searchTerm The search term to match\n * @return {Array}\n */\nconst searchForUsers = (userList, searchTerm) => {\n    if (searchTerm === '') {\n        return userList;\n    }\n\n    searchTerm = searchTerm.toLowerCase();\n\n    return userList.filter((user) => {\n        return user.fullname.toLowerCase().includes(searchTerm);\n    });\n};\n\n/**\n * Render the list of users in the search results area.\n *\n * @param {HTMLElement} searchResultsContainer The container element for search results\n * @param {Array} users The list of users to display\n */\nconst renderSearchResults = async (searchResultsContainer, users) => {\n    const {html, js} = await Templates.renderForPromise(templateNames.grader.searchResults, {users});\n    Templates.replaceNodeContents(searchResultsContainer, html, js);\n};\n\n/**\n * Add click handlers to the buttons in the header of the grading interface.\n *\n * @param {HTMLElement} graderLayout\n * @param {Object} userPicker\n * @param {Function} saveGradeFunction\n * @param {Array} userList List of users for the grader.\n */\nconst registerEventListeners = (graderLayout, userPicker, saveGradeFunction, userList) => {\n    const graderContainer = graderLayout.getContainer();\n    const toggleSearchButton = graderContainer.querySelector(Selectors.buttons.toggleSearch);\n    const searchInputContainer = graderContainer.querySelector(Selectors.regions.userSearchContainer);\n    const searchInput = searchInputContainer.querySelector(Selectors.regions.userSearchInput);\n    const bodyContainer = graderContainer.querySelector(Selectors.regions.bodyContainer);\n    const userPickerContainer = graderContainer.querySelector(Selectors.regions.pickerRegion);\n    const searchResultsContainer = graderContainer.querySelector(Selectors.regions.searchResultsContainer);\n\n    graderContainer.addEventListener('click', (e) => {\n        if (e.target.closest(Selectors.buttons.toggleFullscreen)) {\n            e.stopImmediatePropagation();\n            e.preventDefault();\n            graderLayout.toggleFullscreen();\n\n            return;\n        }\n\n        if (e.target.closest(Selectors.buttons.closeGrader)) {\n            e.stopImmediatePropagation();\n            e.preventDefault();\n\n            graderLayout.close();\n\n            return;\n        }\n\n        if (e.target.closest(Selectors.buttons.saveGrade)) {\n            saveGradeFunction(userPicker.currentUser);\n        }\n\n        if (e.target.closest(Selectors.buttons.toggleSearch)) {\n            if (toggleSearchButton.getAttribute('aria-expanded') === 'true') {\n                // Search is open so let's close it.\n                hideUserSearchInput(toggleSearchButton, searchInputContainer, searchInput);\n                hideSearchResultContainer(bodyContainer, userPickerContainer, searchResultsContainer);\n                searchResultsContainer.innerHTML = '';\n            } else {\n                // Search is closed so let's open it.\n                showUserSearchInput(toggleSearchButton, searchInputContainer, searchInput);\n                showSearchResultContainer(bodyContainer, userPickerContainer, searchResultsContainer);\n                renderSearchResults(searchResultsContainer, userList);\n            }\n\n            return;\n        }\n\n        const selectUserButton = e.target.closest(Selectors.buttons.selectUser);\n        if (selectUserButton) {\n            const userId = selectUserButton.getAttribute('data-userid');\n            const user = userList.find(user => user.id == userId);\n            userPicker.setUserId(userId);\n            userPicker.showUser(user);\n            hideUserSearchInput(toggleSearchButton, searchInputContainer, searchInput);\n            hideSearchResultContainer(bodyContainer, userPickerContainer, searchResultsContainer);\n            searchResultsContainer.innerHTML = '';\n        }\n    });\n\n    // Debounce the search input so that it only executes 300 milliseconds after the user has finished typing.\n    searchInput.addEventListener('input', debounce(() => {\n        const users = searchForUsers(userList, searchInput.value);\n        renderSearchResults(searchResultsContainer, users);\n    }, 300));\n};\n\n/**\n * Get the function used to save a user grade.\n *\n * @param {HTMLElement} root The container for the grader\n * @param {Function} setGradeForUser The function that will be called.\n * @return {Function}\n */\nconst getSaveUserGradeFunction = (root, setGradeForUser) => {\n    return async(user) => {\n        try {\n            root.querySelector(Selectors.regions.gradingPanelErrors).innerHTML = '';\n            const result = await setGradeForUser(user.id, root.querySelector(Selectors.regions.gradingPanel));\n            if (result.success) {\n                addToast(await getString('grades:gradesavedfor', 'mod_forum', user));\n            }\n            if (result.failed) {\n                displayGradingError(root, user, result.error);\n            }\n\n            return result;\n        } catch (err) {\n            displayGradingError(root, user, err);\n\n            return failedUpdate(err);\n        }\n    };\n};\n\n/**\n * Display a grading error, typically from a failed save.\n *\n * @param {HTMLElement} root The container for the grader\n * @param {Object} user The user who was errored\n * @param {Object} err The details of the error\n */\nconst displayGradingError = async(root, user, err) => {\n    const [\n        {html, js},\n        errorString\n    ] = await Promise.all([\n        Templates.renderForPromise(templateNames.grader.gradingPanel.error, {error: err}),\n        await getString('grades:gradesavefailed', 'mod_forum', {error: err.message, ...user}),\n    ]);\n\n    Templates.replaceNodeContents(root.querySelector(Selectors.regions.gradingPanelErrors), html, js);\n    addToast(errorString);\n};\n\n/**\n * Launch the grader interface with the specified parameters.\n *\n * @param {Function} getListOfUsers A function to get the list of users\n * @param {Function} getContentForUser A function to get the content for a specific user\n * @param {Function} getGradeForUser A function get the grade details for a specific user\n * @param {Function} setGradeForUser A function to set the grade for a specific user\n */\nexport const launch = async(getListOfUsers, getContentForUser, getGradeForUser, setGradeForUser, {\n    initialUserId = null, moduleName, courseName, courseUrl\n} = {}) => {\n\n    // We need all of these functions to be executed in series, if one step runs before another the interface\n    // will not work.\n    const [\n        graderLayout,\n        {html, js},\n        userList,\n    ] = await Promise.all([\n        createFullScreenWindow({fullscreen: false, showLoader: false}),\n        Templates.renderForPromise(templateNames.grader.app, {\n            moduleName,\n            courseName,\n            courseUrl,\n            drawer: {show: true}\n        }),\n        getListOfUsers(),\n    ]);\n    const graderContainer = graderLayout.getContainer();\n\n    const saveGradeFunction = getSaveUserGradeFunction(graderContainer, setGradeForUser);\n\n    Templates.replaceNodeContents(graderContainer, html, js);\n    const updateUserContent = getUpdateUserContentFunction(graderContainer, getContentForUser, getGradeForUser);\n\n    const userIds = userList.map(user => user.id);\n    const statusContainer = graderContainer.querySelector(Selectors.regions.statusContainer);\n    // Fetch the userpicker for display.\n    const userPicker = await getUserPicker(\n        userList,\n        user => {\n            const renderContext = {\n                status: null,\n                index: userIds.indexOf(user.id) + 1,\n                total: userList.length\n            };\n            Templates.render(templateNames.grader.status, renderContext).then(html => {\n                statusContainer.innerHTML = html;\n                return html;\n            }).catch();\n            updateUserContent(user);\n        },\n        saveGradeFunction,\n        {\n            initialUserId,\n        },\n    );\n\n    // Register all event listeners.\n    registerEventListeners(graderLayout, userPicker, saveGradeFunction, userList);\n\n    // Display the newly created user picker.\n    displayUserPicker(graderContainer, userPicker.rootNode);\n};\n\nexport {getGradingPanelFunctions};\n"],"file":"grader.min.js"}
\ No newline at end of file
diff --git a/mod/forum/amd/build/local/grades/local/grader/selectors.min.js b/mod/forum/amd/build/local/grades/local/grader/selectors.min.js
index 18816fdfacb..c71a05712ad 100644
--- a/mod/forum/amd/build/local/grades/local/grader/selectors.min.js
+++ b/mod/forum/amd/build/local/grades/local/grader/selectors.min.js
@@ -1,2 +1,2 @@
-define ("mod_forum/local/grades/local/grader/selectors",["exports"],function(a){"use strict";Object.defineProperty(a,"__esModule",{value:!0});a.default=void 0;var b=function(a,b){return"[data-".concat(a,"=\"").concat(b,"\"]")},c={buttons:{toggleFullscreen:b("action","togglefullscreen"),closeGrader:b("action","closegrader"),saveGrade:b("action","savegrade")},regions:{moduleReplace:b("region","module_content"),pickerRegion:b("region","user_picker"),gradingPanel:b("region","grade"),gradingPanelErrors:b("region","grade-errors")}};a.default=c;return a.default});
+define ("mod_forum/local/grades/local/grader/selectors",["exports"],function(a){"use strict";Object.defineProperty(a,"__esModule",{value:!0});a.default=void 0;var b=function(a,b){return"[data-".concat(a,"=\"").concat(b,"\"]")},c={buttons:{toggleFullscreen:b("action","togglefullscreen"),closeGrader:b("action","closegrader"),saveGrade:b("action","savegrade"),selectUser:b("action","select-user"),toggleSearch:b("action","toggle-search")},regions:{bodyContainer:b("region","body-container"),moduleReplace:b("region","module_content"),pickerRegion:b("region","user_picker"),gradingPanel:b("region","grade"),gradingPanelContainer:b("region","grading-panel-container"),gradingPanelErrors:b("region","grade-errors"),searchResultsContainer:b("region","search-results-container"),statusContainer:b("region","status-container"),userSearchContainer:b("region","user-search-container"),userSearchInput:b("region","user-search-input")}};a.default=c;return a.default});
 //# sourceMappingURL=selectors.min.js.map
diff --git a/mod/forum/amd/build/local/grades/local/grader/selectors.min.js.map b/mod/forum/amd/build/local/grades/local/grader/selectors.min.js.map
index 4cbe9fefd21..f7ddb573d5f 100644
--- a/mod/forum/amd/build/local/grades/local/grader/selectors.min.js.map
+++ b/mod/forum/amd/build/local/grades/local/grader/selectors.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/local/grades/local/grader/selectors.js"],"names":["getDataSelector","name","value","buttons","toggleFullscreen","closeGrader","saveGrade","regions","moduleReplace","pickerRegion","gradingPanel","gradingPanelErrors"],"mappings":"kKA8BMA,CAAAA,CAAe,CAAG,SAACC,CAAD,CAAOC,CAAP,CAAiB,CACrC,sBAAgBD,CAAhB,eAAyBC,CAAzB,OACH,C,GAEc,CACXC,OAAO,CAAE,CACLC,gBAAgB,CAAEJ,CAAe,CAAC,QAAD,CAAW,kBAAX,CAD5B,CAELK,WAAW,CAAEL,CAAe,CAAC,QAAD,CAAW,aAAX,CAFvB,CAGLM,SAAS,CAAEN,CAAe,CAAC,QAAD,CAAW,WAAX,CAHrB,CADE,CAMXO,OAAO,CAAE,CACLC,aAAa,CAAER,CAAe,CAAC,QAAD,CAAW,gBAAX,CADzB,CAELS,YAAY,CAAET,CAAe,CAAC,QAAD,CAAW,aAAX,CAFxB,CAGLU,YAAY,CAAEV,CAAe,CAAC,QAAD,CAAW,OAAX,CAHxB,CAILW,kBAAkB,CAAEX,CAAe,CAAC,QAAD,CAAW,cAAX,CAJ9B,CANE,C","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Define all of the selectors we will be using on the grading interface.\n *\n * @module     mod_forum/local/grades/local/grader/selectors\n * @package    mod_forum\n * @copyright  2019 Mathew May <mathew.solutions>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\n/**\n * A small helper function to build queryable data selectors.\n * @param {String} name\n * @param {String} value\n * @return {string}\n */\nconst getDataSelector = (name, value) => {\n    return `[data-${name}=\"${value}\"]`;\n};\n\nexport default {\n    buttons: {\n        toggleFullscreen: getDataSelector('action', 'togglefullscreen'),\n        closeGrader: getDataSelector('action', 'closegrader'),\n        saveGrade: getDataSelector('action', 'savegrade'),\n    },\n    regions: {\n        moduleReplace: getDataSelector('region', 'module_content'),\n        pickerRegion: getDataSelector('region', 'user_picker'),\n        gradingPanel: getDataSelector('region', 'grade'),\n        gradingPanelErrors: getDataSelector('region', 'grade-errors'),\n    },\n};\n\n"],"file":"selectors.min.js"}
\ No newline at end of file
+{"version":3,"sources":["../../../../../src/local/grades/local/grader/selectors.js"],"names":["getDataSelector","name","value","buttons","toggleFullscreen","closeGrader","saveGrade","selectUser","toggleSearch","regions","bodyContainer","moduleReplace","pickerRegion","gradingPanel","gradingPanelContainer","gradingPanelErrors","searchResultsContainer","statusContainer","userSearchContainer","userSearchInput"],"mappings":"kKA8BMA,CAAAA,CAAe,CAAG,SAACC,CAAD,CAAOC,CAAP,CAAiB,CACrC,sBAAgBD,CAAhB,eAAyBC,CAAzB,OACH,C,GAEc,CACXC,OAAO,CAAE,CACLC,gBAAgB,CAAEJ,CAAe,CAAC,QAAD,CAAW,kBAAX,CAD5B,CAELK,WAAW,CAAEL,CAAe,CAAC,QAAD,CAAW,aAAX,CAFvB,CAGLM,SAAS,CAAEN,CAAe,CAAC,QAAD,CAAW,WAAX,CAHrB,CAILO,UAAU,CAAEP,CAAe,CAAC,QAAD,CAAW,aAAX,CAJtB,CAKLQ,YAAY,CAAER,CAAe,CAAC,QAAD,CAAW,eAAX,CALxB,CADE,CAQXS,OAAO,CAAE,CACLC,aAAa,CAAEV,CAAe,CAAC,QAAD,CAAW,gBAAX,CADzB,CAELW,aAAa,CAAEX,CAAe,CAAC,QAAD,CAAW,gBAAX,CAFzB,CAGLY,YAAY,CAAEZ,CAAe,CAAC,QAAD,CAAW,aAAX,CAHxB,CAILa,YAAY,CAAEb,CAAe,CAAC,QAAD,CAAW,OAAX,CAJxB,CAKLc,qBAAqB,CAAEd,CAAe,CAAC,QAAD,CAAW,yBAAX,CALjC,CAMLe,kBAAkB,CAAEf,CAAe,CAAC,QAAD,CAAW,cAAX,CAN9B,CAOLgB,sBAAsB,CAAEhB,CAAe,CAAC,QAAD,CAAW,0BAAX,CAPlC,CAQLiB,eAAe,CAAEjB,CAAe,CAAC,QAAD,CAAW,kBAAX,CAR3B,CASLkB,mBAAmB,CAAElB,CAAe,CAAC,QAAD,CAAW,uBAAX,CAT/B,CAULmB,eAAe,CAAEnB,CAAe,CAAC,QAAD,CAAW,mBAAX,CAV3B,CARE,C","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Define all of the selectors we will be using on the grading interface.\n *\n * @module     mod_forum/local/grades/local/grader/selectors\n * @package    mod_forum\n * @copyright  2019 Mathew May <mathew.solutions>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\n/**\n * A small helper function to build queryable data selectors.\n * @param {String} name\n * @param {String} value\n * @return {string}\n */\nconst getDataSelector = (name, value) => {\n    return `[data-${name}=\"${value}\"]`;\n};\n\nexport default {\n    buttons: {\n        toggleFullscreen: getDataSelector('action', 'togglefullscreen'),\n        closeGrader: getDataSelector('action', 'closegrader'),\n        saveGrade: getDataSelector('action', 'savegrade'),\n        selectUser: getDataSelector('action', 'select-user'),\n        toggleSearch: getDataSelector('action', 'toggle-search')\n    },\n    regions: {\n        bodyContainer: getDataSelector('region', 'body-container'),\n        moduleReplace: getDataSelector('region', 'module_content'),\n        pickerRegion: getDataSelector('region', 'user_picker'),\n        gradingPanel: getDataSelector('region', 'grade'),\n        gradingPanelContainer: getDataSelector('region', 'grading-panel-container'),\n        gradingPanelErrors: getDataSelector('region', 'grade-errors'),\n        searchResultsContainer: getDataSelector('region', 'search-results-container'),\n        statusContainer: getDataSelector('region', 'status-container'),\n        userSearchContainer: getDataSelector('region', 'user-search-container'),\n        userSearchInput: getDataSelector('region', 'user-search-input')\n    },\n};\n\n"],"file":"selectors.min.js"}
\ No newline at end of file
diff --git a/mod/forum/amd/build/local/grades/local/grader/user_picker.min.js b/mod/forum/amd/build/local/grades/local/grader/user_picker.min.js
index 701a7df3e5a..7eb4cbdded0 100644
--- a/mod/forum/amd/build/local/grades/local/grader/user_picker.min.js
+++ b/mod/forum/amd/build/local/grades/local/grader/user_picker.min.js
@@ -1,2 +1,2 @@
-define ("mod_forum/local/grades/local/grader/user_picker",["exports","core/templates","./user_picker/selectors"],function(a,b,c){"use strict";Object.defineProperty(a,"__esModule",{value:!0});a.default=void 0;b=d(b);c=d(c);function d(a){return a&&a.__esModule?a:{default:a}}function e(a){for(var b=1;b<arguments.length;b++){var c=null!=arguments[b]?arguments[b]:{},d=Object.keys(c);if("function"==typeof Object.getOwnPropertySymbols){d=d.concat(Object.getOwnPropertySymbols(c).filter(function(a){return Object.getOwnPropertyDescriptor(c,a).enumerable}))}d.forEach(function(b){f(a,b,c[b])})}return a}function f(a,b,c){if(b in a){Object.defineProperty(a,b,{value:c,enumerable:!0,configurable:!0,writable:!0})}else{a[b]=c}return a}function g(a,b){return k(a)||j(a,b)||h()}function h(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}function j(a,b){var c=[],d=!0,e=!1,f=void 0;try{for(var g=a[Symbol.iterator](),h;!(d=(h=g.next()).done);d=!0){c.push(h.value);if(b&&c.length===b)break}}catch(a){e=!0;f=a}finally{try{if(!d&&null!=g["return"])g["return"]()}finally{if(e)throw f}}return c}function k(a){if(Array.isArray(a))return a}function l(a,b,c,d,e,f,g){try{var h=a[f](g),i=h.value}catch(a){c(a);return}if(h.done){b(i)}else{Promise.resolve(i).then(d,e)}}function m(a){return function(){var b=this,c=arguments;return new Promise(function(d,e){var h=a.apply(b,c);function f(a){l(h,d,e,f,g,"next",a)}function g(a){l(h,d,e,f,g,"throw",a)}f(void 0)})}}function n(a,b){if(!(a instanceof b)){throw new TypeError("Cannot call a class as a function")}}function o(a,b){for(var c=0,d;c<b.length;c++){d=b[c];d.enumerable=d.enumerable||!1;d.configurable=!0;if("value"in d)d.writable=!0;Object.defineProperty(a,d.key,d)}}function p(a,b,c){if(b)o(a.prototype,b);if(c)o(a,c);return a}var q=function(){function a(b,c,d){n(this,a);this.userList=b;this.showUserCallback=c;this.preChangeUserCallback=d;this.currentUserIndex=0;this.render=this.render.bind(this);this.setUserId=this.setUserId.bind(this)}p(a,[{key:"setUserId",value:function setUserId(a){var b=this.userList.findIndex(function(b){return b.id===parseInt(a)});if(-1===b){throw Error("User with id ".concat(a," not found"))}this.currentUserIndex=b}},{key:"render",value:function(){var a=m(regeneratorRuntime.mark(function a(){var c,d,e;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:this.root=document.createElement("div");a.next=3;return this.renderNavigator();case 3:c=a.sent;d=c.html;e=c.js;b.default.replaceNodeContents(this.root,d,e);a.next=9;return this.showUser(this.currentUser);case 9:a.next=11;return this.renderSearch(this.userList);case 11:this.searchResultListener();this.registerEventListeners();case 13:case"end":return a.stop();}}},a,this)}));return function render(){return a.apply(this,arguments)}}()},{key:"renderNavigator",value:function renderNavigator(){return b.default.renderForPromise("".concat("mod_forum/local/grades/local/grader","/user_picker"),{})}},{key:"renderUserChange",value:function renderUserChange(a){return b.default.renderForPromise("".concat("mod_forum/local/grades/local/grader","/user_picker/user"),a)}},{key:"showUser",value:function(){var a=m(regeneratorRuntime.mark(function a(d){var e,f,h,i,j,k;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:a.next=2;return Promise.all([this.renderUserChange(d),this.showUserCallback(d)]);case 2:e=a.sent;f=g(e,1);h=f[0];i=h.html;j=h.js;k=this.root.querySelector(c.default.regions.userRegion);b.default.replaceNodeContents(k,i,j);case 9:case"end":return a.stop();}}},a,this)}));return function showUser(){return a.apply(this,arguments)}}()},{key:"registerEventListeners",value:function registerEventListeners(){var a=this;this.root.addEventListener("click",function(){var b=m(regeneratorRuntime.mark(function b(d){var e,f,g;return regeneratorRuntime.wrap(function(b){while(1){switch(b.prev=b.next){case 0:e=d.target.closest(c.default.actions.changeUser);f=d.target.closest(c.default.actions.searchUserInput);if(!e){b.next=10;break}b.next=5;return a.preChangeUserCallback(a.currentUser);case 5:g=b.sent;if(g.failed){b.next=10;break}a.updateIndex(parseInt(e.dataset.direction));b.next=10;return a.showUser(a.currentUser);case 10:if(f){a.onKeyUp(f)}case 11:case"end":return b.stop();}}},b)}));return function(){return b.apply(this,arguments)}}())}},{key:"onKeyUp",value:function onKeyUp(a){var b=this,c=null;a.onkeyup=function(){clearTimeout(c);c=setTimeout(function(){var c=m(regeneratorRuntime.mark(function c(d){var e,f;return regeneratorRuntime.wrap(function(c){while(1){switch(c.prev=c.next){case 0:e=a.value;f=d.filter(function(a){return a.fullname.toLowerCase().includes(e.toLowerCase())});c.next=4;return b.renderSearch(f);case 4:b.searchResultListener();case 5:case"end":return c.stop();}}},c)}));return function(){return c.apply(this,arguments)}}(),300,b.userList)}}},{key:"searchResultListener",value:function searchResultListener(){var a=this;this.root.querySelector(c.default.actions.searchUserBox).addEventListener("click",function(){var b=m(regeneratorRuntime.mark(function b(d){var e,f,g;return regeneratorRuntime.wrap(function(b){while(1){switch(b.prev=b.next){case 0:d.preventDefault();e=d.target.closest(c.default.actions.selectUser);if(!(null!==e)){b.next=11;break}f=a.userList.findIndex(function(a){return parseInt(a.id)===parseInt(e.dataset.userid)});b.next=6;return a.preChangeUserCallback(a.currentUser);case 6:g=b.sent;if(g.failed){b.next=11;break}a.updateIndex(0,parseInt(f));b.next=11;return a.showUser(a.currentUser);case 11:case"end":return b.stop();}}},b)}));return function(){return b.apply(this,arguments)}}())}},{key:"renderSearch",value:function(){var a=m(regeneratorRuntime.mark(function a(d){var e,f,g,h,i,j,k;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:e=d.slice(0,10);f=d.slice(10);g={expandedUsers:e,hasCollapsed:0<f.length,collapsedUsers:f};a.next=5;return b.default.renderForPromise("".concat("mod_forum/local/grades/local/grader","/user_picker/user_search"),g);case 5:h=a.sent;i=h.html;j=h.js;k=this.root.querySelector(c.default.actions.searchUserBox);b.default.replaceNode(k,i,j);case 10:case"end":return a.stop();}}},a,this)}));return function renderSearch(){return a.apply(this,arguments)}}()},{key:"updateIndex",value:function updateIndex(a){var b=1<arguments.length&&arguments[1]!==void 0?arguments[1]:null;if(b){this.currentUserIndex=b}else{this.currentUserIndex+=a}if(0>this.currentUserIndex){this.currentUserIndex=this.userList.length-1}else if(this.currentUserIndex>this.userList.length-1){this.currentUserIndex=0}return this.currentUserIndex}},{key:"currentUser",get:function get(){return e({},this.userList[this.currentUserIndex],{total:this.userList.length,displayIndex:this.currentUserIndex+1})}},{key:"rootNode",get:function get(){return this.root}}]);return a}(),r=function(){var a=m(regeneratorRuntime.mark(function a(b,c,d){var e,f,g,h,i=arguments;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:e=3<i.length&&i[3]!==void 0?i[3]:{},f=e.initialUserId,g=void 0===f?null:f;h=new q(b,c,d);if(g){h.setUserId(g)}a.next=5;return h.render();case 5:return a.abrupt("return",h);case 6:case"end":return a.stop();}}},a)}));return function(){return a.apply(this,arguments)}}();a.default=r;return a.default});
+define ("mod_forum/local/grades/local/grader/user_picker",["exports","core/templates","./user_picker/selectors"],function(a,b,c){"use strict";Object.defineProperty(a,"__esModule",{value:!0});a.default=void 0;b=d(b);c=d(c);function d(a){return a&&a.__esModule?a:{default:a}}function e(a){for(var b=1;b<arguments.length;b++){var c=null!=arguments[b]?arguments[b]:{},d=Object.keys(c);if("function"==typeof Object.getOwnPropertySymbols){d=d.concat(Object.getOwnPropertySymbols(c).filter(function(a){return Object.getOwnPropertyDescriptor(c,a).enumerable}))}d.forEach(function(b){f(a,b,c[b])})}return a}function f(a,b,c){if(b in a){Object.defineProperty(a,b,{value:c,enumerable:!0,configurable:!0,writable:!0})}else{a[b]=c}return a}function g(a,b){return k(a)||j(a,b)||h()}function h(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}function j(a,b){var c=[],d=!0,e=!1,f=void 0;try{for(var g=a[Symbol.iterator](),h;!(d=(h=g.next()).done);d=!0){c.push(h.value);if(b&&c.length===b)break}}catch(a){e=!0;f=a}finally{try{if(!d&&null!=g["return"])g["return"]()}finally{if(e)throw f}}return c}function k(a){if(Array.isArray(a))return a}function l(a,b,c,d,e,f,g){try{var h=a[f](g),i=h.value}catch(a){c(a);return}if(h.done){b(i)}else{Promise.resolve(i).then(d,e)}}function m(a){return function(){var b=this,c=arguments;return new Promise(function(d,e){var h=a.apply(b,c);function f(a){l(h,d,e,f,g,"next",a)}function g(a){l(h,d,e,f,g,"throw",a)}f(void 0)})}}function n(a,b){if(!(a instanceof b)){throw new TypeError("Cannot call a class as a function")}}function o(a,b){for(var c=0,d;c<b.length;c++){d=b[c];d.enumerable=d.enumerable||!1;d.configurable=!0;if("value"in d)d.writable=!0;Object.defineProperty(a,d.key,d)}}function p(a,b,c){if(b)o(a.prototype,b);if(c)o(a,c);return a}var q=function(){function a(b,c,d){n(this,a);this.userList=b;this.showUserCallback=c;this.preChangeUserCallback=d;this.currentUserIndex=0;this.render=this.render.bind(this);this.setUserId=this.setUserId.bind(this)}p(a,[{key:"setUserId",value:function setUserId(a){var b=this.userList.findIndex(function(b){return b.id===parseInt(a)});if(-1===b){throw Error("User with id ".concat(a," not found"))}this.currentUserIndex=b}},{key:"render",value:function(){var a=m(regeneratorRuntime.mark(function a(){var c,d,e;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:this.root=document.createElement("div");a.next=3;return this.renderNavigator();case 3:c=a.sent;d=c.html;e=c.js;b.default.replaceNodeContents(this.root,d,e);a.next=9;return this.showUser(this.currentUser);case 9:this.registerEventListeners();case 10:case"end":return a.stop();}}},a,this)}));return function render(){return a.apply(this,arguments)}}()},{key:"renderNavigator",value:function renderNavigator(){return b.default.renderForPromise("".concat("mod_forum/local/grades/local/grader","/user_picker"),{})}},{key:"renderUserChange",value:function renderUserChange(a){return b.default.renderForPromise("".concat("mod_forum/local/grades/local/grader","/user_picker/user"),a)}},{key:"showUser",value:function(){var a=m(regeneratorRuntime.mark(function a(d){var e,f,h,i,j,k;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:a.next=2;return Promise.all([this.renderUserChange(d),this.showUserCallback(d)]);case 2:e=a.sent;f=g(e,1);h=f[0];i=h.html;j=h.js;k=this.root.querySelector(c.default.regions.userRegion);b.default.replaceNodeContents(k,i,j);case 9:case"end":return a.stop();}}},a,this)}));return function showUser(){return a.apply(this,arguments)}}()},{key:"registerEventListeners",value:function registerEventListeners(){var a=this;this.root.addEventListener("click",function(){var b=m(regeneratorRuntime.mark(function b(d){var e,f;return regeneratorRuntime.wrap(function(b){while(1){switch(b.prev=b.next){case 0:e=d.target.closest(c.default.actions.changeUser);if(!e){b.next=9;break}b.next=4;return a.preChangeUserCallback(a.currentUser);case 4:f=b.sent;if(f.failed){b.next=9;break}a.updateIndex(parseInt(e.dataset.direction));b.next=9;return a.showUser(a.currentUser);case 9:case"end":return b.stop();}}},b)}));return function(){return b.apply(this,arguments)}}())}},{key:"updateIndex",value:function updateIndex(a){this.currentUserIndex+=a;if(0>this.currentUserIndex){this.currentUserIndex=this.userList.length-1}else if(this.currentUserIndex>this.userList.length-1){this.currentUserIndex=0}return this.currentUserIndex}},{key:"currentUser",get:function get(){return e({},this.userList[this.currentUserIndex],{total:this.userList.length,displayIndex:this.currentUserIndex+1})}},{key:"rootNode",get:function get(){return this.root}}]);return a}(),r=function(){var a=m(regeneratorRuntime.mark(function a(b,c,d){var e,f,g,h,i=arguments;return regeneratorRuntime.wrap(function(a){while(1){switch(a.prev=a.next){case 0:e=3<i.length&&i[3]!==void 0?i[3]:{},f=e.initialUserId,g=void 0===f?null:f;h=new q(b,c,d);if(g){h.setUserId(g)}a.next=5;return h.render();case 5:return a.abrupt("return",h);case 6:case"end":return a.stop();}}},a)}));return function(){return a.apply(this,arguments)}}();a.default=r;return a.default});
 //# sourceMappingURL=user_picker.min.js.map
diff --git a/mod/forum/amd/build/local/grades/local/grader/user_picker.min.js.map b/mod/forum/amd/build/local/grades/local/grader/user_picker.min.js.map
index ad44c6287c9..3c17998b525 100644
--- a/mod/forum/amd/build/local/grades/local/grader/user_picker.min.js.map
+++ b/mod/forum/amd/build/local/grades/local/grader/user_picker.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/local/grades/local/grader/user_picker.js"],"names":["UserPicker","userList","showUserCallback","preChangeUserCallback","currentUserIndex","render","bind","setUserId","userId","userIndex","findIndex","user","id","parseInt","Error","root","document","createElement","renderNavigator","html","js","Templates","replaceNodeContents","showUser","currentUser","renderSearch","searchResultListener","registerEventListeners","renderForPromise","context","Promise","all","renderUserChange","userRegion","querySelector","Selectors","regions","addEventListener","e","button","target","closest","actions","changeUser","input","searchUserInput","result","failed","updateIndex","dataset","direction","onKeyUp","timeout","onkeyup","clearTimeout","setTimeout","userInput","value","results","filter","fullname","toLowerCase","includes","searchUserBox","preventDefault","selectUser","foundUser","item","userid","trimmedUsers","slice","overflowUsers","builtResults","length","searchUserRegion","replaceNode","specificIndex","total","displayIndex","users","initialUserId","userPicker"],"mappings":"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","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * This module will tie together all of the different calls the gradable module will make.\n *\n * @module     mod_forum/local/grades/local/grader/user_picker\n * @package    mod_forum\n * @copyright  2019 Mathew May <mathew.solutions>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport Templates from 'core/templates';\nimport Selectors from './user_picker/selectors';\n\nconst templatePath = 'mod_forum/local/grades/local/grader';\n\nclass UserPicker {\n\n    /**\n     * Constructor for the User Picker.\n     *\n     * @param {Array} userList List of users\n     * @param {Function} showUserCallback The callback used to display the user\n     * @param {Function} preChangeUserCallback The callback to use before changing user\n     */\n    constructor(userList, showUserCallback, preChangeUserCallback) {\n        this.userList = userList;\n        this.showUserCallback = showUserCallback;\n        this.preChangeUserCallback = preChangeUserCallback;\n        this.currentUserIndex = 0;\n\n        // Ensure that render is bound correctly.\n        this.render = this.render.bind(this);\n        this.setUserId = this.setUserId.bind(this);\n    }\n\n    /**\n     * Set the current userid without rendering the change.\n     * To show the user, call showUser too.\n     *\n     * @param {Number} userId\n     */\n    setUserId(userId) {\n        // Determine the current index based on the user ID.\n        const userIndex = this.userList.findIndex(user => {\n            return user.id === parseInt(userId);\n        });\n\n        if (userIndex === -1) {\n            throw Error(`User with id ${userId} not found`);\n        }\n\n        this.currentUserIndex = userIndex;\n    }\n\n    /**\n     * Render the user picker.\n     */\n    async render() {\n        // Create the root node.\n        this.root = document.createElement('div');\n\n        const {html, js} = await this.renderNavigator();\n        Templates.replaceNodeContents(this.root, html, js);\n\n        // Call the showUser function to show the first user immediately.\n        await this.showUser(this.currentUser);\n\n        // Show a list of users under the user search box.\n        await this.renderSearch(this.userList);\n\n        this.searchResultListener();\n        // Ensure that the event listeners are all bound.\n        this.registerEventListeners();\n    }\n\n    /**\n     * Render the navigator itself.\n     *\n     * @returns {Promise}\n     */\n    renderNavigator() {\n        return Templates.renderForPromise(`${templatePath}/user_picker`, {});\n    }\n\n    /**\n     * Render the current user details for the picker.\n     *\n     * @param {Object} context The data used to render the user picker.\n     * @returns {Promise}\n     */\n    renderUserChange(context) {\n        return Templates.renderForPromise(`${templatePath}/user_picker/user`, context);\n    }\n\n    /**\n     * Show the specified user in the picker.\n     *\n     * @param {Object} user\n     */\n    async showUser(user) {\n        const [{html, js}] = await Promise.all([this.renderUserChange(user), this.showUserCallback(user)]);\n        const userRegion = this.root.querySelector(Selectors.regions.userRegion);\n        Templates.replaceNodeContents(userRegion, html, js);\n    }\n\n    /**\n     * Register the event listeners for the user picker.\n     */\n    registerEventListeners() {\n        this.root.addEventListener('click', async(e) => {\n            const button = e.target.closest(Selectors.actions.changeUser);\n            const input = e.target.closest(Selectors.actions.searchUserInput);\n\n            if (button) {\n                const result = await this.preChangeUserCallback(this.currentUser);\n\n                if (!result.failed) {\n                    this.updateIndex(parseInt(button.dataset.direction));\n                    await this.showUser(this.currentUser);\n                }\n            }\n            if (input) {\n\n                // Make the key up a seperate function.\n                this.onKeyUp(input);\n            }\n        });\n    }\n\n    /**\n     * Listener for keyboard entry that'll search the user list for matching users.\n     *\n     * @param {Text} input User entered text of the user to search for.\n     */\n    onKeyUp(input) {\n        // Init a timeout variable to be used below\n        let timeout = null;\n        // Listen for keystroke events\n        input.onkeyup = () => {\n            // Clear the timeout if it has already been set.\n            clearTimeout(timeout);\n            // Make a new timeout set to go off in 300ms\n            timeout = setTimeout(async(userList) => {\n                const userInput = input.value;\n                const results = userList.filter((user) => {\n                    return user.fullname.toLowerCase().includes(userInput.toLowerCase());\n                });\n                await this.renderSearch(results);\n                this.searchResultListener();\n            }, 300, this.userList);\n        };\n    }\n\n    /**\n     * Apply the click handler for the users found in the user search area.\n     */\n    searchResultListener() {\n        this.root.querySelector(Selectors.actions.searchUserBox).addEventListener('click', async(e) => {\n            e.preventDefault();\n            const user = e.target.closest(Selectors.actions.selectUser);\n            if (user !== null) {\n                const foundUser = this.userList.findIndex(item => parseInt(item.id) === parseInt(user.dataset.userid));\n                const result = await this.preChangeUserCallback(this.currentUser);\n\n                if (!result.failed) {\n                    this.updateIndex(0, parseInt(foundUser));\n                    await this.showUser(this.currentUser);\n                }\n            }\n        });\n    }\n\n    /**\n     * Render the user search results.\n     *\n     * @param {Array} results List of users\n     */\n    async renderSearch(results) {\n        const trimmedUsers = results.slice(0, 10);\n        const overflowUsers = results.slice(10);\n        const builtResults = {\n          'expandedUsers': trimmedUsers,\n          'hasCollapsed': overflowUsers.length > 0,\n          'collapsedUsers': overflowUsers,\n        };\n        const {html, js} = await Templates.renderForPromise(`${templatePath}/user_picker/user_search`, builtResults);\n        const searchUserRegion = this.root.querySelector(Selectors.actions.searchUserBox);\n        Templates.replaceNode(searchUserRegion, html, js);\n    }\n    /**\n     * Update the current user index.\n     *\n     * @param {Number} direction\n     * @param {Number} specificIndex\n     * @returns {Number}}\n     */\n    updateIndex(direction, specificIndex = null) {\n        if (specificIndex) {\n            this.currentUserIndex = specificIndex;\n        } else {\n            this.currentUserIndex += direction;\n        }\n\n        // Loop around the edges.\n        if (this.currentUserIndex < 0) {\n            this.currentUserIndex = this.userList.length - 1;\n        } else if (this.currentUserIndex > this.userList.length - 1) {\n            this.currentUserIndex = 0;\n        }\n\n        return this.currentUserIndex;\n    }\n\n    /**\n     * Get the details of the user currently shown with the total number of users, and the 1-indexed count of the\n     * current user.\n     *\n     * @returns {Object}\n     */\n    get currentUser() {\n        return {\n            ...this.userList[this.currentUserIndex],\n            total: this.userList.length,\n            displayIndex: this.currentUserIndex + 1,\n        };\n    }\n\n    /**\n     * Get the root node for the User Picker.\n     *\n     * @returns {HTMLElement}\n     */\n    get rootNode() {\n        return this.root;\n    }\n}\n\n/**\n * Create a new user picker.\n *\n * @param {Array} users The list of users\n * @param {Function} showUserCallback The function to call to show a specific user\n * @param {Function} preChangeUserCallback The fucntion to call to save the grade for the current user\n * @param {Number} [currentUserID] The userid of the current user\n * @returns {UserPicker}\n */\nexport default async(\n    users,\n    showUserCallback,\n    preChangeUserCallback,\n    {\n        initialUserId = null,\n    } = {}\n) => {\n    const userPicker = new UserPicker(users, showUserCallback, preChangeUserCallback);\n    if (initialUserId) {\n        userPicker.setUserId(initialUserId);\n    }\n    await userPicker.render();\n\n    return userPicker;\n};\n"],"file":"user_picker.min.js"}
\ No newline at end of file
+{"version":3,"sources":["../../../../../src/local/grades/local/grader/user_picker.js"],"names":["UserPicker","userList","showUserCallback","preChangeUserCallback","currentUserIndex","render","bind","setUserId","userId","userIndex","findIndex","user","id","parseInt","Error","root","document","createElement","renderNavigator","html","js","Templates","replaceNodeContents","showUser","currentUser","registerEventListeners","renderForPromise","context","Promise","all","renderUserChange","userRegion","querySelector","Selectors","regions","addEventListener","e","button","target","closest","actions","changeUser","result","failed","updateIndex","dataset","direction","length","total","displayIndex","users","initialUserId","userPicker"],"mappings":"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","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * This module will tie together all of the different calls the gradable module will make.\n *\n * @module     mod_forum/local/grades/local/grader/user_picker\n * @package    mod_forum\n * @copyright  2019 Mathew May <mathew.solutions>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport Templates from 'core/templates';\nimport Selectors from './user_picker/selectors';\n\nconst templatePath = 'mod_forum/local/grades/local/grader';\n\nclass UserPicker {\n\n    /**\n     * Constructor for the User Picker.\n     *\n     * @param {Array} userList List of users\n     * @param {Function} showUserCallback The callback used to display the user\n     * @param {Function} preChangeUserCallback The callback to use before changing user\n     */\n    constructor(userList, showUserCallback, preChangeUserCallback) {\n        this.userList = userList;\n        this.showUserCallback = showUserCallback;\n        this.preChangeUserCallback = preChangeUserCallback;\n        this.currentUserIndex = 0;\n\n        // Ensure that render is bound correctly.\n        this.render = this.render.bind(this);\n        this.setUserId = this.setUserId.bind(this);\n    }\n\n    /**\n     * Set the current userid without rendering the change.\n     * To show the user, call showUser too.\n     *\n     * @param {Number} userId\n     */\n    setUserId(userId) {\n        // Determine the current index based on the user ID.\n        const userIndex = this.userList.findIndex(user => {\n            return user.id === parseInt(userId);\n        });\n\n        if (userIndex === -1) {\n            throw Error(`User with id ${userId} not found`);\n        }\n\n        this.currentUserIndex = userIndex;\n    }\n\n    /**\n     * Render the user picker.\n     */\n    async render() {\n        // Create the root node.\n        this.root = document.createElement('div');\n\n        const {html, js} = await this.renderNavigator();\n        Templates.replaceNodeContents(this.root, html, js);\n\n        // Call the showUser function to show the first user immediately.\n        await this.showUser(this.currentUser);\n\n        // Ensure that the event listeners are all bound.\n        this.registerEventListeners();\n    }\n\n    /**\n     * Render the navigator itself.\n     *\n     * @returns {Promise}\n     */\n    renderNavigator() {\n        return Templates.renderForPromise(`${templatePath}/user_picker`, {});\n    }\n\n    /**\n     * Render the current user details for the picker.\n     *\n     * @param {Object} context The data used to render the user picker.\n     * @returns {Promise}\n     */\n    renderUserChange(context) {\n        return Templates.renderForPromise(`${templatePath}/user_picker/user`, context);\n    }\n\n    /**\n     * Show the specified user in the picker.\n     *\n     * @param {Object} user\n     */\n    async showUser(user) {\n        const [{html, js}] = await Promise.all([this.renderUserChange(user), this.showUserCallback(user)]);\n        const userRegion = this.root.querySelector(Selectors.regions.userRegion);\n        Templates.replaceNodeContents(userRegion, html, js);\n    }\n\n    /**\n     * Register the event listeners for the user picker.\n     */\n    registerEventListeners() {\n        this.root.addEventListener('click', async(e) => {\n            const button = e.target.closest(Selectors.actions.changeUser);\n\n            if (button) {\n                const result = await this.preChangeUserCallback(this.currentUser);\n\n                if (!result.failed) {\n                    this.updateIndex(parseInt(button.dataset.direction));\n                    await this.showUser(this.currentUser);\n                }\n            }\n        });\n    }\n\n    /**\n     * Update the current user index.\n     *\n     * @param {Number} direction\n     * @returns {Number}}\n     */\n    updateIndex(direction) {\n        this.currentUserIndex += direction;\n\n        // Loop around the edges.\n        if (this.currentUserIndex < 0) {\n            this.currentUserIndex = this.userList.length - 1;\n        } else if (this.currentUserIndex > this.userList.length - 1) {\n            this.currentUserIndex = 0;\n        }\n\n        return this.currentUserIndex;\n    }\n\n    /**\n     * Get the details of the user currently shown with the total number of users, and the 1-indexed count of the\n     * current user.\n     *\n     * @returns {Object}\n     */\n    get currentUser() {\n        return {\n            ...this.userList[this.currentUserIndex],\n            total: this.userList.length,\n            displayIndex: this.currentUserIndex + 1,\n        };\n    }\n\n    /**\n     * Get the root node for the User Picker.\n     *\n     * @returns {HTMLElement}\n     */\n    get rootNode() {\n        return this.root;\n    }\n}\n\n/**\n * Create a new user picker.\n *\n * @param {Array} users The list of users\n * @param {Function} showUserCallback The function to call to show a specific user\n * @param {Function} preChangeUserCallback The fucntion to call to save the grade for the current user\n * @param {Number} [currentUserID] The userid of the current user\n * @returns {UserPicker}\n */\nexport default async(\n    users,\n    showUserCallback,\n    preChangeUserCallback,\n    {\n        initialUserId = null,\n    } = {}\n) => {\n    const userPicker = new UserPicker(users, showUserCallback, preChangeUserCallback);\n    if (initialUserId) {\n        userPicker.setUserId(initialUserId);\n    }\n    await userPicker.render();\n\n    return userPicker;\n};\n"],"file":"user_picker.min.js"}
\ No newline at end of file
diff --git a/mod/forum/amd/build/local/grades/local/grader/user_picker/selectors.min.js b/mod/forum/amd/build/local/grades/local/grader/user_picker/selectors.min.js
index 15a42029242..99f20c9bf41 100644
--- a/mod/forum/amd/build/local/grades/local/grader/user_picker/selectors.min.js
+++ b/mod/forum/amd/build/local/grades/local/grader/user_picker/selectors.min.js
@@ -1,2 +1,2 @@
-define ("mod_forum/local/grades/local/grader/user_picker/selectors",["exports"],function(a){"use strict";Object.defineProperty(a,"__esModule",{value:!0});a.default=void 0;a.default={regions:{userRegion:"[data-region=\"user_picker/user\"]"},actions:{changeUser:"[data-action=\"change-user\"]",selectUser:"[data-action=\"select-user\"]",searchUserBox:"[data-action=\"search-user-box\"]",searchUserInput:"[data-action=\"search-user-input\"]"}};return a.default});
+define ("mod_forum/local/grades/local/grader/user_picker/selectors",["exports"],function(a){"use strict";Object.defineProperty(a,"__esModule",{value:!0});a.default=void 0;a.default={regions:{userRegion:"[data-region=\"user_picker/user\"]"},actions:{changeUser:"[data-action=\"change-user\"]"}};return a.default});
 //# sourceMappingURL=selectors.min.js.map
diff --git a/mod/forum/amd/build/local/grades/local/grader/user_picker/selectors.min.js.map b/mod/forum/amd/build/local/grades/local/grader/user_picker/selectors.min.js.map
index 28e8c47934a..9c9dddcec17 100644
--- a/mod/forum/amd/build/local/grades/local/grader/user_picker/selectors.min.js.map
+++ b/mod/forum/amd/build/local/grades/local/grader/user_picker/selectors.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../src/local/grades/local/grader/user_picker/selectors.js"],"names":["regions","userRegion","actions","changeUser","selectUser","searchUserBox","searchUserInput"],"mappings":"qLAwBe,CACXA,OAAO,CAAE,CACLC,UAAU,CAAE,oCADP,CADE,CAIXC,OAAO,CAAE,CACLC,UAAU,CAAE,+BADP,CAELC,UAAU,CAAE,+BAFP,CAGLC,aAAa,CAAE,mCAHV,CAILC,eAAe,CAAE,qCAJZ,CAJE,C","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Define all of the selectors we will be using on the grading interface.\n *\n * @module     mod_forum/local/grades/local/grader/user_picker/selectors\n * @package    mod_forum\n * @copyright  2019 Mathew May <mathew.solutions>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nexport default {\n    regions: {\n        userRegion: '[data-region=\"user_picker/user\"]',\n    },\n    actions: {\n        changeUser: '[data-action=\"change-user\"]',\n        selectUser: '[data-action=\"select-user\"]',\n        searchUserBox: '[data-action=\"search-user-box\"]',\n        searchUserInput: '[data-action=\"search-user-input\"]',\n    }\n};\n\n"],"file":"selectors.min.js"}
\ No newline at end of file
+{"version":3,"sources":["../../../../../../src/local/grades/local/grader/user_picker/selectors.js"],"names":["regions","userRegion","actions","changeUser"],"mappings":"qLAwBe,CACXA,OAAO,CAAE,CACLC,UAAU,CAAE,oCADP,CADE,CAIXC,OAAO,CAAE,CACLC,UAAU,CAAE,+BADP,CAJE,C","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Define all of the selectors we will be using on the grading interface.\n *\n * @module     mod_forum/local/grades/local/grader/user_picker/selectors\n * @package    mod_forum\n * @copyright  2019 Mathew May <mathew.solutions>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nexport default {\n    regions: {\n        userRegion: '[data-region=\"user_picker/user\"]',\n    },\n    actions: {\n        changeUser: '[data-action=\"change-user\"]',\n    }\n};\n\n"],"file":"selectors.min.js"}
\ No newline at end of file
diff --git a/mod/forum/amd/src/grades/expandconversation.js b/mod/forum/amd/src/grades/expandconversation.js
index face93f78b3..cb9757e3334 100644
--- a/mod/forum/amd/src/grades/expandconversation.js
+++ b/mod/forum/amd/src/grades/expandconversation.js
@@ -45,6 +45,7 @@ const showPostInContext = async(rootNode) => {
     const postId = rootNode.dataset.postid;
     const discussionId = rootNode.dataset.discussionid;
     const discussionName = rootNode.dataset.name;
+    const experimentalDisplayMode = rootNode.dataset.experimentalDisplayMode == "1";
 
     const [
         allPosts,
@@ -58,12 +59,27 @@ const showPostInContext = async(rootNode) => {
         }),
     ]);
 
-    const userPosts = allPosts.posts.map((post) => {
-        post.subject = null;
+    const postsById = new Map(allPosts.posts.map(post => {
         post.readonly = true;
-        post.html.rating = null;
+        post.hasreplies = false;
+        post.replies = [];
+        return [post.id, post];
+    }));
 
-        return post;
+    let posts = [];
+    allPosts.posts.forEach(post => {
+        if (post.parentid) {
+            const parent = postsById.get(post.parentid);
+            if (parent) {
+                post.parentauthorname = parent.author.fullname;
+                parent.hasreplies = true;
+                parent.replies.push(post);
+            } else {
+                posts.push(post);
+            }
+        } else {
+            posts.push(post);
+        }
     });
 
     // Handle hidden event.
@@ -72,20 +88,21 @@ const showPostInContext = async(rootNode) => {
         modal.destroy();
     });
 
-    modal.show();
-
-    // Note: We do not use await here because it messes with the Modal transitions.
-    const templatePromise = Templates.render('mod_forum/grades/grader/discussion/post_modal', userPosts);
-    modal.setBody(templatePromise);
-    // eslint-disable-next-line promise/catch-or-return
-    templatePromise.then(() => {
+    modal.getRoot().on(ModalEvents.bodyRendered, () => {
         const relevantPost = modal.getRoot()[0].querySelector(`#p${postId}`);
         if (relevantPost) {
             relevantPost.scrollIntoView({behavior: "smooth"});
         }
-
-        return;
     });
+
+    modal.show();
+
+    // Note: We do not use await here because it messes with the Modal transitions.
+    const templatePromise = Templates.render('mod_forum/grades/grader/discussion/post_modal', {
+        posts,
+        experimentaldisplaymode: experimentalDisplayMode
+    });
+    modal.setBody(templatePromise);
 };
 
 /**
diff --git a/mod/forum/amd/src/grades/grader.js b/mod/forum/amd/src/grades/grader.js
index 84e7bf743f3..a8a2b20b0d2 100644
--- a/mod/forum/amd/src/grades/grader.js
+++ b/mod/forum/amd/src/grades/grader.js
@@ -27,6 +27,7 @@ import Templates from 'core/templates';
 import * as Grader from '../local/grades/grader';
 import Notification from 'core/notification';
 import CourseRepository from 'core_course/repository';
+import {relativeUrl} from 'core/url';
 
 const templateNames = {
     contentRegion: 'mod_forum/grades/grader/discussion/posts',
@@ -36,9 +37,10 @@ const templateNames = {
  * Curried function with CMID set, this is then used in unified grader as a fetch a users content.
  *
  * @param {Number} cmid
+ * @param {Bool} experimentalDisplayMode
  * @return {Function}
  */
-const getContentForUserIdFunction = (cmid) => (userid) => {
+const getContentForUserIdFunction = (cmid, experimentalDisplayMode) => (userid) => {
     /**
      * Given the parent function is called with the second param set execute the partially executed function.
      *
@@ -48,6 +50,7 @@ const getContentForUserIdFunction = (cmid) => (userid) => {
         .then(context => {
             // Rebuild the returned data for the template.
             context.discussions = context.discussions.map(discussionPostMapper);
+            context.experimentaldisplaymode = experimentalDisplayMode ? true : false;
 
             return Templates.render(templateNames.contentRegion, context);
         })
@@ -82,18 +85,26 @@ const discussionPostMapper = (discussion) => {
     const parentMap = new Map();
     discussion.posts.parentposts.forEach(post => parentMap.set(post.id, post));
     const userPosts = discussion.posts.userposts.map(post => {
-        post.subject = null;
         post.readonly = true;
-        post.starter = !post.parentid;
-        post.parent = parentMap.get(post.parentid);
-        post.html.rating = null;
+        post.hasreplies = false;
+        post.replies = [];
 
-        return post;
+        const parent = post.parentid ? parentMap.get(post.parentid) : null;
+        if (parent) {
+            parent.hasreplies = false;
+            parent.replies = [];
+            parent.readonly = true;
+            post.parentauthorname = parent.author.fullname;
+        }
+
+        return {
+            parent,
+            post
+        };
     });
 
     return {
-        id: discussion.id,
-        name: discussion.name,
+        ...discussion,
         posts: userPosts,
     };
 };
@@ -117,13 +128,15 @@ const launchWholeForumGrading = async(rootNode) => {
 
     await Grader.launch(
         getUsersForCmidFunction(data.cmid, groupID),
-        getContentForUserIdFunction(data.cmid),
+        getContentForUserIdFunction(data.cmid, data.experimentalDisplayMode == "1"),
         gradingPanelFunctions.getter,
         gradingPanelFunctions.setter,
         {
             groupid: data.groupid,
             initialUserId: data.initialuserid,
-            moduleName: data.name
+            moduleName: data.name,
+            courseName: data.courseName,
+            courseUrl: relativeUrl('/course/view.php', {id: data.courseId})
         }
     );
 };
diff --git a/mod/forum/amd/src/local/grades/grader.js b/mod/forum/amd/src/local/grades/grader.js
index 9db5920550d..d681414ab5e 100644
--- a/mod/forum/amd/src/local/grades/grader.js
+++ b/mod/forum/amd/src/local/grades/grader.js
@@ -30,6 +30,7 @@ import {add as addToast} from 'core/toast';
 import {get_string as getString} from 'core/str';
 import {failedUpdate} from 'core_grades/grades/grader/gradingpanel/normalise';
 import {addIconToContainerWithPromise} from 'core/loadingicon';
+import {debounce} from 'core/utils';
 
 const templateNames = {
     grader: {
@@ -37,6 +38,8 @@ const templateNames = {
         gradingPanel: {
             error: 'mod_forum/local/grades/local/grader/gradingpanel/error',
         },
+        searchResults: 'mod_forum/local/grades/local/grader/user_picker/user_search',
+        status: 'mod_forum/local/grades/local/grader/status',
     },
 };
 
@@ -72,8 +75,10 @@ const fetchContentFromRender = (html, js) => {
  * @return {Function}
  */
 const getUpdateUserContentFunction = (root, getContentForUser, getGradeForUser) => {
+    let firstLoad = true;
+
     return async(user) => {
-        const spinner = addIconToContainerWithPromise(root);
+        const spinner = firstLoad ? null : addIconToContainerWithPromise(root);
         const [
             [html, js],
             userGrade,
@@ -87,20 +92,122 @@ const getUpdateUserContentFunction = (root, getContentForUser, getGradeForUser)
             gradingPanelHtml,
             gradingPanelJS
         ] = await Templates.render(userGrade.templatename, userGrade.grade).then(fetchContentFromRender);
-        Templates.replaceNodeContents(root.querySelector(Selectors.regions.gradingPanel), gradingPanelHtml, gradingPanelJS);
-        spinner.resolve();
+        const panelContainer = root.querySelector(Selectors.regions.gradingPanelContainer);
+        const panel = panelContainer.querySelector(Selectors.regions.gradingPanel);
+        Templates.replaceNodeContents(panel, gradingPanelHtml, gradingPanelJS);
+        panelContainer.scrollTop = 0;
+        firstLoad = false;
+
+        if (spinner) {
+            spinner.resolve();
+        }
     };
 };
 
+/**
+ * Show the search results container and hide the user picker and body content.
+ *
+ * @param {HTMLElement} bodyContainer The container element for the body content
+ * @param {HTMLElement} userPickerContainer The container element for the user picker
+ * @param {HTMLElement} searchResultsContainer The container element for the search results
+ */
+const showSearchResultContainer = (bodyContainer, userPickerContainer, searchResultsContainer) => {
+    bodyContainer.classList.add('hidden');
+    userPickerContainer.classList.add('hidden');
+    searchResultsContainer.classList.remove('hidden');
+};
+
+/**
+ * Hide the search results container and show the user picker and body content.
+ *
+ * @param {HTMLElement} bodyContainer The container element for the body content
+ * @param {HTMLElement} userPickerContainer The container element for the user picker
+ * @param {HTMLElement} searchResultsContainer The container element for the search results
+ */
+const hideSearchResultContainer = (bodyContainer, userPickerContainer, searchResultsContainer) => {
+    bodyContainer.classList.remove('hidden');
+    userPickerContainer.classList.remove('hidden');
+    searchResultsContainer.classList.add('hidden');
+};
+
+/**
+ * Toggles the visibility of the user search.
+ *
+ * @param {HTMLElement} toggleSearchButton The button that toggles the search
+ * @param {HTMLElement} searchContainer The container element for the user search
+ * @param {HTMLElement} searchInput The input element for searching
+ */
+const showUserSearchInput = (toggleSearchButton, searchContainer, searchInput) => {
+    searchContainer.classList.remove('collapsed');
+    toggleSearchButton.setAttribute('aria-expanded', 'true');
+    toggleSearchButton.classList.add('expand');
+    toggleSearchButton.classList.remove('collapse');
+    searchInput.focus();
+};
+
+/**
+ * Toggles the visibility of the user search.
+ *
+ * @param {HTMLElement} toggleSearchButton The button that toggles the search
+ * @param {HTMLElement} searchContainer The container element for the user search
+ * @param {HTMLElement} searchInput The input element for searching
+ */
+const hideUserSearchInput = (toggleSearchButton, searchContainer, searchInput) => {
+    searchContainer.classList.add('collapsed');
+    toggleSearchButton.setAttribute('aria-expanded', 'false');
+    toggleSearchButton.classList.add('collapse');
+    toggleSearchButton.classList.remove('expand');
+    toggleSearchButton.focus();
+    searchInput.value = '';
+};
+
+/**
+ * Find the list of users who's names include the given search term.
+ *
+ * @param {Array} userList List of users for the grader
+ * @param {String} searchTerm The search term to match
+ * @return {Array}
+ */
+const searchForUsers = (userList, searchTerm) => {
+    if (searchTerm === '') {
+        return userList;
+    }
+
+    searchTerm = searchTerm.toLowerCase();
+
+    return userList.filter((user) => {
+        return user.fullname.toLowerCase().includes(searchTerm);
+    });
+};
+
+/**
+ * Render the list of users in the search results area.
+ *
+ * @param {HTMLElement} searchResultsContainer The container element for search results
+ * @param {Array} users The list of users to display
+ */
+const renderSearchResults = async (searchResultsContainer, users) => {
+    const {html, js} = await Templates.renderForPromise(templateNames.grader.searchResults, {users});
+    Templates.replaceNodeContents(searchResultsContainer, html, js);
+};
+
 /**
  * Add click handlers to the buttons in the header of the grading interface.
  *
  * @param {HTMLElement} graderLayout
  * @param {Object} userPicker
  * @param {Function} saveGradeFunction
+ * @param {Array} userList List of users for the grader.
  */
-const registerEventListeners = (graderLayout, userPicker, saveGradeFunction) => {
+const registerEventListeners = (graderLayout, userPicker, saveGradeFunction, userList) => {
     const graderContainer = graderLayout.getContainer();
+    const toggleSearchButton = graderContainer.querySelector(Selectors.buttons.toggleSearch);
+    const searchInputContainer = graderContainer.querySelector(Selectors.regions.userSearchContainer);
+    const searchInput = searchInputContainer.querySelector(Selectors.regions.userSearchInput);
+    const bodyContainer = graderContainer.querySelector(Selectors.regions.bodyContainer);
+    const userPickerContainer = graderContainer.querySelector(Selectors.regions.pickerRegion);
+    const searchResultsContainer = graderContainer.querySelector(Selectors.regions.searchResultsContainer);
+
     graderContainer.addEventListener('click', (e) => {
         if (e.target.closest(Selectors.buttons.toggleFullscreen)) {
             e.stopImmediatePropagation();
@@ -122,7 +229,40 @@ const registerEventListeners = (graderLayout, userPicker, saveGradeFunction) =>
         if (e.target.closest(Selectors.buttons.saveGrade)) {
             saveGradeFunction(userPicker.currentUser);
         }
+
+        if (e.target.closest(Selectors.buttons.toggleSearch)) {
+            if (toggleSearchButton.getAttribute('aria-expanded') === 'true') {
+                // Search is open so let's close it.
+                hideUserSearchInput(toggleSearchButton, searchInputContainer, searchInput);
+                hideSearchResultContainer(bodyContainer, userPickerContainer, searchResultsContainer);
+                searchResultsContainer.innerHTML = '';
+            } else {
+                // Search is closed so let's open it.
+                showUserSearchInput(toggleSearchButton, searchInputContainer, searchInput);
+                showSearchResultContainer(bodyContainer, userPickerContainer, searchResultsContainer);
+                renderSearchResults(searchResultsContainer, userList);
+            }
+
+            return;
+        }
+
+        const selectUserButton = e.target.closest(Selectors.buttons.selectUser);
+        if (selectUserButton) {
+            const userId = selectUserButton.getAttribute('data-userid');
+            const user = userList.find(user => user.id == userId);
+            userPicker.setUserId(userId);
+            userPicker.showUser(user);
+            hideUserSearchInput(toggleSearchButton, searchInputContainer, searchInput);
+            hideSearchResultContainer(bodyContainer, userPickerContainer, searchResultsContainer);
+            searchResultsContainer.innerHTML = '';
+        }
     });
+
+    // Debounce the search input so that it only executes 300 milliseconds after the user has finished typing.
+    searchInput.addEventListener('input', debounce(() => {
+        const users = searchForUsers(userList, searchInput.value);
+        renderSearchResults(searchResultsContainer, users);
+    }, 300));
 };
 
 /**
@@ -182,31 +322,49 @@ const displayGradingError = async(root, user, err) => {
  * @param {Function} setGradeForUser A function to set the grade for a specific user
  */
 export const launch = async(getListOfUsers, getContentForUser, getGradeForUser, setGradeForUser, {
-    initialUserId = null, moduleName
+    initialUserId = null, moduleName, courseName, courseUrl
 } = {}) => {
 
     // We need all of these functions to be executed in series, if one step runs before another the interface
     // will not work.
     const [
         graderLayout,
-        graderHTML,
+        {html, js},
         userList,
     ] = await Promise.all([
         createFullScreenWindow({fullscreen: false, showLoader: false}),
-        Templates.render(templateNames.grader.app, {moduleName: moduleName}),
+        Templates.renderForPromise(templateNames.grader.app, {
+            moduleName,
+            courseName,
+            courseUrl,
+            drawer: {show: true}
+        }),
         getListOfUsers(),
     ]);
     const graderContainer = graderLayout.getContainer();
 
     const saveGradeFunction = getSaveUserGradeFunction(graderContainer, setGradeForUser);
 
-    Templates.replaceNodeContents(graderContainer, graderHTML, '');
+    Templates.replaceNodeContents(graderContainer, html, js);
     const updateUserContent = getUpdateUserContentFunction(graderContainer, getContentForUser, getGradeForUser);
 
+    const userIds = userList.map(user => user.id);
+    const statusContainer = graderContainer.querySelector(Selectors.regions.statusContainer);
     // Fetch the userpicker for display.
     const userPicker = await getUserPicker(
         userList,
-        updateUserContent,
+        user => {
+            const renderContext = {
+                status: null,
+                index: userIds.indexOf(user.id) + 1,
+                total: userList.length
+            };
+            Templates.render(templateNames.grader.status, renderContext).then(html => {
+                statusContainer.innerHTML = html;
+                return html;
+            }).catch();
+            updateUserContent(user);
+        },
         saveGradeFunction,
         {
             initialUserId,
@@ -214,7 +372,7 @@ export const launch = async(getListOfUsers, getContentForUser, getGradeForUser,
     );
 
     // Register all event listeners.
-    registerEventListeners(graderLayout, userPicker, saveGradeFunction);
+    registerEventListeners(graderLayout, userPicker, saveGradeFunction, userList);
 
     // Display the newly created user picker.
     displayUserPicker(graderContainer, userPicker.rootNode);
diff --git a/mod/forum/amd/src/local/grades/local/grader/selectors.js b/mod/forum/amd/src/local/grades/local/grader/selectors.js
index 35e0339284f..0d3ccd24176 100644
--- a/mod/forum/amd/src/local/grades/local/grader/selectors.js
+++ b/mod/forum/amd/src/local/grades/local/grader/selectors.js
@@ -37,12 +37,20 @@ export default {
         toggleFullscreen: getDataSelector('action', 'togglefullscreen'),
         closeGrader: getDataSelector('action', 'closegrader'),
         saveGrade: getDataSelector('action', 'savegrade'),
+        selectUser: getDataSelector('action', 'select-user'),
+        toggleSearch: getDataSelector('action', 'toggle-search')
     },
     regions: {
+        bodyContainer: getDataSelector('region', 'body-container'),
         moduleReplace: getDataSelector('region', 'module_content'),
         pickerRegion: getDataSelector('region', 'user_picker'),
         gradingPanel: getDataSelector('region', 'grade'),
+        gradingPanelContainer: getDataSelector('region', 'grading-panel-container'),
         gradingPanelErrors: getDataSelector('region', 'grade-errors'),
+        searchResultsContainer: getDataSelector('region', 'search-results-container'),
+        statusContainer: getDataSelector('region', 'status-container'),
+        userSearchContainer: getDataSelector('region', 'user-search-container'),
+        userSearchInput: getDataSelector('region', 'user-search-input')
     },
 };
 
diff --git a/mod/forum/amd/src/local/grades/local/grader/user_picker.js b/mod/forum/amd/src/local/grades/local/grader/user_picker.js
index 815165a2f25..e0946748d36 100644
--- a/mod/forum/amd/src/local/grades/local/grader/user_picker.js
+++ b/mod/forum/amd/src/local/grades/local/grader/user_picker.js
@@ -79,10 +79,6 @@ class UserPicker {
         // Call the showUser function to show the first user immediately.
         await this.showUser(this.currentUser);
 
-        // Show a list of users under the user search box.
-        await this.renderSearch(this.userList);
-
-        this.searchResultListener();
         // Ensure that the event listeners are all bound.
         this.registerEventListeners();
     }
@@ -123,7 +119,6 @@ class UserPicker {
     registerEventListeners() {
         this.root.addEventListener('click', async(e) => {
             const button = e.target.closest(Selectors.actions.changeUser);
-            const input = e.target.closest(Selectors.actions.searchUserInput);
 
             if (button) {
                 const result = await this.preChangeUserCallback(this.currentUser);
@@ -133,87 +128,17 @@ class UserPicker {
                     await this.showUser(this.currentUser);
                 }
             }
-            if (input) {
-
-                // Make the key up a seperate function.
-                this.onKeyUp(input);
-            }
         });
     }
 
-    /**
-     * Listener for keyboard entry that'll search the user list for matching users.
-     *
-     * @param {Text} input User entered text of the user to search for.
-     */
-    onKeyUp(input) {
-        // Init a timeout variable to be used below
-        let timeout = null;
-        // Listen for keystroke events
-        input.onkeyup = () => {
-            // Clear the timeout if it has already been set.
-            clearTimeout(timeout);
-            // Make a new timeout set to go off in 300ms
-            timeout = setTimeout(async(userList) => {
-                const userInput = input.value;
-                const results = userList.filter((user) => {
-                    return user.fullname.toLowerCase().includes(userInput.toLowerCase());
-                });
-                await this.renderSearch(results);
-                this.searchResultListener();
-            }, 300, this.userList);
-        };
-    }
-
-    /**
-     * Apply the click handler for the users found in the user search area.
-     */
-    searchResultListener() {
-        this.root.querySelector(Selectors.actions.searchUserBox).addEventListener('click', async(e) => {
-            e.preventDefault();
-            const user = e.target.closest(Selectors.actions.selectUser);
-            if (user !== null) {
-                const foundUser = this.userList.findIndex(item => parseInt(item.id) === parseInt(user.dataset.userid));
-                const result = await this.preChangeUserCallback(this.currentUser);
-
-                if (!result.failed) {
-                    this.updateIndex(0, parseInt(foundUser));
-                    await this.showUser(this.currentUser);
-                }
-            }
-        });
-    }
-
-    /**
-     * Render the user search results.
-     *
-     * @param {Array} results List of users
-     */
-    async renderSearch(results) {
-        const trimmedUsers = results.slice(0, 10);
-        const overflowUsers = results.slice(10);
-        const builtResults = {
-          'expandedUsers': trimmedUsers,
-          'hasCollapsed': overflowUsers.length > 0,
-          'collapsedUsers': overflowUsers,
-        };
-        const {html, js} = await Templates.renderForPromise(`${templatePath}/user_picker/user_search`, builtResults);
-        const searchUserRegion = this.root.querySelector(Selectors.actions.searchUserBox);
-        Templates.replaceNode(searchUserRegion, html, js);
-    }
     /**
      * Update the current user index.
      *
      * @param {Number} direction
-     * @param {Number} specificIndex
      * @returns {Number}}
      */
-    updateIndex(direction, specificIndex = null) {
-        if (specificIndex) {
-            this.currentUserIndex = specificIndex;
-        } else {
-            this.currentUserIndex += direction;
-        }
+    updateIndex(direction) {
+        this.currentUserIndex += direction;
 
         // Loop around the edges.
         if (this.currentUserIndex < 0) {
diff --git a/mod/forum/amd/src/local/grades/local/grader/user_picker/selectors.js b/mod/forum/amd/src/local/grades/local/grader/user_picker/selectors.js
index 99777b6b9e0..035240f0297 100644
--- a/mod/forum/amd/src/local/grades/local/grader/user_picker/selectors.js
+++ b/mod/forum/amd/src/local/grades/local/grader/user_picker/selectors.js
@@ -28,9 +28,6 @@ export default {
     },
     actions: {
         changeUser: '[data-action="change-user"]',
-        selectUser: '[data-action="select-user"]',
-        searchUserBox: '[data-action="search-user-box"]',
-        searchUserInput: '[data-action="search-user-input"]',
     }
 };
 
diff --git a/mod/forum/classes/grades/forum_gradeitem.php b/mod/forum/classes/grades/forum_gradeitem.php
index bd1b5264016..7d2b50ca639 100644
--- a/mod/forum/classes/grades/forum_gradeitem.php
+++ b/mod/forum/classes/grades/forum_gradeitem.php
@@ -91,7 +91,7 @@ class forum_gradeitem extends component_gradeitem {
      * @return bool
      */
     public function is_grading_enabled(): bool {
-        return $this->forum->get_grade_for_forum() !== 0;
+        return $this->forum->is_grading_enabled();
     }
 
     /**
diff --git a/mod/forum/classes/local/entities/forum.php b/mod/forum/classes/local/entities/forum.php
index 16b851d88a3..4da49b28a56 100644
--- a/mod/forum/classes/local/entities/forum.php
+++ b/mod/forum/classes/local/entities/forum.php
@@ -363,6 +363,15 @@ class forum {
         return $this->gradeforum;
     }
 
+    /**
+     * Whether grading is enabled for this item.
+     *
+     * @return bool
+     */
+    public function is_grading_enabled(): bool {
+        return $this->get_grade_for_forum() !== 0;
+    }
+
     /**
      * Get the maximum bytes.
      *
diff --git a/mod/forum/classes/local/exporters/forum.php b/mod/forum/classes/local/exporters/forum.php
index 850c3220483..59260b17ba7 100644
--- a/mod/forum/classes/local/exporters/forum.php
+++ b/mod/forum/classes/local/exporters/forum.php
@@ -65,6 +65,7 @@ class forum extends exporter {
             'state' => [
                 'type' => [
                     'groupmode' => ['type' => PARAM_INT],
+                    'gradingenabled' => ['type' => PARAM_BOOL],
                 ],
             ],
             'userstate' => [
@@ -77,6 +78,7 @@ class forum extends exporter {
                     'viewdiscussions' => ['type' => PARAM_BOOL],
                     'create' => ['type' => PARAM_BOOL],
                     'subscribe' => ['type' => PARAM_BOOL],
+                    'grade' => ['type' => PARAM_BOOL],
                 ]
             ],
             'urls' => [
@@ -120,6 +122,7 @@ class forum extends exporter {
             'name' => $this->forum->get_name(),
             'state' => [
                 'groupmode' => $this->forum->get_effective_group_mode(),
+                'gradingenabled' => $this->forum->is_grading_enabled()
             ],
             'userstate' => [
                 'tracked' => forum_tp_is_tracked($this->get_forum_record(), $this->related['user']),
@@ -129,6 +132,7 @@ class forum extends exporter {
                 'create' => $capabilitymanager->can_create_discussions($user, $currentgroup),
                 'selfenrol' => $capabilitymanager->can_self_enrol($user),
                 'subscribe' => $capabilitymanager->can_subscribe_to_forum($user),
+                'grade' => $capabilitymanager->can_grade($user),
             ],
             'urls' => [
                 'create' => $urlfactory->get_discussion_create_url($this->forum)->out(false),
diff --git a/mod/forum/classes/local/renderers/discussion_list.php b/mod/forum/classes/local/renderers/discussion_list.php
index a5414f61f12..0c68308be32 100644
--- a/mod/forum/classes/local/renderers/discussion_list.php
+++ b/mod/forum/classes/local/renderers/discussion_list.php
@@ -144,12 +144,22 @@ class discussion_list {
      * @param   int         $sortorder The sort order to use when selecting the discussions in the list
      * @param   int         $pageno The zero-indexed page number to use
      * @param   int         $pagesize The number of discussions to show on the page
+     * @param   int         $displaymode The discussion display mode
      * @return  string      The rendered content for display
      */
-    public function render(stdClass $user, \cm_info $cm, ?int $groupid, ?int $sortorder, ?int $pageno, ?int $pagesize) : string {
+    public function render(
+        stdClass $user,
+        \cm_info $cm,
+        ?int $groupid,
+        ?int $sortorder,
+        ?int $pageno,
+        ?int $pagesize,
+        int $displaymode = null
+    ) : string {
         global $PAGE;
 
         $forum = $this->forum;
+        $course = $forum->get_course_record();
 
         $forumexporter = $this->exporterfactory->get_forum_exporter(
             $user,
@@ -176,6 +186,10 @@ class discussion_list {
             'forum' => (array) $forumexporter->export($this->renderer),
             'contextid' => $forum->get_context()->id,
             'cmid' => $cm->id,
+            'name' => $forum->get_name(),
+            'courseid' => $course->id,
+            'coursename' => $course->shortname,
+            'experimentaldisplaymode' => $displaymode == FORUM_MODE_NESTED_V2,
             'gradingcomponent' => $this->forumgradeitem->get_grading_component_name(),
             'gradingcomponentsubtype' => $this->forumgradeitem->get_grading_component_subtype(),
             'hasanyactions' => $hasanyactions,
diff --git a/mod/forum/externallib.php b/mod/forum/externallib.php
index 1bbe252d5f7..b900e555dea 100644
--- a/mod/forum/externallib.php
+++ b/mod/forum/externallib.php
@@ -2205,8 +2205,15 @@ class mod_forum_external extends external_api {
         $managerfactory = mod_forum\local\container::get_manager_factory();
         $capabilitymanager = $managerfactory->get_capability_manager($forum);
 
-        $discussionvault = $vaultfactory->get_discussion_vault();
-        $discussions = $discussionvault->get_all_discussions_in_forum($forum, 'timemodified ASC, id ASC');
+        $discussionsummariesvault = $vaultfactory->get_discussions_in_forum_vault();
+        $discussionsummaries = $discussionsummariesvault->get_from_forum_id(
+            $forum->get_id(),
+            true,
+            null,
+            $discussionsummariesvault::SORTORDER_CREATED_ASC,
+            0,
+            0
+        );
 
         $postvault = $vaultfactory->get_post_vault();
 
@@ -2214,7 +2221,8 @@ class mod_forum_external extends external_api {
         $postbuilder = $builderfactory->get_exported_posts_builder();
 
         $builtdiscussions = [];
-        foreach ($discussions as $id => $discussion) {
+        foreach ($discussionsummaries as $discussionsummary) {
+            $discussion = $discussionsummary->get_discussion();
             $posts = $postvault->get_posts_in_discussion_for_user_id(
                     $discussion->get_id(),
                     $user->id,
@@ -2239,9 +2247,14 @@ class mod_forum_external extends external_api {
                 );
             }
 
+            $discussionauthor = $discussionsummary->get_first_post_author();
+            $firstpost = $discussionsummary->get_first_post();
+
             $builtdiscussions[] = [
                 'name' => $discussion->get_name(),
                 'id' => $discussion->get_id(),
+                'timecreated' => $firstpost->get_time_created(),
+                'authorfullname' => $discussionauthor->get_full_name(),
                 'posts' => [
                     'userposts' => $postbuilder->build($user, [$forum], [$discussion], $posts),
                     'parentposts' => $parentposts,
@@ -2284,6 +2297,8 @@ class mod_forum_external extends external_api {
                     new external_single_structure([
                         'name' => new external_value(PARAM_RAW, 'Name of the discussion'),
                         'id' => new external_value(PARAM_INT, 'ID of the discussion'),
+                        'timecreated' => new external_value(PARAM_INT, 'Timestamp of the discussion start'),
+                        'authorfullname' => new external_value(PARAM_RAW, 'Full name of the user that started the discussion'),
                         'posts' => new external_single_structure([
                             'userposts' => new external_multiple_structure(\mod_forum\local\exporters\post::get_read_structure()),
                             'parentposts' => new external_multiple_structure(\mod_forum\local\exporters\post::get_read_structure()),
diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php
index f4426e0f559..8efd14f4931 100644
--- a/mod/forum/lang/en/forum.php
+++ b/mod/forum/lang/en/forum.php
@@ -101,6 +101,7 @@ $string['clicktounsubscribe'] = 'You are subscribed to this discussion. Click to
 $string['clicktosubscribe'] = 'You are not subscribed to this discussion. Click to subscribe.';
 $string['clicktounfavourite'] = 'You have starred this discussion. Click to unstar.';
 $string['clicktofavourite'] = 'You have not starred this discussion. Click to star.';
+$string['close'] = 'Close';
 $string['completiondiscussions'] = 'Student must create discussions:';
 $string['completiondiscussionsdesc'] = 'Student must create at least {$a} discussion(s)';
 $string['completiondiscussionsgroup'] = 'Require discussions';
@@ -194,6 +195,7 @@ $string['discussionsubscription'] = 'Discussion subscription';
 $string['discussionsubscription_help'] = 'Subscribing to a discussion means you will receive notifications of new posts to that discussion.';
 $string['discussions'] = 'Discussions';
 $string['discussionsstartedby'] = 'Discussions started by {$a}';
+$string['discussionstartedby'] = 'Discussion started by {$a}';
 $string['discussionsstartedbyrecent'] = 'Discussions recently started by {$a}';
 $string['discussionsstartedbyuserincourse'] = 'Discussions started by {$a->fullname} in {$a->coursename}';
 $string['discussionunpin'] = 'Unpin';
@@ -333,7 +335,9 @@ $string['generalforum'] = 'Standard forum for general use';
 $string['generalforums'] = 'General forums';
 $string['gradeitem:forum'] = 'Forum';
 $string['hiddenforumpost'] = 'Hidden forum post';
+$string['hidegraderpanel'] = 'Hide grader panel';
 $string['hidepreviousrepliescount'] = 'Hide previous replies ({$a})';
+$string['hideusersearch'] = 'Hide user search';
 $string['indicator:cognitivedepth'] = 'Forum cognitive';
 $string['indicator:cognitivedepth_help'] = 'This indicator is based on the cognitive depth reached by the student in a Forum activity.';
 $string['indicator:cognitivedepthdef'] = 'Forum cognitive';
@@ -345,6 +349,7 @@ $string['indicator:socialbreadthdef'] = 'Forum social';
 $string['indicator:socialbreadthdef_help'] = 'The participant has reached this percentage of the social engagement offered by the Forum activities during this analysis interval (Levels = No participation, Participant alone, Participant with others)';
 $string['indicator:socialbreadthdef_link'] = 'Learning_analytics_indicators#Social_breadth';
 $string['starredonly'] = 'Search starred discussions only';
+$string['indexoutoftotal'] = '{$a->index} out of {$a->total}';
 $string['inforum'] = 'in {$a}';
 $string['inreplyto'] = 'In reply to {$a}';
 $string['introblog'] = 'The posts in this forum were copied here automatically from blogs of users in this course because those blog entries are no longer available';
@@ -436,6 +441,7 @@ $string['namenews_help'] = 'The course announcements forum is a special forum fo
 $string['namesocial'] = 'Social forum';
 $string['nameteacher'] = 'Teacher forum';
 $string['nextdiscussiona'] = 'Next discussion: {$a}';
+$string['nextuser'] = 'Next user';
 $string['newforumposts'] = 'New forum posts';
 $string['noattachments'] = 'There are no attachments to this post';
 $string['nodiscussions'] = 'There are no discussion topics yet in this forum';
@@ -514,6 +520,7 @@ $string['poststo'] = 'Posts to';
 $string['posttoforum'] = 'Post to forum';
 $string['postupdated'] = 'Your post was updated';
 $string['potentialsubscribers'] = 'Potential subscribers';
+$string['previoususer'] = 'Previous user';
 $string['privacy:digesttypenone'] = 'We do not hold any data relating to a preferred forum digest type for this forum.';
 $string['privacy:digesttypepreference'] = 'You have chosen to receive the following forum digest type: "{$a->type}".';
 $string['privacy:discussionsubscriptionpreference'] = 'You have chosen the following discussion subscription preference for this forum: "{$a->preference}"';
@@ -627,6 +634,7 @@ $string['searchresults'] = 'Search results';
 $string['searchsubject'] = 'These words should be in the subject';
 $string['searchtags'] = 'Is tagged with';
 $string['searchuser'] = 'This name should match the author';
+$string['searchusers'] = 'Search users';
 $string['searchuserid'] = 'The Moodle ID of the author';
 $string['searchwhichforums'] = 'Choose which forums to search';
 $string['searchwords'] = 'These words can appear anywhere in the post';
@@ -634,8 +642,10 @@ $string['seeallposts'] = 'See all posts made by this user';
 $string['settings'] = 'Settings';
 $string['shortpost'] = 'Short post';
 $string['showingcountoftotaldiscussions'] = 'Showing {$a->count} of {$a->total} discussions';
+$string['showgraderpanel'] = 'Show grader panel';
 $string['showpreviousrepliescount'] = 'Show previous replies ({$a})';
 $string['showsubscribers'] = 'Show/edit current subscribers';
+$string['showusersearch'] = 'Show user search';
 $string['singleforum'] = 'A single simple discussion';
 $string['smallmessage'] = '{$a->user} posted in {$a->forumname}';
 $string['smallmessagedigest'] = 'Forum digest containing {$a} messages';
@@ -677,6 +687,7 @@ $string['timedhidden'] = 'Timed status: Hidden from students';
 $string['timedposts'] = 'Timed posts';
 $string['timedvisible'] = 'Timed status: Visible to all users';
 $string['timestartenderror'] = 'Display end date cannot be earlier than the start date';
+$string['togglefullscreen'] = 'Toggle full screen';
 $string['togglesettingsdrawer'] = 'Toggle settings drawer';
 $string['trackforum'] = 'Track unread posts';
 $string['trackreadposts_header'] = 'Forum tracking';
@@ -710,8 +721,10 @@ $string['unsubscribed'] = 'Unsubscribed';
 $string['unsubscribeshort'] = 'Unsubscribe';
 $string['useexperimentalui'] = 'Use experimental nested discussion view';
 $string['usermarksread'] = 'Manual message read marking';
+$string['usernavigation'] = 'User navigation';
 $string['unpindiscussion'] = 'Unpin this discussion';
 $string['viewalldiscussions'] = 'View all discussions';
+$string['viewparentpost'] = 'View parent post';
 $string['viewthediscussion'] = 'View the discussion';
 $string['warnafter'] = 'Post threshold for warning';
 $string['warnafter_help'] = 'Students can be warned as they approach the maximum number of posts allowed in a given period. This setting specifies after how many posts they are warned. Users with the capability mod/forum:postwithoutthrottling are exempt from post limits.';
diff --git a/mod/forum/pix/hide-grader-panel.png b/mod/forum/pix/hide-grader-panel.png
new file mode 100644
index 00000000000..e5b090676ce
Binary files /dev/null and b/mod/forum/pix/hide-grader-panel.png differ
diff --git a/mod/forum/pix/hide-grader-panel.svg b/mod/forum/pix/hide-grader-panel.svg
new file mode 100644
index 00000000000..aad52e658af
--- /dev/null
+++ b/mod/forum/pix/hide-grader-panel.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="23px" height="24px" viewBox="0 0 23 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 59.1 (86144) - https://sketch.com -->
+    <title>Group 3</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Grading" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Grading-Copy-4" transform="translate(-1072.000000, -21.000000)">
+            <g id="Group-3" transform="translate(1072.000000, 21.500000)">
+                <g id="left-arrow" transform="translate(0.000000, 6.795455)" fill="#000000" fill-rule="nonzero">
+                    <path d="M9.86688101,3.53622875 L9.8832003,3.5397986 L2.88749446,3.5397986 L5.08668884,1.33575942 C5.19437916,1.2281541 5.25345159,1.08238544 5.25345159,0.929392092 C5.25345159,0.776398744 5.19437916,0.631650037 5.08668884,0.523789727 L4.74449372,0.181424612 C4.6368884,0.0738192905 4.49349963,0.0143218773 4.34059128,0.0143218773 C4.18759793,0.0143218773 4.04412417,0.0733943089 3.93651885,0.18099963 L0.166677753,3.95050074 C0.0586474501,4.05853104 -0.000424981523,4.20242979 -2.27716707e-06,4.35550813 C-0.000424981523,4.50943644 0.0586474501,4.65342018 0.166677753,4.76128049 L3.93651885,8.53112158 C4.04412417,8.63864191 4.18751293,8.69779933 4.34059128,8.69779933 C4.49349963,8.69779933 4.6368884,8.63855691 4.74449372,8.53112158 L5.08668884,8.18875647 C5.19437916,8.08132114 5.25345159,7.93784738 5.25345159,7.78485403 C5.25345159,7.63194568 5.19437916,7.49603659 5.08668884,7.38851626 L2.86267554,5.17215262 L9.87470067,5.17215262 C10.189782,5.17215262 10.4545455,4.90058943 10.4545455,4.58567812 L10.4545455,4.10145418 C10.4545455,3.78654287 10.1819623,3.53622875 9.86688101,3.53622875 Z" id="Path"></path>
+                </g>
+                <g id="left-arrow" transform="translate(17.772727, 11.151515) rotate(180.000000) translate(-17.772727, -11.151515) translate(12.545455, 6.795455)" fill="#000000" fill-rule="nonzero">
+                    <path d="M9.86688101,3.53622875 L9.8832003,3.5397986 L2.88749446,3.5397986 L5.08668884,1.33575942 C5.19437916,1.2281541 5.25345159,1.08238544 5.25345159,0.929392092 C5.25345159,0.776398744 5.19437916,0.631650037 5.08668884,0.523789727 L4.74449372,0.181424612 C4.6368884,0.0738192905 4.49349963,0.0143218773 4.34059128,0.0143218773 C4.18759793,0.0143218773 4.04412417,0.0733943089 3.93651885,0.18099963 L0.166677753,3.95050074 C0.0586474501,4.05853104 -0.000424981523,4.20242979 -2.27716707e-06,4.35550813 C-0.000424981523,4.50943644 0.0586474501,4.65342018 0.166677753,4.76128049 L3.93651885,8.53112158 C4.04412417,8.63864191 4.18751293,8.69779933 4.34059128,8.69779933 C4.49349963,8.69779933 4.6368884,8.63855691 4.74449372,8.53112158 L5.08668884,8.18875647 C5.19437916,8.08132114 5.25345159,7.93784738 5.25345159,7.78485403 C5.25345159,7.63194568 5.19437916,7.49603659 5.08668884,7.38851626 L2.86267554,5.17215262 L9.87470067,5.17215262 C10.189782,5.17215262 10.4545455,4.90058943 10.4545455,4.58567812 L10.4545455,4.10145418 C10.4545455,3.78654287 10.1819623,3.53622875 9.86688101,3.53622875 Z" id="Path"></path>
+                </g>
+                <g id="Group-2" transform="translate(0.522727, 0.000000)" stroke="#000000" stroke-linecap="square" stroke-width="2">
+                    <path d="M0.522727273,0.522727273 L21.4318182,0.522727273 M0.522727273,0.522727273 L0.522727273,3.13636364 M21.4318182,0.522727273 L21.4318182,3.13636364" id="Combined-Shape"></path>
+                </g>
+                <g id="Group-2" transform="translate(11.500000, 21.431818) scale(1, -1) translate(-11.500000, -21.431818) translate(0.522727, 19.863636)" stroke="#000000" stroke-linecap="square" stroke-width="2">
+                    <path d="M0.522727273,0.522727273 L21.4318182,0.522727273 M0.522727273,0.522727273 L0.522727273,3.13636364 M21.4318182,0.522727273 L21.4318182,3.13636364" id="Combined-Shape"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/mod/forum/pix/no-posts.png b/mod/forum/pix/no-posts.png
new file mode 100644
index 00000000000..14412598feb
Binary files /dev/null and b/mod/forum/pix/no-posts.png differ
diff --git a/mod/forum/pix/no-posts.svg b/mod/forum/pix/no-posts.svg
new file mode 100644
index 00000000000..a5de6b59ae5
--- /dev/null
+++ b/mod/forum/pix/no-posts.svg
@@ -0,0 +1 @@
+<svg id="f20e0c25-d928-42cc-98d1-13cc230663ea" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="820.16" height="780.81" viewBox="0 0 820.16 780.81"><defs><linearGradient id="07332201-7176-49c2-9908-6dc4a39c4716" x1="539.63" y1="734.6" x2="539.63" y2="151.19" gradientTransform="translate(-3.62 1.57)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="gray" stop-opacity="0.25"/><stop offset="0.54" stop-color="gray" stop-opacity="0.12"/><stop offset="1" stop-color="gray" stop-opacity="0.1"/></linearGradient><linearGradient id="0ee1ab3f-7ba2-4205-9d4a-9606ad702253" x1="540.17" y1="180.2" x2="540.17" y2="130.75" gradientTransform="translate(-63.92 7.85)" xlink:href="#07332201-7176-49c2-9908-6dc4a39c4716"/><linearGradient id="abca9755-bed1-4a97-b027-7f02ee3ffa09" x1="540.17" y1="140.86" x2="540.17" y2="82.43" gradientTransform="translate(-84.51 124.6) rotate(-12.11)" xlink:href="#07332201-7176-49c2-9908-6dc4a39c4716"/><linearGradient id="2632d424-e666-4ee4-9508-a494957e14ab" x1="476.4" y1="710.53" x2="476.4" y2="127.12" gradientTransform="matrix(1, 0, 0, 1, 0, 0)" xlink:href="#07332201-7176-49c2-9908-6dc4a39c4716"/><linearGradient id="97571ef7-1c83-4e06-b701-c2e47e77dca3" x1="476.94" y1="156.13" x2="476.94" y2="106.68" gradientTransform="matrix(1, 0, 0, 1, 0, 0)" xlink:href="#07332201-7176-49c2-9908-6dc4a39c4716"/><linearGradient id="7d32e13e-a0c7-49c4-af0e-066a2f8cb76e" x1="666.86" y1="176.39" x2="666.86" y2="117.95" gradientTransform="matrix(1, 0, 0, 1, 0, 0)" xlink:href="#07332201-7176-49c2-9908-6dc4a39c4716"/></defs><title>no data</title><rect x="317.5" y="142.55" width="437.02" height="603.82" transform="translate(-271.22 62.72) rotate(-12.11)" fill="#e0e0e0"/><g opacity="0.5"><rect x="324.89" y="152.76" width="422.25" height="583.41" transform="translate(-271.22 62.72) rotate(-12.11)" fill="url(#07332201-7176-49c2-9908-6dc4a39c4716)"/></g><rect x="329.81" y="157.1" width="411.5" height="570.52" transform="translate(-270.79 62.58) rotate(-12.11)" fill="#fafafa"/><rect x="374.18" y="138.6" width="204.14" height="49.45" transform="translate(-213.58 43.93) rotate(-12.11)" fill="url(#0ee1ab3f-7ba2-4205-9d4a-9606ad702253)"/><path d="M460.93,91.9c-15.41,3.31-25.16,18.78-21.77,34.55s18.62,25.89,34,22.58,25.16-18.78,21.77-34.55S476.34,88.59,460.93,91.9ZM470.6,137A16.86,16.86,0,1,1,483.16,117,16.66,16.66,0,0,1,470.6,137Z" transform="translate(-189.92 -59.59)" fill="url(#abca9755-bed1-4a97-b027-7f02ee3ffa09)"/><rect x="375.66" y="136.55" width="199.84" height="47.27" transform="translate(-212.94 43.72) rotate(-12.11)" fill="#e9ecef"/><path d="M460.93,91.9a27.93,27.93,0,1,0,33.17,21.45A27.93,27.93,0,0,0,460.93,91.9ZM470.17,135a16.12,16.12,0,1,1,12.38-19.14A16.12,16.12,0,0,1,470.17,135Z" transform="translate(-189.92 -59.59)" fill="#e9ecef"/><rect x="257.89" y="116.91" width="437.02" height="603.82" fill="#e0e0e0"/><g opacity="0.5"><rect x="265.28" y="127.12" width="422.25" height="583.41" fill="url(#2632d424-e666-4ee4-9508-a494957e14ab)"/></g><rect x="270.65" y="131.42" width="411.5" height="570.52" fill="#fff"/><rect x="374.87" y="106.68" width="204.14" height="49.45" fill="url(#97571ef7-1c83-4e06-b701-c2e47e77dca3)"/><path d="M666.86,118c-15.76,0-28.54,13.08-28.54,29.22s12.78,29.22,28.54,29.22,28.54-13.08,28.54-29.22S682.62,118,666.86,118Zm0,46.08a16.86,16.86,0,1,1,16.46-16.86A16.66,16.66,0,0,1,666.86,164Z" transform="translate(-189.92 -59.59)" fill="url(#7d32e13e-a0c7-49c4-af0e-066a2f8cb76e)"/><rect x="377.02" y="104.56" width="199.84" height="47.27" fill="#e9ecef"/><path d="M666.86,118a27.93,27.93,0,1,0,27.93,27.93A27.93,27.93,0,0,0,666.86,118Zm0,44.05A16.12,16.12,0,1,1,683,145.89,16.12,16.12,0,0,1,666.86,162Z" transform="translate(-189.92 -59.59)" fill="#e9ecef"/><g opacity="0.5"><rect x="15.27" y="737.05" width="3.76" height="21.33" fill="#47e6b1"/><rect x="205.19" y="796.65" width="3.76" height="21.33" transform="translate(824.47 540.65) rotate(90)" fill="#47e6b1"/></g><g opacity="0.5"><rect x="451.49" width="3.76" height="21.33" fill="#47e6b1"/><rect x="641.4" y="59.59" width="3.76" height="21.33" transform="translate(523.63 -632.62) rotate(90)" fill="#47e6b1"/></g><path d="M961,832.15a4.61,4.61,0,0,1-2.57-5.57,2.22,2.22,0,0,0,.1-.51h0a2.31,2.31,0,0,0-4.15-1.53h0a2.22,2.22,0,0,0-.26.45,4.61,4.61,0,0,1-5.57,2.57,2.22,2.22,0,0,0-.51-.1h0a2.31,2.31,0,0,0-1.53,4.15h0a2.22,2.22,0,0,0,.45.26,4.61,4.61,0,0,1,2.57,5.57,2.22,2.22,0,0,0-.1.51h0a2.31,2.31,0,0,0,4.15,1.53h0a2.22,2.22,0,0,0,.26-.45,4.61,4.61,0,0,1,5.57-2.57,2.22,2.22,0,0,0,.51.1h0a2.31,2.31,0,0,0,1.53-4.15h0A2.22,2.22,0,0,0,961,832.15Z" transform="translate(-189.92 -59.59)" fill="#4d8af0" opacity="0.5"/><path d="M326.59,627.09a4.61,4.61,0,0,1-2.57-5.57,2.22,2.22,0,0,0,.1-.51h0a2.31,2.31,0,0,0-4.15-1.53h0a2.22,2.22,0,0,0-.26.45,4.61,4.61,0,0,1-5.57,2.57,2.22,2.22,0,0,0-.51-.1h0a2.31,2.31,0,0,0-1.53,4.15h0a2.22,2.22,0,0,0,.45.26,4.61,4.61,0,0,1,2.57,5.57,2.22,2.22,0,0,0-.1.51h0a2.31,2.31,0,0,0,4.15,1.53h0a2.22,2.22,0,0,0,.26-.45A4.61,4.61,0,0,1,325,631.4a2.22,2.22,0,0,0,.51.1h0a2.31,2.31,0,0,0,1.53-4.15h0A2.22,2.22,0,0,0,326.59,627.09Z" transform="translate(-189.92 -59.59)" fill="#fdd835" opacity="0.5"/><path d="M855,127.77a4.61,4.61,0,0,1-2.57-5.57,2.22,2.22,0,0,0,.1-.51h0a2.31,2.31,0,0,0-4.15-1.53h0a2.22,2.22,0,0,0-.26.45,4.61,4.61,0,0,1-5.57,2.57,2.22,2.22,0,0,0-.51-.1h0a2.31,2.31,0,0,0-1.53,4.15h0a2.22,2.22,0,0,0,.45.26,4.61,4.61,0,0,1,2.57,5.57,2.22,2.22,0,0,0-.1.51h0a2.31,2.31,0,0,0,4.15,1.53h0a2.22,2.22,0,0,0,.26-.45,4.61,4.61,0,0,1,5.57-2.57,2.22,2.22,0,0,0,.51.1h0a2.31,2.31,0,0,0,1.53-4.15h0A2.22,2.22,0,0,0,855,127.77Z" transform="translate(-189.92 -59.59)" fill="#fdd835" opacity="0.5"/><circle cx="812.64" cy="314.47" r="7.53" fill="#f55f44" opacity="0.5"/><circle cx="230.73" cy="746.65" r="7.53" fill="#f55f44" opacity="0.5"/><circle cx="735.31" cy="477.23" r="7.53" fill="#f55f44" opacity="0.5"/><circle cx="87.14" cy="96.35" r="7.53" fill="#4d8af0" opacity="0.5"/><circle cx="7.53" cy="301.76" r="7.53" fill="#47e6b1" opacity="0.5"/></svg>
\ No newline at end of file
diff --git a/mod/forum/pix/no-search-results.png b/mod/forum/pix/no-search-results.png
new file mode 100644
index 00000000000..c246cd687ce
Binary files /dev/null and b/mod/forum/pix/no-search-results.png differ
diff --git a/mod/forum/pix/no-search-results.svg b/mod/forum/pix/no-search-results.svg
new file mode 100644
index 00000000000..89073f95ef7
--- /dev/null
+++ b/mod/forum/pix/no-search-results.svg
@@ -0,0 +1 @@
+<svg id="9a5c15f4-7944-40bc-b8da-d63b7d478a28" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="842" height="778.92" viewBox="0 0 842 778.92"><defs><linearGradient id="a91ba363-77be-43f7-9cf6-91c4a3880d9c" x1="378.37" y1="732.81" x2="378.37" y2="130.21" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="gray" stop-opacity="0.25"/><stop offset="0.54" stop-color="gray" stop-opacity="0.12"/><stop offset="1" stop-color="gray" stop-opacity="0.1"/></linearGradient><linearGradient id="d1e6aa0e-d79d-4f6f-afbb-c37e9ed80ff9" x1="274.44" y1="409.32" x2="274.44" y2="248.16" xlink:href="#a91ba363-77be-43f7-9cf6-91c4a3880d9c"/><linearGradient id="a279b039-1afd-4281-8292-ccd5c8c9b734" x1="274.44" y1="361.44" x2="274.44" y2="261.01" xlink:href="#a91ba363-77be-43f7-9cf6-91c4a3880d9c"/><clipPath id="42e7b1d1-2be2-47b0-aacb-a853df270819" transform="translate(-179 -60.54)"><rect id="cf34cfb5-9399-4bae-9cea-d47bbef6cb3a" data-name="&lt;Rectangle&gt;" x="381.54" y="322.72" width="143.79" height="96.93" fill="#fff"/></clipPath><linearGradient id="972637f2-71db-4198-9c75-a0854a7fe249" x1="274.44" y1="616.03" x2="274.44" y2="454.87" xlink:href="#a91ba363-77be-43f7-9cf6-91c4a3880d9c"/><linearGradient id="6c85befd-f960-412c-83e0-663d4b13bf85" x1="274.44" y1="568.15" x2="274.44" y2="467.72" xlink:href="#a91ba363-77be-43f7-9cf6-91c4a3880d9c"/><clipPath id="f66b8fac-771d-49bf-85c7-4ce29a79f723" transform="translate(-179 -60.54)"><rect id="7439734d-5f7c-428f-88ce-e68b86a45c07" data-name="&lt;Rectangle&gt;" x="381.54" y="529.42" width="143.79" height="96.93" fill="#fff"/></clipPath><linearGradient id="598f8edf-c762-4b18-b52d-250fc678075a" x1="688.76" y1="765.86" x2="688.76" y2="163.26" gradientTransform="translate(1142.22 -188.53) rotate(90)" xlink:href="#a91ba363-77be-43f7-9cf6-91c4a3880d9c"/><linearGradient id="013b841e-9a42-49b8-8a36-6db9ed002b72" x1="688.18" y1="568.49" x2="688.18" y2="409.67" gradientTransform="translate(1161.39 -164.01) rotate(90)" xlink:href="#a91ba363-77be-43f7-9cf6-91c4a3880d9c"/><linearGradient id="f8cab3c1-d868-48bc-b87d-cd2075ddc26a" x1="810.6" y1="767.54" x2="810.6" y2="362.71" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#b3b3b3" stop-opacity="0.25"/><stop offset="0.54" stop-color="#b3b3b3" stop-opacity="0.1"/><stop offset="1" stop-color="#b3b3b3" stop-opacity="0.05"/></linearGradient><linearGradient id="043d467e-585e-47c7-bb2c-06dd6f5be04b" x1="685.49" y1="507.08" x2="685.49" y2="487.6" gradientUnits="userSpaceOnUse"><stop offset="0" stop-opacity="0.12"/><stop offset="0.55" stop-opacity="0.09"/><stop offset="1" stop-opacity="0.02"/></linearGradient><linearGradient id="be08032f-102d-431e-9b5f-1e4ebfc8159b" x1="774.99" y1="484.73" x2="774.99" y2="425.15" xlink:href="#043d467e-585e-47c7-bb2c-06dd6f5be04b"/></defs><title>file searching</title><g opacity="0.5"><rect x="154.15" y="130.21" width="448.44" height="602.6" fill="url(#a91ba363-77be-43f7-9cf6-91c4a3880d9c)"/></g><rect x="159.99" y="138.39" width="434.43" height="581.58" fill="#f2f2f2"/><rect x="193.86" y="162.91" width="149.48" height="4.67" fill="#e0e0e0"/><rect x="193.86" y="183.93" width="149.48" height="4.67" fill="#ced4da" opacity="0.7"/><rect x="365.53" y="162.91" width="149.48" height="4.67" fill="#e0e0e0"/><rect x="388.88" y="296.05" width="149.48" height="4.67" fill="#e0e0e0"/><rect x="392.39" y="308.89" width="149.48" height="4.67" fill="#e0e0e0"/><rect x="399.4" y="321.74" width="149.48" height="4.67" fill="#e0e0e0"/><rect x="388.88" y="502.75" width="149.48" height="4.67" fill="#e0e0e0"/><rect x="392.39" y="515.6" width="149.48" height="4.67" fill="#e0e0e0"/><rect x="399.4" y="528.44" width="149.48" height="4.67" fill="#e0e0e0"/><g opacity="0.5"><rect x="195.03" y="248.16" width="158.82" height="161.16" fill="url(#d1e6aa0e-d79d-4f6f-afbb-c37e9ed80ff9)"/></g><rect x="196.03" y="251.67" width="156.32" height="154.15" fill="#f5f5f5"/><g opacity="0.5"><rect x="201.54" y="261.01" width="145.8" height="100.43" fill="url(#a279b039-1afd-4281-8292-ccd5c8c9b734)"/></g><rect id="e1f34465-d008-41db-868b-e00503fb87b3" data-name="&lt;Rectangle&gt;" x="202.54" y="262.18" width="143.79" height="96.93" fill="#fff"/><g clip-path="url(#42e7b1d1-2be2-47b0-aacb-a853df270819)"><polygon points="190.35 355.61 226.56 299.55 241.74 324.07 274.44 290.21 302.47 324.07 326.99 273.86 390.05 374.29 185.68 367.28 190.35 355.61" fill="#ced4da" opacity="0.4"/><circle cx="218.38" cy="276.19" r="10.51" fill="#ced4da" opacity="0.4"/></g><g opacity="0.5"><rect x="195.03" y="454.87" width="158.82" height="161.16" fill="url(#972637f2-71db-4198-9c75-a0854a7fe249)"/></g><rect x="196.03" y="458.37" width="156.32" height="154.15" fill="#f5f5f5"/><g opacity="0.5"><rect x="201.54" y="467.72" width="145.8" height="100.43" fill="url(#6c85befd-f960-412c-83e0-663d4b13bf85)"/></g><rect id="c95ac4f6-be4d-44a3-92c2-5c8066e2b531" data-name="&lt;Rectangle&gt;" x="202.54" y="468.88" width="143.79" height="96.93" fill="#fff"/><g clip-path="url(#f66b8fac-771d-49bf-85c7-4ce29a79f723)"><polygon points="190.35 562.31 226.56 506.25 241.74 530.78 274.44 496.91 302.47 530.78 326.99 480.56 390.05 580.99 185.68 573.99 190.35 562.31" fill="#bdbdbd" opacity="0.4"/><circle cx="218.38" cy="482.9" r="10.51" fill="#bdbdbd" opacity="0.4"/></g><g opacity="0.5"><rect x="376.36" y="276.01" width="602.6" height="448.44" transform="translate(-124.09 1006.82) rotate(-78.76)" fill="url(#598f8edf-c762-4b18-b52d-250fc678075a)"/></g><rect x="386.18" y="280.49" width="581.58" height="434.43" transform="translate(-122.17 1004.12) rotate(-78.76)" fill="#fff"/><rect x="542.89" y="232.65" width="308.31" height="4.67" transform="translate(-119.81 -191.93) rotate(11.24)" fill="#e0e0e0"/><rect x="456.83" y="665.62" width="308.31" height="4.67" transform="translate(-37.05 -166.84) rotate(11.24)" fill="#e0e0e0"/><rect x="452.26" y="685.13" width="238.24" height="4.67" transform="translate(-34.01 -158.75) rotate(11.24)" fill="#e0e0e0"/><rect x="448.46" y="696.91" width="88.75" height="4.67" transform="translate(-33.22 -143.21) rotate(11.24)" fill="#ced4da" opacity="0.7"/><rect x="539.13" y="243.97" width="154.15" height="4.67" transform="translate(-119.16 -175.95) rotate(11.24)" fill="#ced4da" opacity="0.7"/><rect x="532.71" y="282.38" width="277.94" height="4.67" transform="translate(-110.6 -186.03) rotate(11.24)" fill="#e0e0e0"/><rect x="529.49" y="288.24" width="67.73" height="4.67" transform="translate(-111.54 -164.8) rotate(11.24)" fill="#3ad29f" opacity="0.7"/><rect x="521.95" y="338.03" width="308.31" height="4.67" transform="translate(-99.67 -185.82) rotate(11.24)" fill="#e0e0e0"/><g opacity="0.5"><rect x="592.89" y="385.78" width="158.82" height="276.77" transform="translate(-151.88 1020.84) rotate(-78.76)" fill="url(#013b841e-9a42-49b8-8a36-6db9ed002b72)"/></g><rect x="535.78" y="445.94" width="273.27" height="155.32" transform="translate(-64.02 -181.59) rotate(11.24)" fill="#fff"/><rect x="516.71" y="364.38" width="308.31" height="4.67" transform="translate(-94.63 -184.29) rotate(11.24)" fill="#e0e0e0"/><rect x="566.14" y="449.2" width="33.87" height="113.28" transform="translate(-69.19 -164.51) rotate(11.24)" fill="#ced4da"/><rect x="622.06" y="498.05" width="33.87" height="75.91" transform="translate(-62.24 -174.83) rotate(11.24)" fill="#3ad29f"/><rect x="678.21" y="544.59" width="33.87" height="40.87" transform="translate(-55.5 -185.22) rotate(11.24)" fill="#f55f44"/><rect x="741.87" y="514.79" width="33.87" height="82.92" transform="translate(-55.99 -197.8) rotate(11.24)" fill="#fdd835"/><path d="M880.45,410.55a155.89,155.89,0,0,0-223.11-1.68c-59,59.48-60,156.33-2.29,217.07A155.89,155.89,0,0,0,854.95,648L967.64,765.21a7.59,7.59,0,0,0,10.73.21l28.08-27a7.59,7.59,0,0,0,.21-10.73L894,610.49A155.9,155.9,0,0,0,880.45,410.55ZM845.35,599a111.5,111.5,0,1,1,3.1-157.66A111.5,111.5,0,0,1,845.35,599Z" transform="translate(-179 -60.54)" fill="url(#f8cab3c1-d868-48bc-b87d-cd2075ddc26a)"/><path d="M685.49,487.6c-12.54,0-12.56,19.49,0,19.49S698.05,487.6,685.49,487.6Z" transform="translate(-179 -60.54)" fill="url(#043d467e-585e-47c7-bb2c-06dd6f5be04b)"/><path d="M772.9,425.17c-33.75-.76-64.46,16.17-80.79,41.73-5.33,8.34,9.8,15.71,15.1,7.41,13.52-21.16,39.21-34.6,67-33.9,29.12.73,55.62,17.39,69.65,40.51,5.32,8.77,19.27.8,14-7.92C840.8,445,807.76,426,772.9,425.17Z" transform="translate(-179 -60.54)" fill="url(#be08032f-102d-431e-9b5f-1e4ebfc8159b)"/><path d="M892.68,404.63a155.89,155.89,0,0,0-223.11-1.68c-59,59.48-60,156.33-2.29,217.07a155.89,155.89,0,0,0,199.9,22.05L979.86,759.29a7.59,7.59,0,0,0,10.73.21l28.08-27a7.59,7.59,0,0,0,.21-10.73L906.19,604.56A155.9,155.9,0,0,0,892.68,404.63ZM857.58,593a111.5,111.5,0,1,1,3.1-157.66A111.5,111.5,0,0,1,857.58,593Z" transform="translate(-179 -60.54)" fill="#ced4da"/><path d="M697.72,481.67c-12.54,0-12.56,19.49,0,19.49S710.28,481.67,697.72,481.67Z" transform="translate(-179 -60.54)" fill="#ced4da"/><path d="M785.13,419.25c-33.75-.76-64.46,16.17-80.79,41.73-5.33,8.34,9.8,15.71,15.1,7.41,13.52-21.16,39.21-34.6,67-33.9,29.12.73,55.62,17.39,69.65,40.51,5.32,8.77,19.27.8,14-7.92C853,439,820,420,785.13,419.25Z" transform="translate(-179 -60.54)" fill="#ced4da"/><rect x="121.45" y="663.91" width="3.5" height="19.85" fill="#47e6b1"/><rect x="300.45" y="724.45" width="3.5" height="19.85" transform="translate(857.58 371.63) rotate(90)" fill="#47e6b1"/><path d="M750.87,68.49a4.29,4.29,0,0,1-2.39-5.19,2.06,2.06,0,0,0,.09-.48h0a2.15,2.15,0,0,0-3.87-1.43h0a2.06,2.06,0,0,0-.24.42,4.29,4.29,0,0,1-5.19,2.39,2.06,2.06,0,0,0-.48-.09h0A2.15,2.15,0,0,0,737.38,68h0a2.06,2.06,0,0,0,.42.24,4.29,4.29,0,0,1,2.39,5.19,2.06,2.06,0,0,0-.09.48h0A2.15,2.15,0,0,0,744,75.32h0a2.06,2.06,0,0,0,.24-.42,4.29,4.29,0,0,1,5.19-2.39,2.06,2.06,0,0,0,.48.09h0a2.15,2.15,0,0,0,1.43-3.87h0A2.06,2.06,0,0,0,750.87,68.49Z" transform="translate(-179 -60.54)" fill="#4d8af0"/><path d="M316.44,215.64a4.29,4.29,0,0,1-2.39-5.19,2.06,2.06,0,0,0,.09-.48h0a2.15,2.15,0,0,0-3.87-1.43h0a2.06,2.06,0,0,0-.24.42,4.29,4.29,0,0,1-5.19,2.39,2.06,2.06,0,0,0-.48-.09h0a2.15,2.15,0,0,0-1.43,3.87h0a2.06,2.06,0,0,0,.42.24,4.29,4.29,0,0,1,2.39,5.19,2.06,2.06,0,0,0-.09.48h0a2.15,2.15,0,0,0,3.87,1.43h0a2.06,2.06,0,0,0,.24-.42,4.29,4.29,0,0,1,5.19-2.39,2.06,2.06,0,0,0,.48.09h0a2.15,2.15,0,0,0,1.43-3.87h0A2.06,2.06,0,0,0,316.44,215.64Z" transform="translate(-179 -60.54)" fill="#fdd835"/><path d="M934.22,822.9a4.29,4.29,0,0,1-2.39-5.19,2.06,2.06,0,0,0,.09-.48h0a2.15,2.15,0,0,0-3.87-1.43h0a2.06,2.06,0,0,0-.24.42,4.29,4.29,0,0,1-5.19,2.39,2.06,2.06,0,0,0-.48-.09h0a2.15,2.15,0,0,0-1.43,3.87h0a2.06,2.06,0,0,0,.42.24,4.29,4.29,0,0,1,2.39,5.19,2.06,2.06,0,0,0-.09.48h0a2.15,2.15,0,0,0,3.87,1.43h0a2.06,2.06,0,0,0,.24-.42,4.29,4.29,0,0,1,5.19-2.39,2.06,2.06,0,0,0,.48.09h0a2.15,2.15,0,0,0,1.43-3.87h0A2.06,2.06,0,0,0,934.22,822.9Z" transform="translate(-179 -60.54)" fill="#fdd835"/><circle cx="321.15" cy="75.33" r="7.01" fill="#f55f44"/><circle cx="823.31" cy="162.91" r="7.01" fill="#f55f44"/><circle cx="783.61" cy="371.95" r="7.01" fill="#4d8af0"/><circle cx="7.01" cy="28.61" r="7.01" fill="#47e6b1" opacity="0.5"/></svg>
\ No newline at end of file
diff --git a/mod/forum/pix/show-grader-panel-rtl.png b/mod/forum/pix/show-grader-panel-rtl.png
new file mode 100644
index 00000000000..a66b994f76d
Binary files /dev/null and b/mod/forum/pix/show-grader-panel-rtl.png differ
diff --git a/mod/forum/pix/show-grader-panel-rtl.svg b/mod/forum/pix/show-grader-panel-rtl.svg
new file mode 100644
index 00000000000..e941c03ac63
--- /dev/null
+++ b/mod/forum/pix/show-grader-panel-rtl.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 59.1 (86144) - https://sketch.com -->
+    <title>show</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Grading" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Grading-Copy-4" transform="translate(-1070.000000, -21.000000)" fill="#000000" fill-rule="nonzero">
+            <g id="show" transform="translate(1082.000000, 33.000000) rotate(180.000000) translate(-1082.000000, -33.000000) translate(1070.000000, 21.000000)">
+                <path d="M3.75,13.7454044 L7.96875,13.7454044 L7.96875,15.6204044 L3.75,15.6204044 L3.75,13.7454044 Z M3.75,11.8760807 L7.96875,11.8760807 L7.96875,10.0010807 L3.75,10.0010807 L3.75,11.8760807 Z M3.75,6.39170569 L3.75,8.26670569 L7.96875,8.26670569 L7.96875,6.39170569 L3.75,6.39170569 Z M3.75,19.2297794 L7.96875,19.2297794 L7.96875,17.3547794 L3.75,17.3547794 L3.75,19.2297794 Z M24,2.8125 L24,21.1875 C24,22.7384033 22.7384033,24 21.1875,24 L2.8125,24 C1.26159666,24 0,22.7384033 0,21.1875 L0,2.8125 C0,1.26159666 1.26159666,0 2.8125,0 L21.1875,0 C22.7384033,0 24,1.26159666 24,2.8125 Z M2.8125,22.125 L9.84375,22.125 L9.84375,1.875 L2.8125,1.875 C2.29559325,1.875 1.875,2.29559325 1.875,2.8125 L1.875,21.1875 C1.875,21.7044068 2.29559325,22.125 2.8125,22.125 Z M22.125,2.8125 C22.125,2.29559325 21.7044067,1.875 21.1875,1.875 L11.71875,1.875 L11.71875,10.921875 L16.7678833,10.921875 L14.6116333,8.765625 L15.9375,7.43975831 L20.3571167,11.859375 L15.9375,16.2789917 L14.6116333,14.953125 L16.7678833,12.796875 L11.71875,12.796875 L11.71875,22.125 L21.1875,22.125 C21.7044067,22.125 22.125,21.7044068 22.125,21.1875 L22.125,2.8125 Z" id="Shape" transform="translate(12.000000, 12.000000) scale(-1, 1) translate(-12.000000, -12.000000) "></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/mod/forum/pix/show-grader-panel.png b/mod/forum/pix/show-grader-panel.png
new file mode 100644
index 00000000000..a9e4f3f07a2
Binary files /dev/null and b/mod/forum/pix/show-grader-panel.png differ
diff --git a/mod/forum/pix/show-grader-panel.svg b/mod/forum/pix/show-grader-panel.svg
new file mode 100644
index 00000000000..c05da7ccd8a
--- /dev/null
+++ b/mod/forum/pix/show-grader-panel.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 59.1 (86144) - https://sketch.com -->
+    <title>show</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Grading" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Grading-Copy-4" transform="translate(-1028.000000, -21.000000)" fill="#000000" fill-rule="nonzero">
+            <g id="show" transform="translate(1040.000000, 33.000000) rotate(180.000000) translate(-1040.000000, -33.000000) translate(1028.000000, 21.000000)">
+                <path d="M3.75,13.7454044 L7.96875,13.7454044 L7.96875,15.6204044 L3.75,15.6204044 L3.75,13.7454044 Z M3.75,11.8760807 L7.96875,11.8760807 L7.96875,10.0010807 L3.75,10.0010807 L3.75,11.8760807 Z M3.75,6.39170569 L3.75,8.26670569 L7.96875,8.26670569 L7.96875,6.39170569 L3.75,6.39170569 Z M3.75,19.2297794 L7.96875,19.2297794 L7.96875,17.3547794 L3.75,17.3547794 L3.75,19.2297794 Z M24,2.8125 L24,21.1875 C24,22.7384033 22.7384033,24 21.1875,24 L2.8125,24 C1.26159666,24 0,22.7384033 0,21.1875 L0,2.8125 C0,1.26159666 1.26159666,0 2.8125,0 L21.1875,0 C22.7384033,0 24,1.26159666 24,2.8125 Z M2.8125,22.125 L9.84375,22.125 L9.84375,1.875 L2.8125,1.875 C2.29559325,1.875 1.875,2.29559325 1.875,2.8125 L1.875,21.1875 C1.875,21.7044068 2.29559325,22.125 2.8125,22.125 Z M22.125,2.8125 C22.125,2.29559325 21.7044067,1.875 21.1875,1.875 L11.71875,1.875 L11.71875,10.921875 L16.7678833,10.921875 L14.6116333,8.765625 L15.9375,7.43975831 L20.3571167,11.859375 L15.9375,16.2789917 L14.6116333,14.953125 L16.7678833,12.796875 L11.71875,12.796875 L11.71875,22.125 L21.1875,22.125 C21.7044067,22.125 22.125,21.7044068 22.125,21.1875 L22.125,2.8125 Z" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/mod/forum/templates/discussion_list.mustache b/mod/forum/templates/discussion_list.mustache
index a7a958689ec..633cd71225e 100644
--- a/mod/forum/templates/discussion_list.mustache
+++ b/mod/forum/templates/discussion_list.mustache
@@ -49,29 +49,37 @@
 
     {{{groupchangemenu}}}
 
-    {{#forum.capabilities.create}}
-        <div class="p-t-1 p-b-1">
+
+    <div class="p-t-1 p-b-1">
+        {{#forum.capabilities.create}}
             <a class="btn btn-primary" data-toggle="collapse" href="#collapseAddForm">
                 {{$discussion_create_text}}
                     {{#str}}addanewdiscussion, forum{{/str}}
                 {{/discussion_create_text}}
             </a>
-            <div class="collapse m-t-1" id="collapseAddForm">
-                {{{newdiscussionhtml}}}
-            </div>
+        {{/forum.capabilities.create}}
+        {{^forum.capabilities.create}}
+            {{#forum.capabilities.selfenrol}}
+                <div class="p-t-1 p-b-1">
+                    <a class="btn btn-primary" href="{{forum.urls.create}}">
+                        {{$discussion_create_text}}
+                            {{#str}}addanewdiscussion, forum{{/str}}
+                        {{/discussion_create_text}}
+                    </a>
+                </div>
+            {{/forum.capabilities.selfenrol}}
+        {{/forum.capabilities.create}}
+        {{#forum.capabilities.grade}}
+            {{#forum.state.gradingenabled}}
+                {{> mod_forum/grades/grade_button }}
+            {{/forum.state.gradingenabled}}
+        {{/forum.capabilities.grade}}
+    </div>
+    {{#forum.capabilities.create}}
+        <div class="collapse m-t-1 p-b-1" id="collapseAddForm">
+            {{{newdiscussionhtml}}}
         </div>
     {{/forum.capabilities.create}}
-    {{^forum.capabilities.create}}
-        {{#forum.capabilities.selfenrol}}
-            <div class="p-t-1 p-b-1">
-                <a class="btn btn-primary" href="{{forum.urls.create}}">
-                    {{$discussion_create_text}}
-                        {{#str}}addanewdiscussion, forum{{/str}}
-                    {{/discussion_create_text}}
-                </a>
-            </div>
-        {{/forum.capabilities.selfenrol}}
-    {{/forum.capabilities.create}}
 
     {{#state.hasdiscussions}}
         {{$discussion_top_pagination}}
@@ -353,8 +361,4 @@
         var root = $('#discussion-list-{{uniqid}}');
         View.init(root);
     });
-
-    require(['mod_forum/grades/grader'], function(Grader) {
-        Grader.registerLaunchListeners();
-    });
 {{/js}}
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 ba3571089ac..59edc382f99 100644
--- a/mod/forum/templates/forum_discussion_nested_v2_first_post.mustache
+++ b/mod/forum/templates/forum_discussion_nested_v2_first_post.mustache
@@ -47,7 +47,7 @@
     >
         {{#isfirstunread}}<a id="unread" aria-hidden="true"></a>{{/isfirstunread}}
 
-        <div class="author-image-container d-inline-block">
+        <div class="author-image-container d-inline-block text-center">
             {{^isdeleted}}
                 {{#author}}
                     {{#urls.profileimage}}
@@ -73,7 +73,7 @@
             {{/unread}}
         </div>
 
-        <div class="d-flex flex-column w-100"  data-region-content="forum-post-core">
+        <div class="forum-post-core d-flex flex-column w-100"  data-region-content="forum-post-core">
             <header id="post-header-{{uniqid}}">
                 {{^isdeleted}}
                     <div class="d-flex flex-wrap align-items-center mb-1">
@@ -299,9 +299,11 @@
                 {{/attachments}}
 
                 <div class="d-flex mt-3 align-items-center">
-                    {{#html.rating}}
-                        <div>{{{.}}}</div>
-                    {{/html.rating}}
+                    {{^readonly}}
+                        {{#html.rating}}
+                            <div>{{{.}}}</div>
+                        {{/html.rating}}
+                    {{/readonly}}
                     <div class="ml-auto d-flex flex-column">
                         {{#haswordcount}}
                             <span class="ml-auto badge badge-light">
diff --git a/mod/forum/templates/forum_discussion_post.mustache b/mod/forum/templates/forum_discussion_post.mustache
index fbc1f6b59dd..1c030de2f7e 100644
--- a/mod/forum/templates/forum_discussion_post.mustache
+++ b/mod/forum/templates/forum_discussion_post.mustache
@@ -179,12 +179,12 @@
                             {{/isimage}}
                         {{/attachments}}
 
-                        <div class="d-flex flex-wrap">
-                            {{#html.rating}}
-                                <div class="mt-2">{{{.}}}</div>
-                            {{/html.rating}}
-                            {{$actions}}
-                                {{^readonly}}
+                        {{^readonly}}
+                            <div class="d-flex flex-wrap">
+                                {{#html.rating}}
+                                    <div class="mt-2">{{{.}}}</div>
+                                {{/html.rating}}
+                                {{$actions}}
                                     <div
                                         class="post-actions d-flex align-self-end justify-content-end flex-wrap ml-auto"
                                         data-region="post-actions-container"
@@ -303,9 +303,9 @@
                                             {{/export}}
                                         {{/capabilities}}
                                     </div>
-                                {{/readonly}}
-                            {{/actions}}
-                        </div>
+                                {{/actions}}
+                            </div>
+                        {{/readonly}}
 
                         {{$footer}}{{/footer}}
                     {{/isdeleted}}
diff --git a/mod/forum/templates/grades/grade_button.mustache b/mod/forum/templates/grades/grade_button.mustache
index d03c3c2411f..9e6398e9238 100644
--- a/mod/forum/templates/grades/grade_button.mustache
+++ b/mod/forum/templates/grades/grade_button.mustache
@@ -29,13 +29,25 @@
     {
     }
 }}
-<a class="btn btn-primary" href="" data-grade-action="launch" {{!
-    }}data-contextid="{{contextid}}" {{!
-    }}data-cmid="{{cmid}}" {{!
-    }}data-name="{{name}}" {{!
-    }}data-group="{{groupid}}" {{!
-    }}data-grading-component="{{gradingcomponent}}" {{!
-    }}data-grading-component-subtype="{{gradingcomponentsubtype}}" {{!
-    }}data-gradable-itemtype="forum" {{!
-    }}{{#firstgradeduserid}}data-initialuserid="{{firstgradeduserid}}" {{/firstgradeduserid}}{{!
-    }}>{{#str}}gradeusers, forum{{/str}}</a>
+<button
+    class="btn btn-secondary"
+    type="button"
+    data-grade-action="launch"
+    data-contextid="{{contextid}}"
+    data-cmid="{{cmid}}"
+    data-name="{{name}}"
+    data-course-id="{{courseid}}"
+    data-course-name="{{coursename}}"
+    data-experimental-display-mode="{{experimentaldisplaymode}}"
+    data-group="{{groupid}}"
+    data-grading-component="{{gradingcomponent}}"
+    data-grading-component-subtype="{{gradingcomponentsubtype}}"
+    data-gradable-itemtype="forum"
+>
+    {{#str}}gradeusers, forum{{/str}}
+</button>
+{{#js}}
+    require(['mod_forum/grades/grader'], function(Grader) {
+        Grader.registerLaunchListeners();
+    });
+{{/js}}
diff --git a/mod/forum/templates/grades/grader/discussion/post_modal.mustache b/mod/forum/templates/grades/grader/discussion/post_modal.mustache
index f402197c970..f48858b8fe3 100644
--- a/mod/forum/templates/grades/grader/discussion/post_modal.mustache
+++ b/mod/forum/templates/grades/grader/discussion/post_modal.mustache
@@ -29,8 +29,9 @@
     {
     }
 }}
-<div data-region="posts-modal">
-    {{#.}}
-        {{> mod_forum/forum_discussion_nested_v2_post_reply }}
-    {{/.}}
+<div class="{{#experimentaldisplaymode}}nested-v2-display-mode{{/experimentaldisplaymode}}" data-region="posts-modal">
+    {{#posts}}
+        {{#experimentaldisplaymode}}{{> mod_forum/forum_discussion_nested_v2_first_post }}{{/experimentaldisplaymode}}
+        {{^experimentaldisplaymode}}{{> mod_forum/forum_discussion_nested_post }}{{/experimentaldisplaymode}}
+    {{/posts}}
 </div>
diff --git a/mod/forum/templates/grades/grader/discussion/posts.mustache b/mod/forum/templates/grades/grader/discussion/posts.mustache
index 323e993deea..8f902bc6dbc 100644
--- a/mod/forum/templates/grades/grader/discussion/posts.mustache
+++ b/mod/forum/templates/grades/grader/discussion/posts.mustache
@@ -29,48 +29,68 @@
     {
     }
 }}
-<div data-region="posts" id="post-region-{{uniqid}}">
+<div
+    class="{{#experimentaldisplaymode}}nested-v2-display-mode{{/experimentaldisplaymode}}"
+    data-region="posts"
+    id="post-region-{{uniqid}}"
+>
     {{#discussions}}
-        <div class="hr-sect mt-0">{{name}}</div>
-        {{#posts}}
-            {{#parent}}
-                {{> mod_forum/forum_discussion_nested_v2_post_reply }}
-            {{/parent}}
-            {{#starter}}
-                {{> mod_forum/forum_discussion_nested_v2_first_post }}
-                <a class="btn btn-outline-dark"
-                   role="button"
-                   data-action="view-context"
-                   data-discussionid="{{discussionid}}"
-                   data-postid="{{id}}"
-                   data-name="{{name}}"
-                   href="#">
-                    {{#str}} viewconversation, forum {{/str}}
-                </a>
-            {{/starter}}
-            {{^starter}}
-                <div class="forum-post-container" data-region="replies-container">
-                    <div class="indent replies-container" data-region="replies-container">
-                        <div class="indent replies-container" data-region="replies-container">
-                            {{> mod_forum/forum_discussion_nested_v2_post_reply }}
-                            <a class="btn btn-outline-dark"
-                               role="button"
-                               data-action="view-context"
-                               data-discussionid="{{discussionid}}"
-                               data-postid="{{id}}"
-                               data-name="{{name}}"
-                               href="#">
+        <div class="discussion-container">
+            <div class="p-4">
+                <h3 class="d-inline-block m-0 h6 font-weight-bold">{{#str}} discussionstartedby, mod_forum, {{authorfullname}} {{/str}}</h3>
+                <p class="d-inline-block m-0 h6 font-weight-normal text-muted ml-1">
+                    {{#userdate}} {{timecreated}}, {{#str}} strftimedate, core_langconfig {{/str}} {{/userdate}}
+                </p>
+                <h2 class="mb-4 font-weight-bold">{{name}}</h2>
+
+                {{#posts}}
+                    <div class="posts-container">
+                        {{#parent}}
+                            <div class="parent-container">
+                                <button
+                                    class="btn btn-link show-content-button collapsed"
+                                    data-target="#parent-post-content-{{id}}"
+                                    aria-expanded="false"
+                                    aria-controls="parent-post-content-{{id}}"
+                                    data-toggle="collapse"
+                                >
+                                    {{#str}} viewparentpost, mod_forum {{/str}}
+                                </button>
+                                <div id="parent-post-content-{{id}}" class="content collapse">
+                                    {{#experimentaldisplaymode}}{{> mod_forum/forum_discussion_nested_v2_first_post }}{{/experimentaldisplaymode}}
+                                    {{^experimentaldisplaymode}}{{> mod_forum/forum_discussion_nested_post }}{{/experimentaldisplaymode}}
+                                </div>
+                            </div>
+                        {{/parent}}
+                        {{#post}}
+                            <div class="post-container">
+                                {{#experimentaldisplaymode}}{{> mod_forum/forum_discussion_nested_v2_first_post }}{{/experimentaldisplaymode}}
+                                {{^experimentaldisplaymode}}{{> mod_forum/forum_discussion_nested_post }}{{/experimentaldisplaymode}}
+                            </div>
+                            <button
+                                class="view-context-button btn btn-link border"
+                                type="button"
+                                data-action="view-context"
+                                data-discussionid="{{discussionid}}"
+                                data-postid="{{id}}"
+                                data-name="{{name}}"
+                                data-experimental-display-mode="{{experimentaldisplaymode}}"
+                            >
                                 {{#str}} viewconversation, forum {{/str}}
-                            </a>
-                        </div>
+                            </button>
+                        {{/post}}
+                        <hr class="w-75 mx-auto my-5">
                     </div>
-                </div>
-            {{/starter}}
+                {{/posts}}
+            </div>
             <hr>
-        {{/posts}}
+        </div>
     {{/discussions}}
     {{^discussions}}
-        <h3>{{#str}} noposts, forum {{/str}}</h3>
+        <div class="no-post-container text-center p-5">
+            {{#pix}} no-posts, mod_forum {{/pix}}
+            <h2 class="mt-3 font-weight-bold">{{#str}} noposts, mod_forum {{/str}}</h2>
+        </div>
     {{/discussions}}
 </div>
 {{#js}}
diff --git a/mod/forum/templates/local/grades/grader.mustache b/mod/forum/templates/local/grades/grader.mustache
index f0c1d069b52..7f81561b2df 100644
--- a/mod/forum/templates/local/grades/grader.mustache
+++ b/mod/forum/templates/local/grades/grader.mustache
@@ -34,16 +34,41 @@
         "cmid": 1337
     }
 }}
-<div class="container-fluid"
+<div
+    id="grader-container-{{uniqid}}"
+    class="d-flex flex-column h-100 unified-grader"
     data-region="unified-grader"
-    {{#userid}}data-first-userid="{{userid}}"{{/userid}}
+    {{#userid}}data-first-userid="{{.}}"{{/userid}}
     data-cmid="{{cmid}}"
-    >
-    <div class="row-fluid">
-        {{> mod_forum/local/grades/local/grader/navigation }}
-    </div>
-    <div class="row-fluid no-gutters">
+>
+    {{> mod_forum/local/grades/local/grader/navigation }}
+
+    <div class="d-flex flex-grow-1 h-100 position-relative">
+        {{#drawer}}{{> mod_forum/local/grades/local/grader/grading }}{{/drawer}}
         {{> mod_forum/local/grades/local/grader/content }}
-        {{> mod_forum/local/grades/local/grader/grading }}
     </div>
 </div>
+{{#js}}
+    require(['jquery', 'core/drawer'], function($, Drawer) {
+        var root = $('#grader-container-{{uniqid}}');
+        var drawer = root.find('[data-region="right-hand-drawer"]');
+        var expandButtons = root.find('[data-action="expand-grading-drawer"]');
+        var collapseButtons = root.find('[data-action="collapse-grading-drawer"]');
+
+        expandButtons.click(function() {
+            collapseButtons.removeClass('active');
+            expandButtons.addClass('active');
+            collapseButtons.attr('aria-expanded', true);
+            expandButtons.attr('aria-expanded', true);
+            Drawer.show(drawer);
+        });
+
+        collapseButtons.click(function() {
+            expandButtons.removeClass('active');
+            collapseButtons.addClass('active');
+            collapseButtons.attr('aria-expanded', false);
+            expandButtons.attr('aria-expanded', false);
+            Drawer.hide(drawer);
+        });
+    });
+{{/js}}
diff --git a/mod/forum/templates/local/grades/local/grader/content.mustache b/mod/forum/templates/local/grades/local/grader/content.mustache
index a31d5cf4bab..6f2423190f0 100644
--- a/mod/forum/templates/local/grades/local/grader/content.mustache
+++ b/mod/forum/templates/local/grades/local/grader/content.mustache
@@ -30,6 +30,8 @@
     {
     }
 }}
-<div class="grader-module-content col-sm-12 col-md-8 mb-3">
-    <div data-region="module_content" class="grader-module-content-display col-sm-12"></div>
+<div class="grader-module-content w-100 h-100">
+    <div data-region="module_content" class="grader-module-content-display">
+        {{> mod_forum/local/grades/local/grader/module_content_placeholder }}
+    </div>
 </div>
diff --git a/mod/forum/templates/local/grades/local/grader/grade_placeholder.mustache b/mod/forum/templates/local/grades/local/grader/grade_placeholder.mustache
index 7431ede1a3a..1fc5d6413b5 100644
--- a/mod/forum/templates/local/grades/local/grader/grade_placeholder.mustache
+++ b/mod/forum/templates/local/grades/local/grader/grade_placeholder.mustache
@@ -30,14 +30,227 @@
     {
     }
 }}
-<div class="bg-pulse-grey w-25" style="height: 20px;"></div>
-<div class="bg-pulse-grey w-50 mt-1" style="height: 25px;"></div>
-
-<div class="bg-pulse-grey w-25 mt-3" style="height: 20px;"></div>
-<div class="bg-pulse-grey w-50 mt-1" style="height: 25px;"></div>
-
-<div class="bg-pulse-grey w-25 mt-3" style="height: 20px;"></div>
-<div class="bg-pulse-grey w-100 mt-1" style="height: 25px;"></div>
-
-<div class="bg-pulse-grey w-25 mt-3" style="height: 20px;"></div>
-<div class="bg-pulse-grey w-100 mt-1" style="height: 25px;"></div>
+<div class="d-flex flex-column mb-3">
+    <div class="d-flex align-items-center mb-2" style="height: 36px">
+        <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+        <div class="bg-pulse-grey ml-auto mr-2" style="height: 16px; width: 16px"></div>
+    </div>
+    <div class="d-flex flex-column">
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div>
+            <div class="bg-pulse-grey mb-2" style="height: 22px; width: 150px"></div>
+            <div class="bg-pulse-grey" style="height: 36px; width: 100%"></div>
+        </div>
+    </div>
+</div>
+<div class="d-flex flex-column mb-3">
+    <div class="d-flex align-items-center mb-2" style="height: 36px">
+        <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+        <div class="bg-pulse-grey ml-auto mr-2" style="height: 16px; width: 16px"></div>
+    </div>
+    <div class="d-flex flex-column">
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div>
+            <div class="bg-pulse-grey mb-2" style="height: 22px; width: 150px"></div>
+            <div class="bg-pulse-grey" style="height: 36px; width: 100%"></div>
+        </div>
+    </div>
+</div>
+<div class="d-flex flex-column mb-3">
+    <div class="d-flex align-items-center mb-2" style="height: 36px">
+        <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+        <div class="bg-pulse-grey ml-auto mr-2" style="height: 16px; width: 16px"></div>
+    </div>
+    <div class="d-flex flex-column">
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div>
+            <div class="bg-pulse-grey mb-2" style="height: 22px; width: 150px"></div>
+            <div class="bg-pulse-grey" style="height: 36px; width: 100%"></div>
+        </div>
+    </div>
+</div>
+<div class="d-flex flex-column mb-3">
+    <div class="d-flex align-items-center mb-2" style="height: 36px">
+        <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+        <div class="bg-pulse-grey ml-auto mr-2" style="height: 16px; width: 16px"></div>
+    </div>
+    <div class="d-flex flex-column">
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div>
+            <div class="bg-pulse-grey mb-2" style="height: 22px; width: 150px"></div>
+            <div class="bg-pulse-grey" style="height: 36px; width: 100%"></div>
+        </div>
+    </div>
+</div>
+<div class="d-flex flex-column mb-3">
+    <div class="d-flex align-items-center mb-2" style="height: 36px">
+        <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+        <div class="bg-pulse-grey ml-auto mr-2" style="height: 16px; width: 16px"></div>
+    </div>
+    <div class="d-flex flex-column">
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div>
+            <div class="bg-pulse-grey mb-2" style="height: 22px; width: 150px"></div>
+            <div class="bg-pulse-grey" style="height: 36px; width: 100%"></div>
+        </div>
+    </div>
+</div>
+<div class="d-flex flex-column mb-3">
+    <div class="d-flex align-items-center mb-2" style="height: 36px">
+        <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+        <div class="bg-pulse-grey ml-auto mr-2" style="height: 16px; width: 16px"></div>
+    </div>
+    <div class="d-flex flex-column">
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div>
+            <div class="bg-pulse-grey mb-2" style="height: 22px; width: 150px"></div>
+            <div class="bg-pulse-grey" style="height: 36px; width: 100%"></div>
+        </div>
+    </div>
+</div>
+<div class="d-flex flex-column mb-3">
+    <div class="d-flex align-items-center mb-2" style="height: 36px">
+        <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+        <div class="bg-pulse-grey ml-auto mr-2" style="height: 16px; width: 16px"></div>
+    </div>
+    <div class="d-flex flex-column">
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div class="d-flex align-items-center mb-2" style="height: 22px">
+            <div class="bg-pulse-grey rounded-circle mr-1" style="height: 16px; width: 16px"></div>
+            <div class="bg-pulse-grey" style="height: 19px; width: 100px"></div>
+            <div class="bg-pulse-grey ml-auto" style="height: 19px; width: 50px"></div>
+        </div>
+        <div>
+            <div class="bg-pulse-grey mb-2" style="height: 22px; width: 150px"></div>
+            <div class="bg-pulse-grey" style="height: 36px; width: 100%"></div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/mod/forum/templates/local/grades/local/grader/grading.mustache b/mod/forum/templates/local/grades/local/grader/grading.mustache
index 2d038bcf2dc..65c12acc267 100644
--- a/mod/forum/templates/local/grades/local/grader/grading.mustache
+++ b/mod/forum/templates/local/grades/local/grader/grading.mustache
@@ -32,24 +32,76 @@
     {
     }
 }}
-<div class="grader-grading-panel  border-left border-secondary col-md-4">
-    <div class="col-md-12 bg-light px-2 py-3 mb-3">
-        <!--TODO  Manipulate grader panel-->
-        <h4 class="d-inline font-weight-bold mb-0 fa fa-arrow-right" aria-label="Open or close grader panel" data-action="expandgrader"></h4>
-
-        <h4 class="d-inline font-weight-bold mb-0">{{#str}}grading, mod_forum{{/str}}</h4>
-    </div>
-    <div data-region="user_picker">
-        {{> mod_forum/local/grades/local/grader/user_picker_placeholder }}
-        <hr/>
-    </div>
-    <div class="grader-grading-panel-display col-sm-12">
-        <h4 class="d-inline mb-0 fa fa-star-o"></h4>
-        <h4 class="d-inline mb-0 ">{{#str}}grade, core_grades{{/str}}</h4>
-        <div data-region="grade" class="col-md-12 mt-3">
-          {{> mod_forum/local/grades/local/grader/grade_placeholder }}
+{{<core/drawer}}
+    {{$drawerclasses}}grader-grading-panel flex-shrink-0{{/drawerclasses}}
+    {{$drawercontent}}
+        <div class="h-100 w-100 bg-white d-flex flex-column">
+            <div class="flex-shrink-0 d-flex flex-column">
+                <div class="header-container bg-light">
+                    <div
+                        id="searchbox-{{uniqid}}"
+                        class="user-search-container d-flex flex-grow-1 align-items-center collapsed"
+                        data-region="user-search-container"
+                    >
+                        <div class="search-input-container w-100">
+                            <span class="search-icon icon-no-margin d-flex align-items-center justify-content-center">
+                                {{#pix}} i/search, core {{/pix}}
+                            </span>
+                            <input
+                                type="text"
+                                data-region="user-search-input"
+                                class="form-control form-control-lg"
+                                placeholder="{{#str}} searchusers, mod_forum {{/str}}"
+                            >
+                            <button
+                                class="toggle-search-button btn btn-icon icon-no-margin"
+                                aria-expanded="false"
+                                aria-controls="searchbox-{{uniqid}}"
+                                data-action="toggle-search"
+                            >
+                                <div class="expanded-icon">
+                                    <span aria-hidden="true">{{#pix}} e/cancel, core, {{#str}} hideusersearch, mod_forum {{/str}} {{/pix}}</span>
+                                    <span class="sr-only">{{#str}} hideusersearch, mod_forum {{/str}}</span>
+                                </div>
+                                <div class="collapsed-icon">
+                                    <span aria-hidden="true">{{#pix}} i/search, core, {{#str}} showusersearch, mod_forum {{/str}} {{/pix}}</span>
+                                    <span class="sr-only">{{#str}} showusersearch, mod_forum {{/str}}</span>
+                                </div>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="info-container d-flex align-items-center">
+                        <button
+                            class="btn btn-icon icon-size-3 icon-no-margin colour-inherit"
+                            data-action="collapse-grading-drawer"
+                            aria-controls="grading-drawer"
+                            aria-expanded="true"
+                            title="{{#str}} closebuttontitle, core {{/str}}"
+                        >
+                            <span class="dir-ltr-hide">{{#pix}} t/left, core {{/pix}}</span>
+                            <span class="dir-rtl-hide">{{#pix}} t/right, core {{/pix}}</span>
+                        </button>
+                        <div class="ml-auto mr-auto text-center" data-region="status-container">
+                            {{> mod_forum/local/grades/local/grader/status_placeholder }}
+                        </div>
+                    </div>
+                </div>
+                <div class="border-bottom px-3 pt-2" data-region="user_picker">
+                    {{> mod_forum/local/grades/local/grader/user_picker_placeholder }}
+                </div>
+            </div>
+            <div class="body-container position-relative d-flex flex-column overflow-auto" data-region="body-container">
+                <div class="grader-grading-panel-display pt-3 overflow-auto" data-region="grading-panel-container">
+                    <h4 class="mb-0 h5 px-3 font-weight-normal">
+                        {{#pix}} i/grading, core {{/pix}}{{#str}} gradingmodulename, core_grades, {{moduleName}} {{/str}}
+                    </h4>
+                    <div data-region="grade" class="pt-3 px-3">
+                        {{> mod_forum/local/grades/local/grader/grade_placeholder }}
+                    </div>
+                    <div data-region="grade-errors" role="alert" aria-role="assertive"></div>
+                </div>
+            </div>
+            <div class="hidden overflow-auto" data-region="search-results-container"></div>
         </div>
-        <div data-region="grade-errors" role="alert" aria-role="assertive"></div>
-        <hr/>
-    </div>
-</div>
+    {{/drawercontent}}
+{{/core/drawer}}
diff --git a/mod/forum/templates/local/grades/local/grader/module_content_placeholder.mustache b/mod/forum/templates/local/grades/local/grader/module_content_placeholder.mustache
new file mode 100644
index 00000000000..97244edb2d7
--- /dev/null
+++ b/mod/forum/templates/local/grades/local/grader/module_content_placeholder.mustache
@@ -0,0 +1,170 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template mod_forum/local/grades/local/grader/module_content_placeholder
+
+    Classes required for JS:
+    * none
+
+    Data attributes required for JS:
+    *
+
+    Context variables required for this template:
+    *
+
+    Example context (json):
+    {}
+}}
+<div class="p-4">
+    <div class="d-inline-block bg-pulse-grey mb-1" style="height: 18px; width: 200px"></div>
+    <div class="d-inline-block bg-pulse-grey ml-1 mb-1" style="height: 18px; width: 100px"></div>
+    <div class="bg-pulse-grey mb-4" style="height: 36px; width: 500px"></div>
+
+    <div class="d-flex align-items-center mb-2 p-2" style="height: 63px">
+        <div class="bg-pulse-grey rounded-circle mr-2" style="height: 45px; width: 45px"></div>
+        <div class="bg-pulse-grey" style="height: 15px; width: 150px"></div>
+    </div>
+    <div class="mb-2 p-2">
+        <div class="d-flex mb-2">
+            <div class="bg-pulse-grey rounded-circle mr-2" style="height: 45px; width: 45px"></div>
+            <div class="mb-3">
+                <div class="bg-pulse-grey mb-1" style="height: 18px; width: 200px"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 18px; width: 350px"></div>
+            </div>
+        </div>
+        <div class="d-flex w-100">
+            <div class="flex-shrink-0 mr-2" style="height: 45px; width: 45px"></div>
+            <div class="flex-grow-1">
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 95%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 100%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 97%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 93%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 100%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 75%"></div>
+            </div>
+        </div>
+    </div>
+    <div class="bg-pulse-grey" style="height: 36px; width: 150px"></div>
+    <hr class="w-75 mx-auto my-5">
+
+    <div class="d-flex align-items-center mb-2 p-2" style="height: 63px">
+        <div class="bg-pulse-grey rounded-circle mr-2" style="height: 45px; width: 45px"></div>
+        <div class="bg-pulse-grey" style="height: 15px; width: 150px"></div>
+    </div>
+    <div class="mb-2 p-2">
+        <div class="d-flex mb-2">
+            <div class="bg-pulse-grey rounded-circle mr-2" style="height: 45px; width: 45px"></div>
+            <div class="mb-3">
+                <div class="bg-pulse-grey mb-1" style="height: 18px; width: 200px"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 18px; width: 350px"></div>
+            </div>
+        </div>
+        <div class="d-flex w-100">
+            <div class="flex-shrink-0 mr-2" style="height: 45px; width: 45px"></div>
+            <div class="flex-grow-1">
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 95%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 100%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 97%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 93%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 100%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 75%"></div>
+            </div>
+        </div>
+    </div>
+    <div class="bg-pulse-grey" style="height: 36px; width: 150px"></div>
+    <hr class="w-75 mx-auto my-5">
+
+    <div class="d-flex align-items-center mb-2 p-2" style="height: 63px">
+        <div class="bg-pulse-grey rounded-circle mr-2" style="height: 45px; width: 45px"></div>
+        <div class="bg-pulse-grey" style="height: 15px; width: 150px"></div>
+    </div>
+    <div class="mb-2 p-2">
+        <div class="d-flex mb-2">
+            <div class="bg-pulse-grey rounded-circle mr-2" style="height: 45px; width: 45px"></div>
+            <div class="mb-3">
+                <div class="bg-pulse-grey mb-1" style="height: 18px; width: 200px"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 18px; width: 350px"></div>
+            </div>
+        </div>
+        <div class="d-flex w-100">
+            <div class="flex-shrink-0 mr-2" style="height: 45px; width: 45px"></div>
+            <div class="flex-grow-1">
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 95%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 100%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 97%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 93%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 100%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 75%"></div>
+            </div>
+        </div>
+    </div>
+    <div class="bg-pulse-grey" style="height: 36px; width: 150px"></div>
+    <hr class="w-75 mx-auto my-5">
+
+    <div class="d-flex align-items-center mb-2 p-2" style="height: 63px">
+        <div class="bg-pulse-grey rounded-circle mr-2" style="height: 45px; width: 45px"></div>
+        <div class="bg-pulse-grey" style="height: 15px; width: 150px"></div>
+    </div>
+    <div class="mb-2 p-2">
+        <div class="d-flex mb-2">
+            <div class="bg-pulse-grey rounded-circle mr-2" style="height: 45px; width: 45px"></div>
+            <div class="mb-3">
+                <div class="bg-pulse-grey mb-1" style="height: 18px; width: 200px"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 18px; width: 350px"></div>
+            </div>
+        </div>
+        <div class="d-flex w-100">
+            <div class="flex-shrink-0 mr-2" style="height: 45px; width: 45px"></div>
+            <div class="flex-grow-1">
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 95%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 100%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 97%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 93%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 100%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 75%"></div>
+            </div>
+        </div>
+    </div>
+    <div class="bg-pulse-grey" style="height: 36px; width: 150px"></div>
+    <hr class="w-75 mx-auto my-5">
+
+    <div class="d-flex align-items-center mb-2 p-2" style="height: 63px">
+        <div class="bg-pulse-grey rounded-circle mr-2" style="height: 45px; width: 45px"></div>
+        <div class="bg-pulse-grey" style="height: 15px; width: 150px"></div>
+    </div>
+    <div class="mb-2 p-2">
+        <div class="d-flex mb-2">
+            <div class="bg-pulse-grey rounded-circle mr-2" style="height: 45px; width: 45px"></div>
+            <div class="mb-3">
+                <div class="bg-pulse-grey mb-1" style="height: 18px; width: 200px"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 18px; width: 350px"></div>
+            </div>
+        </div>
+        <div class="d-flex w-100">
+            <div class="flex-shrink-0 mr-2" style="height: 45px; width: 45px"></div>
+            <div class="flex-grow-1">
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 95%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 100%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 97%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 93%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 100%"></div>
+                <div class="bg-pulse-grey mb-1" style="height: 15px; width: 75%"></div>
+            </div>
+        </div>
+    </div>
+    <div class="bg-pulse-grey" style="height: 36px; width: 150px"></div>
+</div>
diff --git a/mod/forum/templates/local/grades/local/grader/navigation.mustache b/mod/forum/templates/local/grades/local/grader/navigation.mustache
index e4c43301dc4..8313ee759c2 100644
--- a/mod/forum/templates/local/grades/local/grader/navigation.mustache
+++ b/mod/forum/templates/local/grades/local/grader/navigation.mustache
@@ -34,27 +34,78 @@
         "moduleName": "Chef the Forum"
     }
 }}
-<div class="grader-grading_navigation col-sm-12">
-    <div class="row">
-        <div class="col-sm-12 col-md-8 py-3">
-            <div class="d-block">
-                <h6 class="d-inline btn px-0 font-weight-bold text-muted mb-0">{{moduleName}}</h6>
-                <h6 class="d-inline btn px-0 font-weight-bold text-muted mb-0"> > </h6>
-                <h6 class="d-inline btn px-0 font-weight-bold mb-0">{{#str}}grading, forum{{/str}}</h6>
+<nav id="nav-container-{{uniqid}}" class="grader-grading_navigation navbar">
+    <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>
+        </a>
+        <span class="text-muted icon-no-margin">{{#pix}} i/breadcrumbdivider, core {{/pix}}</span>
+        <button class="btn btn-link px-2 colour-inherit" data-action="closegrader">
+            <h5 class="d-inline px-0 mb-0">{{moduleName}}</h5>
+        </button>
+        <span class="text-muted icon-no-margin">{{#pix}} i/breadcrumbdivider, core {{/pix}}</span>
+        <h5 class="d-inline px-2 mb-0 font-weight-bold">{{#str}}grading, forum{{/str}}</h5>
+    </div>
+
+    <div class="ml-auto">
+        <button
+            class="btn btn-icon icon-no-margin drawer-button mr-1 active"
+            data-action="expand-grading-drawer"
+            aria-controls="grading-drawer"
+            aria-expanded="true"
+            type="button"
+            title="{{#str}} showgraderpanel, mod_forum {{/str}}"
+        >
+            <span class="dir-ltr-hide" aria-hidden="true">{{#pix}} show-grader-panel-rtl, mod_forum, {{#str}} showgraderpanel, mod_forum {{/str}} {{/pix}}</span>
+            <span class="dir-rtl-hide" aria-hidden="true">{{#pix}} show-grader-panel, mod_forum, {{#str}} showgraderpanel, mod_forum {{/str}} {{/pix}}</span>
+        </button>
+        <button
+            class="btn btn-icon icon-no-margin drawer-button mr-1"
+            aria-label="Open or close grader panel"
+            data-action="collapse-grading-drawer"
+            aria-controls="grading-drawer"
+            aria-expanded="true"
+            type="button"
+            title="{{#str}} hidegraderpanel, mod_forum {{/str}}"
+        >
+            <span aria-hidden="true">{{#pix}} hide-grader-panel, mod_forum, {{#str}} hidegraderpanel, mod_forum {{/str}} {{/pix}}</span>
+        </button>
+        <button
+            class="btn btn-primary font-weight-bold ml-2 px-4"
+            data-action="savegrade"
+        >
+            {{#str}} save {{/str}}
+        </button>
+        <button
+            class="btn btn-secondary font-weight-bold ml-2 px-4"
+            aria-label="{{#str}} closegrader, mod_forum {{/str}}"
+            data-action="closegrader"
+            type="button"
+        >
+            {{#str}} close, mod_forum {{/str}}
+        </button>
+        <div class="btn-group">
+        <button
+                class="btn btn-icon text-muted icon-no-margin icon-size-3 ml-2"
+                type="button"
+                id="grader-actions-menu-{{uniqid}}"
+                data-toggle="dropdown"
+                aria-haspopup="true"
+                aria-expanded="false"
+                aria-label="{{#str}} actionsforgraderinterface, mod_forum {{/str}}"
+            >
+                {{#pix}} i/menu, core {{/pix}}
+            </button>
+            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="grader-actions-menu-{{uniqid}}">
+                <button
+                    class="dropdown-item"
+                    type="button"
+                    data-action="togglefullscreen"
+                    type="button"
+                >
+                    {{#str}} togglefullscreen, mod_forum {{/str}}
+                </button>
             </div>
         </div>
-
-        <div class="col-sm-12 col-md-4 py-3">
-
-            <a href="#" class="btn fa fa-arrows-alt float-right" aria-label="Toggle fullscreen" data-action="togglefullscreen"></a>
-
-            <a href="#" class="btn btn-secondary float-right" aria-label="Close grade interface" data-action="closegrader">Close</a>
-
-            <a href="#" role="button" class="btn btn-primary float-right" aria-label="Save and quit" data-action="savegrade">Save</a>
-
-            <!--TODO Manipulate grader panel see also Grading panel-->
-            <a href="#" role="button" class="btn fa fa-check-circle float-right" aria-label="Open or close grader panel" data-action="expandgrader"></a>
-
-        </div>
     </div>
-</div>
+</nav>
diff --git a/mod/forum/templates/local/grades/local/grader/status.mustache b/mod/forum/templates/local/grades/local/grader/status.mustache
new file mode 100644
index 00000000000..82d9cf0e82c
--- /dev/null
+++ b/mod/forum/templates/local/grades/local/grader/status.mustache
@@ -0,0 +1,37 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template mod_forum/local/grades/local/grader/status
+
+    Classes required for JS:
+    * none
+
+    Data attributes required for JS:
+    *
+
+    Context variables required for this template:
+    *
+
+    Example context (json):
+    {
+        "status": "Graded",
+        "index": 1,
+        "total": 10
+    }
+}}
+{{#status}}<h2 class="font-weight-bold h5 mb-0">{{.}}</h2>{{/status}}
+<div>{{#str}} indexoutoftotal, mod_forum, {"index": "{{index}}", "total":"{{total}}"}{{/str}}</div>
diff --git a/mod/forum/templates/local/grades/local/grader/status_placeholder.mustache b/mod/forum/templates/local/grades/local/grader/status_placeholder.mustache
new file mode 100644
index 00000000000..cdd9cfe6147
--- /dev/null
+++ b/mod/forum/templates/local/grades/local/grader/status_placeholder.mustache
@@ -0,0 +1,33 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template mod_forum/local/grades/local/grader/status_placeholder
+
+    Classes required for JS:
+    * none
+
+    Data attributes required for JS:
+    *
+
+    Context variables required for this template:
+    *
+
+    Example context (json):
+    {}
+}}
+<div class="bg-pulse-grey mb-1" style="height: 22px; width: 75px"></div>
+<div class="bg-pulse-grey ml-auto mr-auto" style="height: 19px; width: 60px"></div>
diff --git a/mod/forum/templates/local/grades/local/grader/user_picker.mustache b/mod/forum/templates/local/grades/local/grader/user_picker.mustache
index c84666eed0d..d81753c1f03 100644
--- a/mod/forum/templates/local/grades/local/grader/user_picker.mustache
+++ b/mod/forum/templates/local/grades/local/grader/user_picker.mustache
@@ -34,40 +34,39 @@
     {
     }
 }}
-<div class="col-md-12">
-    <div class="row">
-        <div class="col-md-8">
-            <div data-region="user_picker/user"></div>
-        </div>
-        <div class="col-md-4">
-            <ul class="pagination">
-                <li class="page-item mr-3">
-                    <a class="page-link" href="#" aria-label="Previous" data-action="change-user" data-direction="-1">
-                        <span aria-hidden="true">&langle;</span>
-                        <span class="sr-only">{{#str}} previous {{/str}}</span>
-                    </a>
-                </li>
-                <li class="page-item mr-3">
-                    <a class="page-link" href="#" aria-label="Next" data-action="change-user" data-direction="1">
-                        <span aria-hidden="true">&rangle;</span>
-                        <span class="sr-only">{{#str}} next {{/str}}</span>
-                    </a>
-                </li>
-                <li>
-                    <button class="btn btn-icon icon-size-4 icon-no-margin colour-inherit" aria-label="{{#str}} search {{/str}}" data-target="#searchbox" aria-expanded="false" aria-controls="searchbox" data-toggle="collapse">
-                        <i class="icon fa fa-search fa-fw" aria-hidden="true"></i>
-                        <span class="sr-only">{{#str}} search {{/str}}</span>
-                    </button>
-                </li>
 
+<div class="d-flex align-items-center user-picker-container mb-2 py-2">
+    <div class="d-flex align-items-center" data-region="user_picker/user"></div>
+    <div class="ml-auto flex-shrink-0">
+        <nav aria-label="{{#str}} usernavigation, mod_forum {{/str}}">
+            <ul class="pagination mb-0">
+                <li class="page-item">
+                    <a
+                        class="page-link icon-no-margin p-0 text-reset icon-size-3"
+                        href="#"
+                        aria-label="{{#str}} previous {{/str}}"
+                        data-action="change-user"
+                        data-direction="-1"
+                        title="{{#str}} previoususer, mod_forum {{/str}}"
+                    >
+                        <span class="dir-ltr-hide">{{#pix}} i/next, core {{/pix}}</span>
+                        <span class="dir-rtl-hide">{{#pix}} i/previous, core {{/pix}}</span>
+                    </a>
+                </li>
+                <li class="page-item">
+                    <a
+                        class="page-link icon-no-margin p-0 text-reset icon-size-3 ml-2"
+                        href="#"
+                        aria-label="{{#str}} next {{/str}}"
+                        data-action="change-user"
+                        data-direction="1"
+                        title="{{#str}} nextuser, mod_forum {{/str}}"
+                    >
+                        <span class="dir-ltr-hide">{{#pix}} i/previous, core {{/pix}}</span>
+                        <span class="dir-rtl-hide">{{#pix}} i/next, core {{/pix}}</span>
+                    </a>
+                </li>
             </ul>
-        </div>
-        <div id="searchbox" class="col-md-12 collapse">
-            <form action="" class="search-form my-3 w-100">
-                <input type="text" data-action="search-user-input" class="form-control input-lg" placeholder="Search user">
-            </form>
-            <div data-action="search-user-box"></div>
-        </div>
+        </nav>
     </div>
-    <hr>
 </div>
diff --git a/mod/forum/templates/local/grades/local/grader/user_picker/user.mustache b/mod/forum/templates/local/grades/local/grader/user_picker/user.mustache
index 3fb917b9702..144f2e9d810 100644
--- a/mod/forum/templates/local/grades/local/grader/user_picker/user.mustache
+++ b/mod/forum/templates/local/grades/local/grader/user_picker/user.mustache
@@ -38,5 +38,21 @@
         "total": 7
     }
 }}
-<div class="d-block font-weight-bold" data-region="name" data-userid="{{id}}">{{fullname}}</div>
-<div class="d-block"><div class="d-inline" data-region="index">{{displayIndex}}</div>/{{total}}</div>
+{{#profileimage}}
+<img
+    class="rounded-circle userpicture mr-2"
+    src="{{.}}"
+    alt="{{#str}}pictureof, moodle, {{fullname}}{{/str}}"
+    title="{{#str}}pictureof, moodle, {{fullname}}{{/str}}"
+>
+{{/profileimage}}
+<div>
+    <h5
+        class="mb-0 font-weight-bold user-full-name text-truncate"
+        data-region="name"
+        data-userid="{{id}}"
+    >
+        {{fullname}}
+    </h5>
+</div>
+
diff --git a/mod/forum/templates/local/grades/local/grader/user_picker/user_search.mustache b/mod/forum/templates/local/grades/local/grader/user_picker/user_search.mustache
index 4c01f110465..d1b3d1c833e 100644
--- a/mod/forum/templates/local/grades/local/grader/user_picker/user_search.mustache
+++ b/mod/forum/templates/local/grades/local/grader/user_picker/user_search.mustache
@@ -56,40 +56,20 @@
         ]
     }
 }}
-<div data-action="search-user-box">
-    {{#expandedUsers}}
-        <div class="mt-2">
-            <img class="rounded-circle userpicture" src="{{profileimage}}"
-                 alt="{{#str}}pictureof, moodle, {{fullname}}{{/str}}"
-                 title="{{#str}}pictureof, moodle, {{fullname}}{{/str}}" >
-            <a href="#" class="font-weight-bold" data-action="select-user" data-userid="{{id}}">{{fullname}}</a>
-        </div>
-    {{/expandedUsers}}
-    {{^expandedUsers}}
-        <h5>{{#str}}nousersmatch, mod_forum{{/str}}</h5>
-    {{/expandedUsers}}
-    {{#hasCollapsed}}
+<div class="d-flex flex-column px-3 py-2" data-action="search-user-box">
+    {{#users}}
         <button
-                class="btn btn-icon mt-2 text-muted icon-no-margin icon-size-3"
-                type="button"
-                id="grader-users-menu-{{uniqid}}"
-                aria-label="{{#str}} showmoreusers, mod_forum {{/str}}"
-                data-toggle="collapse"
-                data-target="#collapsed-users-{{uniqid}}"
-                aria-expanded="false"
-                aria-controls="collapsed-users-{{uniqid}}"
+            class="btn btn-link text-reset p-0 mb-2 d-flex align-items-center"
+            data-action="select-user"
+            data-userid="{{id}}"
         >
-            {{#pix}} i/moremenu {{/pix}}
+            {{> mod_forum/local/grades/local/grader/user_picker/user }}
         </button>
-        <div id="collapsed-users-{{uniqid}}" class="collapse" aria-labelledby="grader-users-menu-{{uniqid}}">
-            {{#collapsedUsers}}
-                <div class="mt-2">
-                    <img class="rounded-circle userpicture" src="{{profileimage}}"
-                         alt="{{#str}}pictureof, moodle, {{fullname}}{{/str}}"
-                         title="{{#str}}pictureof, moodle, {{fullname}}{{/str}}" >
-                    <a href="#" class="font-weight-bold" data-action="select-user" data-userid="{{id}}">{{fullname}}</a>
-                </div>
-            {{/collapsedUsers}}
+    {{/users}}
+    {{^users}}
+        <div class="no-search-results-container text-center">
+            {{#pix}} no-search-results, mod_forum {{/pix}}
+            <h5 class="font-weight-bold mt-3">{{#str}}nousersmatch, mod_forum{{/str}}</h5>
         </div>
-    {{/hasCollapsed}}
+    {{/users}}
 </div>
diff --git a/mod/forum/templates/local/grades/local/grader/user_picker_placeholder.mustache b/mod/forum/templates/local/grades/local/grader/user_picker_placeholder.mustache
index af03054b440..d93d99a63f4 100644
--- a/mod/forum/templates/local/grades/local/grader/user_picker_placeholder.mustache
+++ b/mod/forum/templates/local/grades/local/grader/user_picker_placeholder.mustache
@@ -30,29 +30,21 @@
     {
     }
 }}
-<div class="col-md-12 mt-3">
-    <div class="row">
-        <div class="col-md-8">
-            <div class="bg-pulse-grey w-50" style="height: 20px;"></div>
-            <div class="bg-pulse-grey w-25 mt-1" style="height: 15px;"></div>
-        </div>
-        <div class="col-md-4">
-            <ul class="pagination">
-                <li class="page-item mr-3">
-                    <span class="btn bg-pulse-grey" aria-hidden="true">&langle;</span>
-                    <span class="sr-only">{{#str}} previous {{/str}}</span>
-                </li>
-                <li class="page-item mr-3">
-                    <span class="btn bg-pulse-grey" aria-hidden="true">&rangle;</span>
-                    <span class="sr-only">{{#str}} next {{/str}}</span>
-
+<div class="d-flex align-items-center user-picker-container mb-2 py-2">
+    <div class="d-flex align-items-center">
+        <div class="bg-pulse-grey rounded-circle d-inline-block flex-shrink-0 userpicture mr-2"></div>
+        <div class="bg-pulse-grey d-inline-block" style="height: 22px; width: 150px"></div>
+    </div>
+    <div class="ml-auto flex-shrink-0">
+        <nav>
+            <ul class="pagination mb-0">
+                <li class="page-item">
+                    <a class="bg-pulse-grey border-0 page-link icon-no-margin p-0 icon-size-3" href="#"></a>
                 </li>
                 <li class="page-item">
-                    <span class="btn bg-pulse-grey fa fa-search" aria-hidden="true"></span>
-                    <span class="sr-only">{{#str}} search {{/str}}</span>
+                    <a class="bg-pulse-grey border-0 page-link icon-no-margin p-0 icon-size-3 ml-2" href="#"></a>
                 </li>
             </ul>
-        </div>
+        </nav>
     </div>
 </div>
-
diff --git a/mod/forum/tests/externallib_test.php b/mod/forum/tests/externallib_test.php
index d49167950c0..1e3878d653b 100644
--- a/mod/forum/tests/externallib_test.php
+++ b/mod/forum/tests/externallib_test.php
@@ -2664,17 +2664,21 @@ class mod_forum_external_testcase extends externallib_advanced_testcase {
         $record->course = $course1->id;
         $record->userid = $user1->id;
         $record->forum = $forum1->id;
+        $record->timemodified = 1;
         $discussion1 = $forumgenerator->create_discussion($record);
         $discussion1firstpost = $postvault->get_first_post_for_discussion_ids([$discussion1->id]);
-        $discussion1firstpostobject = $legacypostmapper->to_legacy_object($discussion1firstpost[$discussion1->firstpost]);
+        $discussion1firstpost = $discussion1firstpost[$discussion1->firstpost];
+        $discussion1firstpostobject = $legacypostmapper->to_legacy_object($discussion1firstpost);
 
         $record = new stdClass();
         $record->course = $course1->id;
         $record->userid = $user1->id;
         $record->forum = $forum1->id;
+        $record->timemodified = 2;
         $discussion2 = $forumgenerator->create_discussion($record);
         $discussion2firstpost = $postvault->get_first_post_for_discussion_ids([$discussion2->id]);
-        $discussion2firstpostobject = $legacypostmapper->to_legacy_object($discussion2firstpost[$discussion2->firstpost]);
+        $discussion2firstpost = $discussion2firstpost[$discussion2->firstpost];
+        $discussion2firstpostobject = $legacypostmapper->to_legacy_object($discussion2firstpost);
 
         // Add 1 reply to the discussion 1 from a different user.
         $record = new stdClass();
@@ -2733,6 +2737,8 @@ class mod_forum_external_testcase extends externallib_advanced_testcase {
         $expectedposts['discussions'][0] = [
             'name' => $discussion1->name,
             'id' => $discussion1->id,
+            'timecreated' => $discussion1firstpost->get_time_created(),
+            'authorfullname' => $user1entity->get_full_name(),
             'posts' => [
                 'userposts' => [
                     [
@@ -2864,6 +2870,8 @@ class mod_forum_external_testcase extends externallib_advanced_testcase {
         $expectedposts['discussions'][1] = [
             'name' => $discussion2->name,
             'id' => $discussion2->id,
+            'timecreated' => $discussion2firstpost->get_time_created(),
+            'authorfullname' => $user1entity->get_full_name(),
             'posts' => [
                 'userposts' => [
                     [
diff --git a/mod/forum/view.php b/mod/forum/view.php
index d769b7f3ae5..2ef625c1f44 100644
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -105,25 +105,7 @@ $PAGE->set_context($forum->get_context());
 $PAGE->set_title($forum->get_name());
 $PAGE->add_body_class('forumtype-' . $forum->get_type());
 $PAGE->set_heading($course->fullname);
-
-$buttons = [];
-if ($capabilitymanager->can_grade($USER)) {
-    $forumgradeitem = forum_gradeitem::load_from_forum_entity($forum);
-    if ($forumgradeitem->is_grading_enabled()) {
-        $groupid = groups_get_activity_group($cm, true) ?: null;
-        $gradeobj = (object) [
-            'contextid' => $forum->get_context()->id,
-            'cmid' => $cmid,
-            'name' => $forum->get_name(),
-            'groupid' => $groupid,
-            'gradingcomponent' => $forumgradeitem->get_grading_component_name(),
-            'gradingcomponentsubtype' => $forumgradeitem->get_grading_component_subtype(),
-        ];
-        $buttons[] = $OUTPUT->render_from_template('mod_forum/grades/grade_button', $gradeobj);
-    }
-}
-$buttons[] = forum_search_form($course, $search);
-$PAGE->set_button(implode('', $buttons));
+$PAGE->set_button(forum_search_form($course, $search));
 
 if ($istypesingle && $displaymode == FORUM_MODE_NESTED_V2) {
     $PAGE->add_body_class('reset-style');
@@ -189,6 +171,24 @@ $groupid = groups_get_activity_group($cm, true) ?: null;
 $rendererfactory = mod_forum\local\container::get_renderer_factory();
 switch ($forum->get_type()) {
     case 'single':
+        if ($capabilitymanager->can_grade($USER)) {
+            $forumgradeitem = forum_gradeitem::load_from_forum_entity($forum);
+            if ($forumgradeitem->is_grading_enabled()) {
+                $groupid = groups_get_activity_group($cm, true) ?: null;
+                $gradeobj = (object) [
+                    'contextid' => $forum->get_context()->id,
+                    'cmid' => $cmid,
+                    'name' => $forum->get_name(),
+                    'courseid' => $course->id,
+                    'coursename' => $course->shortname,
+                    'experimentaldisplaymode' => $displaymode == FORUM_MODE_NESTED_V2,
+                    'groupid' => $groupid,
+                    'gradingcomponent' => $forumgradeitem->get_grading_component_name(),
+                    'gradingcomponentsubtype' => $forumgradeitem->get_grading_component_subtype(),
+                ];
+                echo $OUTPUT->render_from_template('mod_forum/grades/grade_button', $gradeobj);
+            }
+        }
         $discussion = $discussionvault->get_last_discussion_in_forum($forum);
         $discussioncount = $discussionvault->get_count_discussions_in_forum($forum);
         $hasmultiplediscussions = $discussioncount > 1;
@@ -227,7 +227,7 @@ switch ($forum->get_type()) {
         break;
     default:
         $discussionsrenderer = $rendererfactory->get_discussion_list_renderer($forum);
-        echo $discussionsrenderer->render($USER, $cm, $groupid, $sortorder, $pageno, $pagesize);
+        echo $discussionsrenderer->render($USER, $cm, $groupid, $sortorder, $pageno, $pagesize, $displaymode);
 }
 
 echo $OUTPUT->footer();
diff --git a/theme/boost/scss/moodle/forms.scss b/theme/boost/scss/moodle/forms.scss
index 78724df6cfa..d6ddd543568 100644
--- a/theme/boost/scss/moodle/forms.scss
+++ b/theme/boost/scss/moodle/forms.scss
@@ -366,6 +366,7 @@ select[size="1"] {
 
 textarea[data-auto-rows] {
     overflow-x: hidden;
+    resize: none;
 }
 
 /** Display elements under labels in vertical forms regardless of the screen size. */
diff --git a/theme/boost/scss/moodle/grade.scss b/theme/boost/scss/moodle/grade.scss
index 8f5b35f35d2..a29c0d8c382 100644
--- a/theme/boost/scss/moodle/grade.scss
+++ b/theme/boost/scss/moodle/grade.scss
@@ -240,20 +240,30 @@
     }
 }
 
-.criterion button.collapse[aria-expanded="true"]:before {
-    content: $fa-var-angle-down;
-    margin-right: 0;
-    @include fa-icon();
-    font-size: 16px;
-    width: 16px;
-}
+.criterion {
+    .description {
+        font-size: 1rem;
+    }
 
-.criterion button.collapse[aria-expanded="false"]:before {
-    content: $fa-var-angle-up;
-    margin-right: 0;
-    @include fa-icon();
-    font-size: 16px;
-    width: 16px;
+    .criterion-toggle {
+        .expanded-icon {
+            display: block;
+        }
+
+        .collapsed-icon {
+            display: none;
+        }
+
+        &.collapsed {
+            .expanded-icon {
+                display: none;
+            }
+
+            .collapsed-icon {
+                display: block;
+            }
+        }
+    }
 }
 
 // Set up grades layout.
diff --git a/theme/boost/scss/moodle/layout.scss b/theme/boost/scss/moodle/layout.scss
index 5f1defa2c01..0601215339f 100644
--- a/theme/boost/scss/moodle/layout.scss
+++ b/theme/boost/scss/moodle/layout.scss
@@ -1,17 +1,21 @@
 .layout {
     &.fullscreen {
-        height: 100%;
+        height: 100vh;
         position: fixed;
         top: 0;
         left: 0;
         z-index: $zindex-modal-backdrop;
-        overflow-x: hidden;
         transition: 0.5s;
-        width: 100%;
+        width: 100vw;
         margin: 0;
         opacity: 1;
         background-color: $modal-content-bg;
 
+        > div {
+            height: 100%;
+            width: 100%;
+        }
+
         .loading-icon {
             margin-left: auto;
             margin-right: auto;
diff --git a/theme/boost/scss/moodle/modules.scss b/theme/boost/scss/moodle/modules.scss
index e1e6a0d8753..ae0d3a40070 100644
--- a/theme/boost/scss/moodle/modules.scss
+++ b/theme/boost/scss/moodle/modules.scss
@@ -218,7 +218,7 @@ $author-image-margin-sm: 8px;
     }
 }
 
-#page-mod-forum-view [data-region="unified-grader"],
+.path-mod-forum .nested-v2-display-mode,
 .path-mod-forum.nested-v2-display-mode {
     .discussionsubscription {
         margin-top: 0;
@@ -426,6 +426,492 @@ $author-image-margin-sm: 8px;
     }
 }
 
+$grading-drawer-width: 430px !default;
+$grading-animation-duration: .3s !default;
+$grading-icon-button-size: 36px !default;
+$grading-search-button-padding-left: calc(#{map-get($spacers, 2)} + 8px) !default;
+$grading-search-input-padding-left: calc(#{map-get($spacers, 2)} + #{map-get($spacers, 2)} + #{$grading-icon-button-size - ($input-border-width * 2)}) !default; /* stylelint-disable-line max-line-length */
+$grading-search-input-padding-right: calc(#{map-get($spacers, 2)} + #{$grading-icon-button-size}) !default;
+$grading-nav-bar-active-drawer-button-bottom: calc(#{map-get($spacers, 2) * -1} - 1px) !default;
+$grading-content-show-content-button-padding-left: calc(#{map-get($spacers, 2) * 2} + 45px) !default;
+
+@keyframes expandSearchButton {
+    from {
+        height: $grading-icon-button-size;
+        width: $grading-icon-button-size;
+        border-radius: $grading-icon-button-size / 2;
+        background-color: $gray-200;
+    }
+    to {
+        width: 100%;
+        height: $input-height-lg;
+        border-radius: 0;
+        background-color: $input-bg;
+        border-color: $input-border-color;
+        padding-left: $grading-search-button-padding-left;
+        padding-top: $input-padding-y-lg;
+        padding-bottom: $input-padding-y-lg;
+        @include font-size($input-font-size-lg);
+        line-height: $input-line-height-lg;
+        right: 0;
+    }
+}
+
+@keyframes collapseSearchButton {
+    from {
+        width: 100%;
+        height: $input-height-lg;
+        border-radius: 0;
+        background-color: $input-bg;
+        border-color: $input-border-color;
+        padding-left: $grading-search-button-padding-left;
+        padding-top: $input-padding-y-lg;
+        padding-bottom: $input-padding-y-lg;
+        @include font-size($input-font-size-lg);
+        line-height: $input-line-height-lg;
+        right: 0;
+    }
+    to {
+        height: $grading-icon-button-size;
+        width: $grading-icon-button-size;
+        border-radius: $grading-icon-button-size / 2;
+        background-color: $gray-200;
+    }
+}
+
+.path-mod-forum .unified-grader {
+    .navbar {
+        max-height: none;
+        z-index: 1;
+    }
+
+    .body-container {
+        &.hidden {
+            display: none !important; /* stylelint-disable-line declaration-no-important */
+        }
+    }
+
+    .userpicture {
+        height: 60px;
+        width: 60px;
+    }
+
+    .grader-grading-panel {
+        position: absolute;
+        top: 0;
+        height: 100%;
+        z-index: 0;
+        width: $grading-drawer-width;
+
+        &.hidden {
+            right: ($grading-drawer-width * -1);
+        }
+
+        .grading-icon {
+            width: $grading-icon-button-size;
+        }
+
+        .user-picker-container {
+            .user-full-name {
+                max-width: 240px;
+            }
+
+            .page-link {
+                width: $grading-icon-button-size;
+                height: $grading-icon-button-size;
+                display: flex;
+                text-align: center;
+                align-items: center;
+                justify-content: center;
+            }
+        }
+
+        .header-container {
+            height: 65px;
+            position: relative;
+            overflow: hidden;
+
+            .info-container {
+                position: absolute;
+                top: 50%;
+                left: 0;
+                transform: translateY(-50%);
+                width: 100%;
+                height: 100%;
+                padding: map-get($spacers, 2);
+                padding-right: calc(#{$grading-icon-button-size} + #{map-get($spacers, 2)});
+                opacity: 1;
+                visibility: visible;
+                transition: left $grading-animation-duration ease-in-out;
+                z-index: 1;
+            }
+
+            .toggle-search-button {
+                &.expand {
+                    animation-name: expandSearchButton;
+                    animation-duration: $grading-animation-duration;
+                    animation-timing-function: ease-in-out;
+                }
+
+                &.collapse {
+                    display: block;
+                    animation-name: collapseSearchButton;
+                    animation-duration: $grading-animation-duration;
+                }
+            }
+
+            .user-search-container {
+                overflow: hidden;
+                position: absolute;
+                top: 50%;
+                right: 0;
+                transform: translateY(-50%);
+                z-index: 2;
+                width: 100%;
+                height: 100% !important; /* stylelint-disable-line declaration-no-important */
+                padding: map-get($spacers, 2);
+
+                .search-input-container {
+                    position: relative;
+                    overflow: visible;
+                    flex-wrap: nowrap;
+
+                    input {
+                        padding-left: $grading-search-input-padding-left;
+                        padding-right: $grading-search-input-padding-right;
+                        opacity: 1;
+                        visibility: visible;
+                        transition:
+                            opacity 0s linear $grading-animation-duration,
+                            visibility 0s linear;
+                    }
+
+                    .search-icon {
+                        position: absolute;
+                        top: 50%;
+                        left: map-get($spacers, 2);
+                        transform: translateY(-50%);
+                        color: $input-color;
+                        height: $grading-icon-button-size;
+                        width: $grading-icon-button-size - ($input-border-width * 2);
+                        background-color: $input-bg;
+                        opacity: 1;
+                        visibility: visible;
+                        transition:
+                            opacity 0s linear $grading-animation-duration,
+                            visibility 0s linear $grading-animation-duration;
+                    }
+
+                    .toggle-search-button {
+                        position: absolute;
+                        top: 50%;
+                        right: map-get($spacers, 2);
+                        transform: translateY(-50%);
+                        z-index: 1;
+                        color: inherit;
+                        text-align: left;
+                        padding-left: 9px;
+                        transition: right 0s linear $grading-animation-duration;
+
+                        .expanded-icon {
+                            opacity: 1;
+                            visibility: visible;
+                            max-width: 50px;
+                            max-height: 50px;
+                            transition:
+                                opacity 0s linear $grading-animation-duration,
+                                max-height 0s linear $grading-animation-duration,
+                                max-width 0s linear $grading-animation-duration,
+                                visibility 0s linear $grading-animation-duration;
+                        }
+
+                        .collapsed-icon {
+                            opacity: 0;
+                            visibility: hidden;
+                            max-height: 0;
+                            max-width: 0;
+                            overflow: hidden;
+                            transition:
+                                opacity 0s linear $grading-animation-duration,
+                                max-height 0s linear $grading-animation-duration,
+                                max-width 0s linear $grading-animation-duration,
+                                visibility 0s linear $grading-animation-duration;
+                        }
+                    }
+                }
+
+                &.collapsed {
+                    width: calc(#{$grading-icon-button-size} + #{map-get($spacers, 2)} + #{map-get($spacers, 2)});
+                    transition: width $grading-animation-duration ease-in-out;
+
+                    .search-input-container {
+                        flex-wrap: nowrap;
+
+                        input,
+                        .search-icon {
+                            opacity: 0;
+                            visibility: hidden;
+                            transition:
+                                opacity 0s linear,
+                                visibility 0s linear;
+                        }
+
+                        input {
+                            padding-left: 0;
+                            padding-right: 0;
+                        }
+
+                        .toggle-search-button {
+                            .expanded-icon {
+                                opacity: 0;
+                                visibility: hidden;
+                                max-height: 0;
+                                max-width: 0;
+                                overflow: hidden;
+                                transition:
+                                    opacity 0s linear,
+                                    max-height 0s linear,
+                                    max-width 0s linear,
+                                    visibility 0s linear;
+                            }
+
+                            .collapsed-icon {
+                                opacity: 1;
+                                visibility: visible;
+                                max-width: 50px;
+                                max-height: 50px;
+                                transition:
+                                    opacity 0s linear,
+                                    max-height 0s linear,
+                                    max-width 0s linear,
+                                    visibility 0s linear;
+                            }
+                        }
+                    }
+                }
+            }
+
+            .user-search-container:not(.collapsed) + .info-container {
+                opacity: 0;
+                visibility: hidden;
+                left: calc(100% * -1);
+                transition:
+                    left $grading-animation-duration ease-in-out,
+                    opacity 0s linear $grading-animation-duration,
+                    visibility 0s linear $grading-animation-duration,
+                    padding 0s linear $grading-animation-duration;
+            }
+        }
+    }
+
+    .grader-module-content {
+        overflow-y: auto;
+        margin-right: $grading-drawer-width;
+        @include transition(margin-right .2s ease-in-out);
+    }
+
+    .grader-grading-panel.hidden + .grader-module-content {
+        margin-right: 0;
+    }
+
+    .drawer-button {
+        position: relative;
+
+        &.active::after {
+            content: "";
+            position: absolute;
+            bottom: $grading-nav-bar-active-drawer-button-bottom;
+            left: 0;
+            width: 100%;
+            height: 3px;
+            background-color: map-get($theme-colors, 'primary');
+        }
+
+        .icon {
+            font-size: 20px;
+            height: 20px;
+            width: 20px;
+        }
+    }
+
+    .grader-module-content-display {
+        .discussion-container {
+            &:last-of-type {
+                > hr {
+                    display: none;
+                }
+            }
+
+            .posts-container {
+                &:last-of-type {
+                    > hr {
+                        display: none;
+                    }
+                }
+
+                .parent-container {
+                    position: relative;
+
+                    .show-content-button {
+                        position: absolute;
+                        height: 100%;
+                        width: 100%;
+                        left: 0;
+                        top: 0;
+                        padding-left: $grading-content-show-content-button-padding-left;
+                        text-align: left;
+                        z-index: 1;
+
+                        &:not(.collapsed) {
+                            display: none;
+                        }
+                    }
+
+                    .content {
+                        display: block;
+                        height: auto !important; /* stylelint-disable-line declaration-no-important */
+
+                        .header {
+                            transition: margin-bottom $grading-animation-duration ease-in-out;
+
+                            div + div {
+                                opacity: 1;
+                                visibility: visible;
+                                max-height: none;
+                                transition:
+                                    opacity $grading-animation-duration linear,
+                                    visibility 0s linear;
+                            }
+                        }
+
+                        .body-content-container {
+                            opacity: 1;
+                            visibility: visible;
+                            max-height: none;
+                            transition:
+                                opacity $grading-animation-duration linear,
+                                visibility 0s linear;
+                        }
+
+                        .forum-post-core {
+                            opacity: 1;
+                            visibility: visible;
+                            max-height: none;
+                            transition:
+                                opacity $grading-animation-duration linear,
+                                visibility 0s linear;
+                        }
+                    }
+
+                    .show-content-button.collapsed + .content {
+                        opacity: .3;
+
+                        .header {
+                            margin-bottom: 0 !important; /* stylelint-disable-line declaration-no-important */
+
+                            div + div {
+                                opacity: 0;
+                                visibility: hidden;
+                                max-height: 0;
+                            }
+                        }
+
+                        .body-content-container {
+                            opacity: 0;
+                            visibility: hidden;
+                            max-height: 0;
+                        }
+
+                        .forum-post-core {
+                            opacity: 0;
+                            visibility: hidden;
+                            max-height: 0;
+                        }
+                    }
+
+                    .show-content-button.collapsed:hover + .content,
+                    .show-content-button.collapsed:focus + .content {
+                        opacity: 1;
+                    }
+                }
+            }
+        }
+
+        .no-post-container {
+            .icon {
+                height: 250px;
+                width: 250px;
+                margin-right: 0;
+            }
+        }
+
+        .nested-v2-display-mode {
+            .discussion-container {
+                .posts-container {
+                    .parent-container {
+                        .show-content-button {
+                            padding-left: $author-image-width + $author-image-margin;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    .no-search-results-container {
+        .icon {
+            height: 250px;
+            width: 250px;
+            margin-right: 0;
+        }
+    }
+
+    .nested-v2-display-mode {
+        .view-context-button {
+            margin-left: $author-image-width + $author-image-margin;
+            border-radius: $border-radius-lg;
+        }
+
+        .parent-container {
+            .author-image-container {
+                position: relative;
+
+                &:after {
+                    position: absolute;
+                    top: calc(#{$author-image-width} + #{map-get($spacers, 2)});
+                    content: "";
+                    background-color: $gray-200;
+                    width: 2px;
+                    height: calc(100% - #{$author-image-width} + #{map-get($spacers, 2)});
+                }
+            }
+        }
+
+        .parent-container + .post-container {
+            .author-image-container {
+                img {
+                    width: $author-image-width-sm !important; /* stylelint-disable-line declaration-no-important */
+                }
+            }
+        }
+    }
+}
+
+.path-mod-forum .unified-grader .nested-v2-display-mode,
+.path-mod-forum .modal .nested-v2-display-mode {
+    .post-subject {
+        display: none;
+    }
+}
+
+@include media-breakpoint-down(xs) {
+    .path-mod-forum .unified-grader {
+        .grader-grading-panel {
+            width: 100%;
+        }
+    }
+}
+
 // End styling for mod_forum.
 
 .maincalendar .calendarmonth td,
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 95790351c6d..6c4ea401cb2 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -2308,16 +2308,16 @@
 .fa-meetup:before {
   content: ""; }
 
-.sr-only, #page-mod-forum-view [data-region="unified-grader"] .alert.discussionlocked, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.releasenoteslink,
-#page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminwarning, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminwarning,
-#page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminerror, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminerror, #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.formulation, .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.formulation,
-#page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.outcome, .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.outcome,
-#page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.comment, .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.comment, #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.label,
+.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink,
+.path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning,
+.path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation,
+.path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome,
+.path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label,
 .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink,
 .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning,
 .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation,
 .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome,
-.path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, #page-mod-forum-view [data-region="unified-grader"] .tag_list > b,
+.path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b,
 .path-mod-forum.nested-v2-display-mode .tag_list > b {
   position: absolute;
   width: 1px;
@@ -7728,16 +7728,16 @@ button.bg-dark:focus {
     top: 0;
     z-index: 1020; } }
 
-.sr-only, #page-mod-forum-view [data-region="unified-grader"] .alert.discussionlocked, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.releasenoteslink,
-#page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminwarning, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminwarning,
-#page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminerror, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminerror, #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.formulation, .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.formulation,
-#page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.outcome, .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.outcome,
-#page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.comment, .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.comment, #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.label,
+.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink,
+.path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning,
+.path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation,
+.path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome,
+.path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label,
 .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink,
 .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning,
 .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation,
 .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome,
-.path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, #page-mod-forum-view [data-region="unified-grader"] .tag_list > b,
+.path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b,
 .path-mod-forum.nested-v2-display-mode .tag_list > b {
   position: absolute;
   width: 1px;
@@ -15108,27 +15108,27 @@ body.path-question-type {
     font: inherit;
     position: static;
     padding-right: .3em; }
-  body.path-question-type .form-group .sr-only, body.path-question-type .form-buttons .sr-only, body.path-question-type .path-admin .buttons .sr-only, .path-admin body.path-question-type .buttons .sr-only, body.path-question-type .fp-content-center form + div .sr-only, .fp-content-center body.path-question-type form + div .sr-only, body.path-question-type div.backup-section + form .sr-only, body.path-question-type .form-group #page-mod-forum-view [data-region="unified-grader"] .alert.discussionlocked, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-buttons #page-mod-forum-view [data-region="unified-grader"] .alert.discussionlocked, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-buttons .alert.discussionlocked, body.path-question-type .path-admin .buttons #page-mod-forum-view [data-region="unified-grader"] .alert.discussionlocked, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .path-admin .buttons .alert.discussionlocked, .path-admin body.path-question-type .buttons #page-mod-forum-view [data-region="unified-grader"] .alert.discussionlocked, #page-mod-forum-view [data-region="unified-grader"] .path-admin body.path-question-type .buttons .alert.discussionlocked, body.path-question-type .fp-content-center form + div #page-mod-forum-view [data-region="unified-grader"] .alert.discussionlocked, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .fp-content-center form + div .alert.discussionlocked, .fp-content-center body.path-question-type form + div #page-mod-forum-view [data-region="unified-grader"] .alert.discussionlocked, #page-mod-forum-view [data-region="unified-grader"] .fp-content-center body.path-question-type form + div .alert.discussionlocked, body.path-question-type div.backup-section + form #page-mod-forum-view [data-region="unified-grader"] .alert.discussionlocked, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type div.backup-section + form .alert.discussionlocked, body.path-question-type .form-group #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.releasenoteslink, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .form-group .discussionlocked.releasenoteslink, body.path-question-type .form-buttons #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.releasenoteslink, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .form-buttons .discussionlocked.releasenoteslink, body.path-question-type .path-admin .buttons #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.releasenoteslink, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.releasenoteslink, .path-admin body.path-question-type .buttons #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.releasenoteslink, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.releasenoteslink, body.path-question-type .fp-content-center form + div #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.releasenoteslink, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.releasenoteslink, .fp-content-center body.path-question-type form + div #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.releasenoteslink, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.releasenoteslink, body.path-question-type div.backup-section + form #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.releasenoteslink, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.releasenoteslink, body.path-question-type .form-group #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.releasenoteslink, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-group .discussionlocked.releasenoteslink, body.path-question-type .form-buttons #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.releasenoteslink, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-buttons .discussionlocked.releasenoteslink, body.path-question-type .path-admin .buttons #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.releasenoteslink, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .path-admin .buttons .discussionlocked.releasenoteslink, .path-admin body.path-question-type .buttons #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.releasenoteslink, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .path-admin body.path-question-type .buttons .discussionlocked.releasenoteslink, body.path-question-type .fp-content-center form + div #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.releasenoteslink, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .fp-content-center form + div .discussionlocked.releasenoteslink, .fp-content-center body.path-question-type form + div #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.releasenoteslink, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .fp-content-center body.path-question-type form + div .discussionlocked.releasenoteslink, body.path-question-type div.backup-section + form #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.releasenoteslink, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type div.backup-section + form .discussionlocked.releasenoteslink,
-  body.path-question-type .form-group #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminwarning, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .form-group .discussionlocked.adminwarning,
-  body.path-question-type .form-buttons #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminwarning, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .form-buttons .discussionlocked.adminwarning,
-  body.path-question-type .path-admin .buttons #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminwarning, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.adminwarning, .path-admin body.path-question-type .buttons #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminwarning, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.adminwarning,
-  body.path-question-type .fp-content-center form + div #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminwarning, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.adminwarning, .fp-content-center body.path-question-type form + div #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminwarning, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.adminwarning,
-  body.path-question-type div.backup-section + form #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminwarning, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.adminwarning, body.path-question-type .form-group #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminwarning, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-group .discussionlocked.adminwarning, body.path-question-type .form-buttons #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminwarning, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-buttons .discussionlocked.adminwarning, body.path-question-type .path-admin .buttons #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminwarning, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .path-admin .buttons .discussionlocked.adminwarning, .path-admin body.path-question-type .buttons #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminwarning, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .path-admin body.path-question-type .buttons .discussionlocked.adminwarning, body.path-question-type .fp-content-center form + div #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminwarning, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .fp-content-center form + div .discussionlocked.adminwarning, .fp-content-center body.path-question-type form + div #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminwarning, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .fp-content-center body.path-question-type form + div .discussionlocked.adminwarning, body.path-question-type div.backup-section + form #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminwarning, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type div.backup-section + form .discussionlocked.adminwarning,
-  body.path-question-type .form-group #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminerror, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .form-group .discussionlocked.adminerror,
-  body.path-question-type .form-buttons #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminerror, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .form-buttons .discussionlocked.adminerror,
-  body.path-question-type .path-admin .buttons #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminerror, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.adminerror, .path-admin body.path-question-type .buttons #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminerror, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.adminerror,
-  body.path-question-type .fp-content-center form + div #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminerror, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.adminerror, .fp-content-center body.path-question-type form + div #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminerror, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.adminerror,
-  body.path-question-type div.backup-section + form #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminerror, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.adminerror, body.path-question-type .form-group #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminerror, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-group .discussionlocked.adminerror, body.path-question-type .form-buttons #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminerror, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-buttons .discussionlocked.adminerror, body.path-question-type .path-admin .buttons #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminerror, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .path-admin .buttons .discussionlocked.adminerror, .path-admin body.path-question-type .buttons #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminerror, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .path-admin body.path-question-type .buttons .discussionlocked.adminerror, body.path-question-type .fp-content-center form + div #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminerror, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .fp-content-center form + div .discussionlocked.adminerror, .fp-content-center body.path-question-type form + div #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminerror, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .fp-content-center body.path-question-type form + div .discussionlocked.adminerror, body.path-question-type div.backup-section + form #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminerror, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type div.backup-section + form .discussionlocked.adminerror, body.path-question-type .form-group #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.formulation, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.formulation, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.formulation, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.formulation, #page-mod-forum-view [data-region="unified-grader"] .que .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.formulation, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.formulation, #page-mod-forum-view [data-region="unified-grader"] .que .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.formulation, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.formulation, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.formulation, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.formulation, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.formulation, .que #page-mod-forum-view [data-region="unified-grader"] .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.formulation, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.formulation, .que #page-mod-forum-view [data-region="unified-grader"] .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.formulation, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type div.backup-section + form .discussionlocked.formulation,
-  body.path-question-type .form-group #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.outcome, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .form-group .discussionlocked.outcome,
-  body.path-question-type .form-buttons #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.outcome, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .form-buttons .discussionlocked.outcome,
-  body.path-question-type .path-admin .buttons #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.outcome, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.outcome, #page-mod-forum-view [data-region="unified-grader"] .que .path-admin body.path-question-type .buttons .discussionlocked.outcome,
-  body.path-question-type .fp-content-center form + div #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.outcome, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .fp-content-center form + div .discussionlocked.outcome, .fp-content-center body.path-question-type form + div #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.outcome, #page-mod-forum-view [data-region="unified-grader"] .que .fp-content-center body.path-question-type form + div .discussionlocked.outcome,
-  body.path-question-type div.backup-section + form #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.outcome, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type div.backup-section + form .discussionlocked.outcome, body.path-question-type .form-group .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.outcome, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-buttons .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.outcome, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-buttons .discussionlocked.outcome, body.path-question-type .path-admin .buttons .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.outcome, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.outcome, .que #page-mod-forum-view [data-region="unified-grader"] .path-admin body.path-question-type .buttons .discussionlocked.outcome, body.path-question-type .fp-content-center form + div .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.outcome, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .fp-content-center form + div .discussionlocked.outcome, .fp-content-center body.path-question-type form + div .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.outcome, .que #page-mod-forum-view [data-region="unified-grader"] .fp-content-center body.path-question-type form + div .discussionlocked.outcome, body.path-question-type div.backup-section + form .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.outcome, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type div.backup-section + form .discussionlocked.outcome,
-  body.path-question-type .form-group #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.comment, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .form-group .discussionlocked.comment,
-  body.path-question-type .form-buttons #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.comment, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .form-buttons .discussionlocked.comment,
-  body.path-question-type .path-admin .buttons #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.comment, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.comment, #page-mod-forum-view [data-region="unified-grader"] .que .path-admin body.path-question-type .buttons .discussionlocked.comment,
-  body.path-question-type .fp-content-center form + div #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.comment, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.comment, #page-mod-forum-view [data-region="unified-grader"] .que .fp-content-center body.path-question-type form + div .discussionlocked.comment,
-  body.path-question-type div.backup-section + form #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.comment, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.comment, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-buttons .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.comment, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-buttons .discussionlocked.comment, body.path-question-type .path-admin .buttons .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.comment, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.comment, .que #page-mod-forum-view [data-region="unified-grader"] .path-admin body.path-question-type .buttons .discussionlocked.comment, body.path-question-type .fp-content-center form + div .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.comment, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.comment, .que #page-mod-forum-view [data-region="unified-grader"] .fp-content-center body.path-question-type form + div .discussionlocked.comment, body.path-question-type div.backup-section + form .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.comment, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .discussionlocked.label, #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .discussionlocked.label, #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .discussionlocked.label, #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .discussionlocked.label, #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .discussionlocked.label, #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .discussionlocked.label, #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .discussionlocked.label, #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget body.path-question-type div.backup-section + form .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.label, .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.label, .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.label, .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.label, .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.label, .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.label, .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.label, .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] body.path-question-type div.backup-section + form .discussionlocked.label,
+  body.path-question-type .form-group .sr-only, body.path-question-type .form-buttons .sr-only, body.path-question-type .path-admin .buttons .sr-only, .path-admin body.path-question-type .buttons .sr-only, body.path-question-type .fp-content-center form + div .sr-only, .fp-content-center body.path-question-type form + div .sr-only, body.path-question-type div.backup-section + form .sr-only, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .alert.discussionlocked, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .alert.discussionlocked, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .alert.discussionlocked, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .alert.discussionlocked, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .alert.discussionlocked, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-group .discussionlocked.releasenoteslink, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-buttons .discussionlocked.releasenoteslink, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.releasenoteslink, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.releasenoteslink, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.releasenoteslink, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.releasenoteslink, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.releasenoteslink, body.path-question-type .form-group #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.releasenoteslink, body.path-question-type .form-buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.releasenoteslink, body.path-question-type .path-admin .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.releasenoteslink, .path-admin body.path-question-type .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.releasenoteslink, body.path-question-type .fp-content-center form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.releasenoteslink, .fp-content-center body.path-question-type form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.releasenoteslink, body.path-question-type div.backup-section + form #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.releasenoteslink,
+  body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-group .discussionlocked.adminwarning,
+  body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-buttons .discussionlocked.adminwarning,
+  body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.adminwarning, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.adminwarning,
+  body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.adminwarning, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.adminwarning,
+  body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.adminwarning, body.path-question-type .form-group #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.adminwarning, body.path-question-type .form-buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.adminwarning, body.path-question-type .path-admin .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.adminwarning, .path-admin body.path-question-type .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.adminwarning, body.path-question-type .fp-content-center form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.adminwarning, .fp-content-center body.path-question-type form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.adminwarning, body.path-question-type div.backup-section + form #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.adminwarning,
+  body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-group .discussionlocked.adminerror,
+  body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-buttons .discussionlocked.adminerror,
+  body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.adminerror, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.adminerror,
+  body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.adminerror, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.adminerror,
+  body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.adminerror, body.path-question-type .form-group #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.adminerror, body.path-question-type .form-buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.adminerror, body.path-question-type .path-admin .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.adminerror, .path-admin body.path-question-type .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.adminerror, body.path-question-type .fp-content-center form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.adminerror, .fp-content-center body.path-question-type form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.adminerror, body.path-question-type div.backup-section + form #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.adminerror, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.formulation,
+  body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.outcome,
+  body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.outcome,
+  body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.outcome,
+  body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.outcome, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.outcome,
+  body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.outcome, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.outcome, body.path-question-type .path-admin .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.outcome, body.path-question-type .fp-content-center form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.outcome, .fp-content-center body.path-question-type form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.outcome, body.path-question-type div.backup-section + form .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.outcome,
+  body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.comment,
+  body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.comment,
+  body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.comment,
+  body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.comment,
+  body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.comment, body.path-question-type .path-admin .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.comment, body.path-question-type .fp-content-center form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.comment, body.path-question-type div.backup-section + form .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type div.backup-section + form .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.label,
   body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked,
   body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .alert.discussionlocked,
   body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .alert.discussionlocked, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .alert.discussionlocked,
@@ -15153,7 +15153,7 @@ body.path-question-type {
   body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.comment,
   body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.comment,
   body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.comment,
-  body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.comment, body.path-question-type .path-admin .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.comment, body.path-question-type .fp-content-center form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.comment, body.path-question-type div.backup-section + form .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type div.backup-section + form .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.label, body.path-question-type .form-group #page-mod-forum-view [data-region="unified-grader"] .tag_list > b, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-group .tag_list > b, body.path-question-type .form-buttons #page-mod-forum-view [data-region="unified-grader"] .tag_list > b, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-buttons .tag_list > b, body.path-question-type .path-admin .buttons #page-mod-forum-view [data-region="unified-grader"] .tag_list > b, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .path-admin .buttons .tag_list > b, .path-admin body.path-question-type .buttons #page-mod-forum-view [data-region="unified-grader"] .tag_list > b, #page-mod-forum-view [data-region="unified-grader"] .path-admin body.path-question-type .buttons .tag_list > b, body.path-question-type .fp-content-center form + div #page-mod-forum-view [data-region="unified-grader"] .tag_list > b, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .fp-content-center form + div .tag_list > b, .fp-content-center body.path-question-type form + div #page-mod-forum-view [data-region="unified-grader"] .tag_list > b, #page-mod-forum-view [data-region="unified-grader"] .fp-content-center body.path-question-type form + div .tag_list > b, body.path-question-type div.backup-section + form #page-mod-forum-view [data-region="unified-grader"] .tag_list > b, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type div.backup-section + form .tag_list > b,
+  body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.comment, body.path-question-type .path-admin .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.comment, body.path-question-type .fp-content-center form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.comment, body.path-question-type div.backup-section + form .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type div.backup-section + form .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.label, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .tag_list > b, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .tag_list > b, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .tag_list > b, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .tag_list > b, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .tag_list > b, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .tag_list > b, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .tag_list > b,
   body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .tag_list > b,
   body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .tag_list > b,
   body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .tag_list > b, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .tag_list > b,
@@ -16058,7 +16058,8 @@ select[size="1"] {
   overflow: visible; }
 
 textarea[data-auto-rows] {
-  overflow-x: hidden; }
+  overflow-x: hidden;
+  resize: none; }
 
 /** Display elements under labels in vertical forms regardless of the screen size. */
 .mform.full-width-labels .fitem.row {
@@ -16332,41 +16333,41 @@ select {
   to {
     background-color: inherit; } }
 
-#page-mod-forum-view [data-region="unified-grader"],
+.path-mod-forum .nested-v2-display-mode,
 .path-mod-forum.nested-v2-display-mode {
   /** Reset the badge styling back to pill style. */
   /** Style the ratings like a badge. */
   /** Don't show the discussion locked alert in this mode because it's already indicated with a badge. */
   /** Fix muted text contrast ratios for accessibility. */
   /** Make the tag list text screen reader visible only */ }
-  #page-mod-forum-view [data-region="unified-grader"] .discussionsubscription,
+  .path-mod-forum .nested-v2-display-mode .discussionsubscription,
   .path-mod-forum.nested-v2-display-mode .discussionsubscription {
     margin-top: 0;
     text-align: inherit;
     margin-bottom: 0; }
-  #page-mod-forum-view [data-region="unified-grader"] .preload-subscribe,
-  #page-mod-forum-view [data-region="unified-grader"] .preload-unsubscribe,
+  .path-mod-forum .nested-v2-display-mode .preload-subscribe,
+  .path-mod-forum .nested-v2-display-mode .preload-unsubscribe,
   .path-mod-forum.nested-v2-display-mode .preload-subscribe,
   .path-mod-forum.nested-v2-display-mode .preload-unsubscribe {
     display: none; }
-  #page-mod-forum-view [data-region="unified-grader"] .post-message,
+  .path-mod-forum .nested-v2-display-mode .post-message,
   .path-mod-forum.nested-v2-display-mode .post-message {
     line-height: 1.6; }
-  #page-mod-forum-view [data-region="unified-grader"] .indent,
+  .path-mod-forum .nested-v2-display-mode .indent,
   .path-mod-forum.nested-v2-display-mode .indent {
     margin-left: 0; }
-  #page-mod-forum-view [data-region="unified-grader"] .badge,
+  .path-mod-forum .nested-v2-display-mode .badge,
   .path-mod-forum.nested-v2-display-mode .badge {
     font-size: inherit;
     font-weight: inherit;
     padding-left: .5rem;
     padding-right: .5rem;
     border-radius: 10rem; }
-  #page-mod-forum-view [data-region="unified-grader"] .badge-light,
+  .path-mod-forum .nested-v2-display-mode .badge-light,
   .path-mod-forum.nested-v2-display-mode .badge-light {
     background-color: #f6f6f6;
     color: #5b5b5b; }
-  #page-mod-forum-view [data-region="unified-grader"] .rating-aggregate-container,
+  .path-mod-forum .nested-v2-display-mode .rating-aggregate-container,
   .path-mod-forum.nested-v2-display-mode .rating-aggregate-container {
     background-color: #f6f6f6;
     color: #5b5b5b;
@@ -16376,35 +16377,35 @@ select {
     vertical-align: middle;
     border-radius: 10rem;
     text-align: center; }
-  #page-mod-forum-view [data-region="unified-grader"] .ratinginput,
+  .path-mod-forum .nested-v2-display-mode .ratinginput,
   .path-mod-forum.nested-v2-display-mode .ratinginput {
     padding: .25em 1.75rem 0.25em .75em;
     line-height: 1;
     height: auto;
     border-radius: 10rem; }
     @media (max-width: 767.98px) {
-      #page-mod-forum-view [data-region="unified-grader"] .ratinginput,
+      .path-mod-forum .nested-v2-display-mode .ratinginput,
       .path-mod-forum.nested-v2-display-mode .ratinginput {
         margin-top: .5rem; } }
-  #page-mod-forum-view [data-region="unified-grader"] .group-image,
+  .path-mod-forum .nested-v2-display-mode .group-image,
   .path-mod-forum.nested-v2-display-mode .group-image {
     width: 35px;
     height: 35px;
     margin-right: 0;
     float: none;
     display: inline-block; }
-  #page-mod-forum-view [data-region="unified-grader"] .text-muted, #page-mod-forum-view [data-region="unified-grader"] a.dimmed,
-  #page-mod-forum-view [data-region="unified-grader"] .dimmed_text,
-  #page-mod-forum-view [data-region="unified-grader"] .dimmed_text a, .dimmed_text #page-mod-forum-view [data-region="unified-grader"] a,
-  #page-mod-forum-view [data-region="unified-grader"] .usersuspended,
-  #page-mod-forum-view [data-region="unified-grader"] .usersuspended a, .usersuspended #page-mod-forum-view [data-region="unified-grader"] a,
-  #page-mod-forum-view [data-region="unified-grader"] .dimmed_category,
-  #page-mod-forum-view [data-region="unified-grader"] .dimmed_category a, .dimmed_category #page-mod-forum-view [data-region="unified-grader"] a, #page-mod-forum-view [data-region="unified-grader"] .tag_feed .media .muted a, .tag_feed .media .muted #page-mod-forum-view [data-region="unified-grader"] a, #page-mod-forum-view [data-region="unified-grader"] #page-admin-qtypes .disabled, #page-admin-qtypes #page-mod-forum-view [data-region="unified-grader"] .disabled,
-  #page-mod-forum-view [data-region="unified-grader"] #page-admin-qbehaviours .disabled, #page-admin-qbehaviours #page-mod-forum-view [data-region="unified-grader"] .disabled, #page-mod-forum-view [data-region="unified-grader"] #page-admin-plugins #plugins-control-panel .pluginname .componentname, #page-admin-plugins #plugins-control-panel .pluginname #page-mod-forum-view [data-region="unified-grader"] .componentname, #page-mod-forum-view [data-region="unified-grader"] #page-admin-plugins #plugins-control-panel .version .versionnumber, #page-admin-plugins #plugins-control-panel .version #page-mod-forum-view [data-region="unified-grader"] .versionnumber, #page-mod-forum-view [data-region="unified-grader"] #page-admin-plugins #plugins-control-panel .notes .requiredby, #page-admin-plugins #plugins-control-panel .notes #page-mod-forum-view [data-region="unified-grader"] .requiredby, #page-mod-forum-view [data-region="unified-grader"] #plugins-check-page .page-description, #plugins-check-page #page-mod-forum-view [data-region="unified-grader"] .page-description, #page-mod-forum-view [data-region="unified-grader"] #plugins-check-page #plugins-check .requires-ok, #plugins-check-page #plugins-check #page-mod-forum-view [data-region="unified-grader"] .requires-ok, #page-mod-forum-view [data-region="unified-grader"] #plugins-check-page #plugins-check .displayname .plugindir, #plugins-check-page #plugins-check .displayname #page-mod-forum-view [data-region="unified-grader"] .plugindir, #page-mod-forum-view [data-region="unified-grader"] #plugins-check-page #plugins-check-available-dependencies .displayname .component, #plugins-check-page #plugins-check-available-dependencies .displayname #page-mod-forum-view [data-region="unified-grader"] .component, #page-mod-forum-view [data-region="unified-grader"] #page-admin-search .adminpagepath li, #page-admin-search .adminpagepath #page-mod-forum-view [data-region="unified-grader"] li, #page-mod-forum-view [data-region="unified-grader"] .block .minicalendar td.weekend, .block .minicalendar #page-mod-forum-view [data-region="unified-grader"] td.weekend, #page-mod-forum-view [data-region="unified-grader"] .section .activity .stealth, .section .activity #page-mod-forum-view [data-region="unified-grader"] .stealth, #page-mod-forum-view [data-region="unified-grader"] .course-content .section-summary .section-summary-activities .activity-count, .course-content .section-summary .section-summary-activities #page-mod-forum-view [data-region="unified-grader"] .activity-count, #page-mod-forum-view [data-region="unified-grader"] .course-content ul li.section.hidden .sectionname > span, .course-content ul li.section.hidden #page-mod-forum-view [data-region="unified-grader"] .sectionname > span,
-  #page-mod-forum-view [data-region="unified-grader"] .course-content ul li.section.hidden .content > div.summary, .course-content ul li.section.hidden #page-mod-forum-view [data-region="unified-grader"] .content > div.summary,
-  #page-mod-forum-view [data-region="unified-grader"] .course-content ul li.section.hidden .activity .activityinstance, .course-content ul li.section.hidden .activity #page-mod-forum-view [data-region="unified-grader"] .activityinstance, #page-mod-forum-view [data-region="unified-grader"] #course-category-listings .listitem[data-visible="0"], #course-category-listings #page-mod-forum-view [data-region="unified-grader"] .listitem[data-visible="0"], #page-mod-forum-view [data-region="unified-grader"] #course-category-listings .listitem[data-visible="0"] > div > a, #course-category-listings #page-mod-forum-view [data-region="unified-grader"] .listitem[data-visible="0"] > div > a, #page-mod-forum-view [data-region="unified-grader"] #course-category-listings .listing-pagination-totals.dimmed, #course-category-listings #page-mod-forum-view [data-region="unified-grader"] .listing-pagination-totals.dimmed, #page-mod-forum-view [data-region="unified-grader"] .fitem.disabled .fp-btn-choose, .fitem.disabled #page-mod-forum-view [data-region="unified-grader"] .fp-btn-choose, #page-mod-forum-view [data-region="unified-grader"] .form-defaultinfo,
-  #page-mod-forum-view [data-region="unified-grader"] .form-label .form-shortname, .form-label #page-mod-forum-view [data-region="unified-grader"] .form-shortname, #page-mod-forum-view [data-region="unified-grader"] .formsettingheading .form-horizontal, .formsettingheading #page-mod-forum-view [data-region="unified-grader"] .form-horizontal, #page-mod-forum-view [data-region="unified-grader"] .no-felement.fstatic, #page-mod-forum-view [data-region="unified-grader"] .path-backup .backup_progress .backup_stage, .path-backup .backup_progress #page-mod-forum-view [data-region="unified-grader"] .backup_stage,
-  #page-mod-forum-view [data-region="unified-grader"] .dimmed_text,
+  .path-mod-forum .nested-v2-display-mode .text-muted, .path-mod-forum .nested-v2-display-mode a.dimmed,
+  .path-mod-forum .nested-v2-display-mode .dimmed_text,
+  .path-mod-forum .nested-v2-display-mode .dimmed_text a, .dimmed_text .path-mod-forum .nested-v2-display-mode a,
+  .path-mod-forum .nested-v2-display-mode .usersuspended,
+  .path-mod-forum .nested-v2-display-mode .usersuspended a, .usersuspended .path-mod-forum .nested-v2-display-mode a,
+  .path-mod-forum .nested-v2-display-mode .dimmed_category,
+  .path-mod-forum .nested-v2-display-mode .dimmed_category a, .dimmed_category .path-mod-forum .nested-v2-display-mode a, .path-mod-forum .nested-v2-display-mode .tag_feed .media .muted a, .tag_feed .media .muted .path-mod-forum .nested-v2-display-mode a, .path-mod-forum .nested-v2-display-mode #page-admin-qtypes .disabled, #page-admin-qtypes .path-mod-forum .nested-v2-display-mode .disabled,
+  .path-mod-forum .nested-v2-display-mode #page-admin-qbehaviours .disabled, #page-admin-qbehaviours .path-mod-forum .nested-v2-display-mode .disabled, .path-mod-forum .nested-v2-display-mode #page-admin-plugins #plugins-control-panel .pluginname .componentname, #page-admin-plugins #plugins-control-panel .pluginname .path-mod-forum .nested-v2-display-mode .componentname, .path-mod-forum .nested-v2-display-mode #page-admin-plugins #plugins-control-panel .version .versionnumber, #page-admin-plugins #plugins-control-panel .version .path-mod-forum .nested-v2-display-mode .versionnumber, .path-mod-forum .nested-v2-display-mode #page-admin-plugins #plugins-control-panel .notes .requiredby, #page-admin-plugins #plugins-control-panel .notes .path-mod-forum .nested-v2-display-mode .requiredby, .path-mod-forum .nested-v2-display-mode #plugins-check-page .page-description, #plugins-check-page .path-mod-forum .nested-v2-display-mode .page-description, .path-mod-forum .nested-v2-display-mode #plugins-check-page #plugins-check .requires-ok, #plugins-check-page #plugins-check .path-mod-forum .nested-v2-display-mode .requires-ok, .path-mod-forum .nested-v2-display-mode #plugins-check-page #plugins-check .displayname .plugindir, #plugins-check-page #plugins-check .displayname .path-mod-forum .nested-v2-display-mode .plugindir, .path-mod-forum .nested-v2-display-mode #plugins-check-page #plugins-check-available-dependencies .displayname .component, #plugins-check-page #plugins-check-available-dependencies .displayname .path-mod-forum .nested-v2-display-mode .component, .path-mod-forum .nested-v2-display-mode #page-admin-search .adminpagepath li, #page-admin-search .adminpagepath .path-mod-forum .nested-v2-display-mode li, .path-mod-forum .nested-v2-display-mode .block .minicalendar td.weekend, .block .minicalendar .path-mod-forum .nested-v2-display-mode td.weekend, .path-mod-forum .nested-v2-display-mode .section .activity .stealth, .section .activity .path-mod-forum .nested-v2-display-mode .stealth, .path-mod-forum .nested-v2-display-mode .course-content .section-summary .section-summary-activities .activity-count, .course-content .section-summary .section-summary-activities .path-mod-forum .nested-v2-display-mode .activity-count, .path-mod-forum .nested-v2-display-mode .course-content ul li.section.hidden .sectionname > span, .course-content ul li.section.hidden .path-mod-forum .nested-v2-display-mode .sectionname > span,
+  .path-mod-forum .nested-v2-display-mode .course-content ul li.section.hidden .content > div.summary, .course-content ul li.section.hidden .path-mod-forum .nested-v2-display-mode .content > div.summary,
+  .path-mod-forum .nested-v2-display-mode .course-content ul li.section.hidden .activity .activityinstance, .course-content ul li.section.hidden .activity .path-mod-forum .nested-v2-display-mode .activityinstance, .path-mod-forum .nested-v2-display-mode #course-category-listings .listitem[data-visible="0"], #course-category-listings .path-mod-forum .nested-v2-display-mode .listitem[data-visible="0"], .path-mod-forum .nested-v2-display-mode #course-category-listings .listitem[data-visible="0"] > div > a, #course-category-listings .path-mod-forum .nested-v2-display-mode .listitem[data-visible="0"] > div > a, .path-mod-forum .nested-v2-display-mode #course-category-listings .listing-pagination-totals.dimmed, #course-category-listings .path-mod-forum .nested-v2-display-mode .listing-pagination-totals.dimmed, .path-mod-forum .nested-v2-display-mode .fitem.disabled .fp-btn-choose, .fitem.disabled .path-mod-forum .nested-v2-display-mode .fp-btn-choose, .path-mod-forum .nested-v2-display-mode .form-defaultinfo,
+  .path-mod-forum .nested-v2-display-mode .form-label .form-shortname, .form-label .path-mod-forum .nested-v2-display-mode .form-shortname, .path-mod-forum .nested-v2-display-mode .formsettingheading .form-horizontal, .formsettingheading .path-mod-forum .nested-v2-display-mode .form-horizontal, .path-mod-forum .nested-v2-display-mode .no-felement.fstatic, .path-mod-forum .nested-v2-display-mode .path-backup .backup_progress .backup_stage, .path-backup .backup_progress .path-mod-forum .nested-v2-display-mode .backup_stage,
+  .path-mod-forum .nested-v2-display-mode .dimmed_text,
   .path-mod-forum.nested-v2-display-mode .text-muted,
   .path-mod-forum.nested-v2-display-mode a.dimmed,
   .path-mod-forum.nested-v2-display-mode .dimmed_text,
@@ -16469,48 +16470,48 @@ select {
   .path-mod-forum.nested-v2-display-mode .dimmed_text {
     color: #707070 !important;
     /* stylelint-disable-line declaration-no-important */ }
-  #page-mod-forum-view [data-region="unified-grader"] .author-header,
+  .path-mod-forum .nested-v2-display-mode .author-header,
   .path-mod-forum.nested-v2-display-mode .author-header {
     font-style: italic; }
-    #page-mod-forum-view [data-region="unified-grader"] .author-header .author-name,
+    .path-mod-forum .nested-v2-display-mode .author-header .author-name,
     .path-mod-forum.nested-v2-display-mode .author-header .author-name {
       font-style: normal; }
-  #page-mod-forum-view [data-region="unified-grader"] :target > .focus-target,
+  .path-mod-forum .nested-v2-display-mode :target > .focus-target,
   .path-mod-forum.nested-v2-display-mode :target > .focus-target {
     animation-name: background-highlight;
     animation-duration: 1s;
     animation-timing-function: ease-in-out;
     animation-iteration-count: 1; }
-  #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .replies-container .forum-post-container,
+  .path-mod-forum .nested-v2-display-mode .forum-post-container .replies-container .forum-post-container,
   .path-mod-forum.nested-v2-display-mode .forum-post-container .replies-container .forum-post-container {
     border-top: 1px solid #dee2e6;
     padding-top: 1.5rem; }
-    #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .replies-container .forum-post-container .replies-container .forum-post-container,
+    .path-mod-forum .nested-v2-display-mode .forum-post-container .replies-container .forum-post-container .replies-container .forum-post-container,
     .path-mod-forum.nested-v2-display-mode .forum-post-container .replies-container .forum-post-container .replies-container .forum-post-container {
       border-top: none;
       padding-top: 0; }
-  #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .replies-container .inline-reply-container .reply-author,
+  .path-mod-forum .nested-v2-display-mode .forum-post-container .replies-container .inline-reply-container .reply-author,
   .path-mod-forum.nested-v2-display-mode .forum-post-container .replies-container .inline-reply-container .reply-author {
     display: none; }
-  #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .post-message p:last-of-type,
+  .path-mod-forum .nested-v2-display-mode .forum-post-container .post-message p:last-of-type,
   .path-mod-forum.nested-v2-display-mode .forum-post-container .post-message p:last-of-type {
     margin-bottom: 0; }
-  #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .author-image-container,
+  .path-mod-forum .nested-v2-display-mode .forum-post-container .author-image-container,
   .path-mod-forum.nested-v2-display-mode .forum-post-container .author-image-container {
     width: 70px;
     margin-right: 24px;
     flex-shrink: 0; }
-  #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .inline-reply-container textarea,
+  .path-mod-forum .nested-v2-display-mode .forum-post-container .inline-reply-container textarea,
   .path-mod-forum.nested-v2-display-mode .forum-post-container .inline-reply-container textarea {
     border: 0;
     resize: none; }
-  #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .indent,
+  .path-mod-forum .nested-v2-display-mode .forum-post-container .indent,
   .path-mod-forum.nested-v2-display-mode .forum-post-container .indent {
     /**
              * The first post and first set of replies have a larger author image so offset the 2nd
              * set of replies by the image width + margin to ensure they align.
              */ }
-    #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .indent .indent,
+    .path-mod-forum .nested-v2-display-mode .forum-post-container .indent .indent,
     .path-mod-forum.nested-v2-display-mode .forum-post-container .indent .indent {
       padding-left: 94px;
       /**
@@ -16519,18 +16520,18 @@ select {
       /**
                  * Adjust the indentation offset for all 3rd level replies and below for the smaller author image.
                  */ }
-      #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .indent .indent .author-image-container,
+      .path-mod-forum .nested-v2-display-mode .forum-post-container .indent .indent .author-image-container,
       .path-mod-forum.nested-v2-display-mode .forum-post-container .indent .indent .author-image-container {
         width: 30px;
         margin-right: 8px;
         padding-top: 3px; }
-      #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .indent .indent .indent,
+      .path-mod-forum .nested-v2-display-mode .forum-post-container .indent .indent .indent,
       .path-mod-forum.nested-v2-display-mode .forum-post-container .indent .indent .indent {
         padding-left: 38px;
         /**
                      * Stop indenting the replies after the 5th reply.
                      */ }
-        #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .indent .indent .indent .indent .indent .indent,
+        .path-mod-forum .nested-v2-display-mode .forum-post-container .indent .indent .indent .indent .indent .indent,
         .path-mod-forum.nested-v2-display-mode .forum-post-container .indent .indent .indent .indent .indent .indent {
           padding-left: 0; }
 
@@ -16558,6 +16559,315 @@ select {
   .filter-dates-popover .mform {
     margin-left: -3em; }
 
+/* stylelint-disable-line max-line-length */
+@keyframes expandSearchButton {
+  from {
+    height: 36px;
+    width: 36px;
+    border-radius: 18px;
+    background-color: #e9ecef; }
+  to {
+    width: 100%;
+    height: calc(1.5em + 1rem + 2px);
+    border-radius: 0;
+    background-color: #fff;
+    border-color: #ced4da;
+    padding-left: calc(0.5rem + 8px);
+    padding-top: 0.5rem;
+    padding-bottom: 0.5rem;
+    font-size: 1.171875rem;
+    line-height: 1.5;
+    right: 0; } }
+
+@keyframes collapseSearchButton {
+  from {
+    width: 100%;
+    height: calc(1.5em + 1rem + 2px);
+    border-radius: 0;
+    background-color: #fff;
+    border-color: #ced4da;
+    padding-left: calc(0.5rem + 8px);
+    padding-top: 0.5rem;
+    padding-bottom: 0.5rem;
+    font-size: 1.171875rem;
+    line-height: 1.5;
+    right: 0; }
+  to {
+    height: 36px;
+    width: 36px;
+    border-radius: 18px;
+    background-color: #e9ecef; } }
+
+.path-mod-forum .unified-grader .navbar {
+  max-height: none;
+  z-index: 1; }
+
+.path-mod-forum .unified-grader .body-container.hidden {
+  display: none !important;
+  /* stylelint-disable-line declaration-no-important */ }
+
+.path-mod-forum .unified-grader .userpicture {
+  height: 60px;
+  width: 60px; }
+
+.path-mod-forum .unified-grader .grader-grading-panel {
+  position: absolute;
+  top: 0;
+  height: 100%;
+  z-index: 0;
+  width: 430px; }
+  .path-mod-forum .unified-grader .grader-grading-panel.hidden {
+    right: -430px; }
+  .path-mod-forum .unified-grader .grader-grading-panel .grading-icon {
+    width: 36px; }
+  .path-mod-forum .unified-grader .grader-grading-panel .user-picker-container .user-full-name {
+    max-width: 240px; }
+  .path-mod-forum .unified-grader .grader-grading-panel .user-picker-container .page-link {
+    width: 36px;
+    height: 36px;
+    display: flex;
+    text-align: center;
+    align-items: center;
+    justify-content: center; }
+  .path-mod-forum .unified-grader .grader-grading-panel .header-container {
+    height: 65px;
+    position: relative;
+    overflow: hidden; }
+    .path-mod-forum .unified-grader .grader-grading-panel .header-container .info-container {
+      position: absolute;
+      top: 50%;
+      left: 0;
+      transform: translateY(-50%);
+      width: 100%;
+      height: 100%;
+      padding: 0.5rem;
+      padding-right: calc(36px + 0.5rem);
+      opacity: 1;
+      visibility: visible;
+      transition: left 0.3s ease-in-out;
+      z-index: 1; }
+    .path-mod-forum .unified-grader .grader-grading-panel .header-container .toggle-search-button.expand {
+      animation-name: expandSearchButton;
+      animation-duration: 0.3s;
+      animation-timing-function: ease-in-out; }
+    .path-mod-forum .unified-grader .grader-grading-panel .header-container .toggle-search-button.collapse {
+      display: block;
+      animation-name: collapseSearchButton;
+      animation-duration: 0.3s; }
+    .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container {
+      overflow: hidden;
+      position: absolute;
+      top: 50%;
+      right: 0;
+      transform: translateY(-50%);
+      z-index: 2;
+      width: 100%;
+      height: 100% !important;
+      /* stylelint-disable-line declaration-no-important */
+      padding: 0.5rem; }
+      .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container .search-input-container {
+        position: relative;
+        overflow: visible;
+        flex-wrap: nowrap; }
+        .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container .search-input-container input {
+          padding-left: calc(0.5rem + 0.5rem + 34px);
+          padding-right: calc(0.5rem + 36px);
+          opacity: 1;
+          visibility: visible;
+          transition: opacity 0s linear 0.3s, visibility 0s linear; }
+        .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container .search-input-container .search-icon {
+          position: absolute;
+          top: 50%;
+          left: 0.5rem;
+          transform: translateY(-50%);
+          color: #495057;
+          height: 36px;
+          width: 34px;
+          background-color: #fff;
+          opacity: 1;
+          visibility: visible;
+          transition: opacity 0s linear 0.3s, visibility 0s linear 0.3s; }
+        .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container .search-input-container .toggle-search-button {
+          position: absolute;
+          top: 50%;
+          right: 0.5rem;
+          transform: translateY(-50%);
+          z-index: 1;
+          color: inherit;
+          text-align: left;
+          padding-left: 9px;
+          transition: right 0s linear 0.3s; }
+          .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container .search-input-container .toggle-search-button .expanded-icon {
+            opacity: 1;
+            visibility: visible;
+            max-width: 50px;
+            max-height: 50px;
+            transition: opacity 0s linear 0.3s, max-height 0s linear 0.3s, max-width 0s linear 0.3s, visibility 0s linear 0.3s; }
+          .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container .search-input-container .toggle-search-button .collapsed-icon {
+            opacity: 0;
+            visibility: hidden;
+            max-height: 0;
+            max-width: 0;
+            overflow: hidden;
+            transition: opacity 0s linear 0.3s, max-height 0s linear 0.3s, max-width 0s linear 0.3s, visibility 0s linear 0.3s; }
+      .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container.collapsed {
+        width: calc(36px + 0.5rem + 0.5rem);
+        transition: width 0.3s ease-in-out; }
+        .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container.collapsed .search-input-container {
+          flex-wrap: nowrap; }
+          .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container.collapsed .search-input-container input,
+          .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container.collapsed .search-input-container .search-icon {
+            opacity: 0;
+            visibility: hidden;
+            transition: opacity 0s linear, visibility 0s linear; }
+          .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container.collapsed .search-input-container input {
+            padding-left: 0;
+            padding-right: 0; }
+          .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container.collapsed .search-input-container .toggle-search-button .expanded-icon {
+            opacity: 0;
+            visibility: hidden;
+            max-height: 0;
+            max-width: 0;
+            overflow: hidden;
+            transition: opacity 0s linear, max-height 0s linear, max-width 0s linear, visibility 0s linear; }
+          .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container.collapsed .search-input-container .toggle-search-button .collapsed-icon {
+            opacity: 1;
+            visibility: visible;
+            max-width: 50px;
+            max-height: 50px;
+            transition: opacity 0s linear, max-height 0s linear, max-width 0s linear, visibility 0s linear; }
+    .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container:not(.collapsed) + .info-container {
+      opacity: 0;
+      visibility: hidden;
+      left: calc(100% * -1);
+      transition: left 0.3s ease-in-out, opacity 0s linear 0.3s, visibility 0s linear 0.3s, padding 0s linear 0.3s; }
+
+.path-mod-forum .unified-grader .grader-module-content {
+  overflow-y: auto;
+  margin-right: 430px;
+  transition: margin-right 0.2s ease-in-out; }
+  @media (prefers-reduced-motion: reduce) {
+    .path-mod-forum .unified-grader .grader-module-content {
+      transition: none; } }
+
+.path-mod-forum .unified-grader .grader-grading-panel.hidden + .grader-module-content {
+  margin-right: 0; }
+
+.path-mod-forum .unified-grader .drawer-button {
+  position: relative; }
+  .path-mod-forum .unified-grader .drawer-button.active::after {
+    content: "";
+    position: absolute;
+    bottom: calc(-0.5rem - 1px);
+    left: 0;
+    width: 100%;
+    height: 3px;
+    background-color: #1177d1; }
+  .path-mod-forum .unified-grader .drawer-button .icon {
+    font-size: 20px;
+    height: 20px;
+    width: 20px; }
+
+.path-mod-forum .unified-grader .grader-module-content-display .discussion-container:last-of-type > hr {
+  display: none; }
+
+.path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container:last-of-type > hr {
+  display: none; }
+
+.path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container {
+  position: relative; }
+  .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .show-content-button {
+    position: absolute;
+    height: 100%;
+    width: 100%;
+    left: 0;
+    top: 0;
+    padding-left: calc(1rem + 45px);
+    text-align: left;
+    z-index: 1; }
+    .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .show-content-button:not(.collapsed) {
+      display: none; }
+  .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .content {
+    display: block;
+    height: auto !important;
+    /* stylelint-disable-line declaration-no-important */ }
+    .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .content .header {
+      transition: margin-bottom 0.3s ease-in-out; }
+      .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .content .header div + div {
+        opacity: 1;
+        visibility: visible;
+        max-height: none;
+        transition: opacity 0.3s linear, visibility 0s linear; }
+    .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .content .body-content-container {
+      opacity: 1;
+      visibility: visible;
+      max-height: none;
+      transition: opacity 0.3s linear, visibility 0s linear; }
+    .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .content .forum-post-core {
+      opacity: 1;
+      visibility: visible;
+      max-height: none;
+      transition: opacity 0.3s linear, visibility 0s linear; }
+  .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .show-content-button.collapsed + .content {
+    opacity: .3; }
+    .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .show-content-button.collapsed + .content .header {
+      margin-bottom: 0 !important;
+      /* stylelint-disable-line declaration-no-important */ }
+      .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .show-content-button.collapsed + .content .header div + div {
+        opacity: 0;
+        visibility: hidden;
+        max-height: 0; }
+    .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .show-content-button.collapsed + .content .body-content-container {
+      opacity: 0;
+      visibility: hidden;
+      max-height: 0; }
+    .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .show-content-button.collapsed + .content .forum-post-core {
+      opacity: 0;
+      visibility: hidden;
+      max-height: 0; }
+  .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .show-content-button.collapsed:hover + .content,
+  .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .show-content-button.collapsed:focus + .content {
+    opacity: 1; }
+
+.path-mod-forum .unified-grader .grader-module-content-display .no-post-container .icon {
+  height: 250px;
+  width: 250px;
+  margin-right: 0; }
+
+.path-mod-forum .unified-grader .grader-module-content-display .nested-v2-display-mode .discussion-container .posts-container .parent-container .show-content-button {
+  padding-left: 94px; }
+
+.path-mod-forum .unified-grader .no-search-results-container .icon {
+  height: 250px;
+  width: 250px;
+  margin-right: 0; }
+
+.path-mod-forum .unified-grader .nested-v2-display-mode .view-context-button {
+  margin-left: 94px;
+  border-radius: 0.3rem; }
+
+.path-mod-forum .unified-grader .nested-v2-display-mode .parent-container .author-image-container {
+  position: relative; }
+  .path-mod-forum .unified-grader .nested-v2-display-mode .parent-container .author-image-container:after {
+    position: absolute;
+    top: calc(70px + 0.5rem);
+    content: "";
+    background-color: #e9ecef;
+    width: 2px;
+    height: calc(100% - 70px + 0.5rem); }
+
+.path-mod-forum .unified-grader .nested-v2-display-mode .parent-container + .post-container .author-image-container img {
+  width: 30px !important;
+  /* stylelint-disable-line declaration-no-important */ }
+
+.path-mod-forum .unified-grader .nested-v2-display-mode .post-subject,
+.path-mod-forum .modal .nested-v2-display-mode .post-subject {
+  display: none; }
+
+@media (max-width: 575.98px) {
+  .path-mod-forum .unified-grader .grader-grading-panel {
+    width: 100%; } }
+
 .maincalendar .calendarmonth td,
 .maincalendar .calendarmonth th {
   border: 1px dotted #dee2e6; }
@@ -17398,29 +17708,20 @@ p.arrow_button {
     margin-left: 5px;
     margin-right: 12px; }
 
-.criterion button.collapse[aria-expanded="true"]:before {
-  content: "";
-  margin-right: 0;
-  display: inline-block;
-  font: normal normal normal 14px/1 FontAwesome;
-  font-size: inherit;
-  text-rendering: auto;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  font-size: 16px;
-  width: 16px; }
+.criterion .description {
+  font-size: 1rem; }
 
-.criterion button.collapse[aria-expanded="false"]:before {
-  content: "";
-  margin-right: 0;
-  display: inline-block;
-  font: normal normal normal 14px/1 FontAwesome;
-  font-size: inherit;
-  text-rendering: auto;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  font-size: 16px;
-  width: 16px; }
+.criterion .criterion-toggle .expanded-icon {
+  display: block; }
+
+.criterion .criterion-toggle .collapsed-icon {
+  display: none; }
+
+.criterion .criterion-toggle.collapsed .expanded-icon {
+  display: none; }
+
+.criterion .criterion-toggle.collapsed .collapsed-icon {
+  display: block; }
 
 .path-grade-edit-tree .setup-grades h4 {
   margin: 0; }
@@ -18302,17 +18603,19 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
     transform: translate(-50%, -50%); }
 
 .layout.fullscreen {
-  height: 100%;
+  height: 100vh;
   position: fixed;
   top: 0;
   left: 0;
   z-index: 1040;
-  overflow-x: hidden;
   transition: 0.5s;
-  width: 100%;
+  width: 100vw;
   margin: 0;
   opacity: 1;
   background-color: #fff; }
+  .layout.fullscreen > div {
+    height: 100%;
+    width: 100%; }
   .layout.fullscreen .loading-icon {
     margin-left: auto;
     margin-right: auto;
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 3aa16b5ce69..a39cc29f05a 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -2308,16 +2308,16 @@
 .fa-meetup:before {
   content: ""; }
 
-.sr-only, #page-mod-forum-view [data-region="unified-grader"] .alert.discussionlocked, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.releasenoteslink,
-#page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminwarning, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminwarning,
-#page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminerror, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminerror, #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.formulation, .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.formulation,
-#page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.outcome, .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.outcome,
-#page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.comment, .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.comment, #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.label,
+.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink,
+.path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning,
+.path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation,
+.path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome,
+.path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label,
 .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink,
 .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning,
 .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation,
 .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome,
-.path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, #page-mod-forum-view [data-region="unified-grader"] .tag_list > b,
+.path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b,
 .path-mod-forum.nested-v2-display-mode .tag_list > b {
   position: absolute;
   width: 1px;
@@ -7975,16 +7975,16 @@ button.bg-dark:focus {
     top: 0;
     z-index: 1020; } }
 
-.sr-only, #page-mod-forum-view [data-region="unified-grader"] .alert.discussionlocked, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.releasenoteslink,
-#page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminwarning, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminwarning,
-#page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminerror, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminerror, #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.formulation, .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.formulation,
-#page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.outcome, .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.outcome,
-#page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.comment, .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.comment, #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.label,
+.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink,
+.path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning,
+.path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation,
+.path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome,
+.path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label,
 .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink,
 .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning,
 .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation,
 .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome,
-.path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, #page-mod-forum-view [data-region="unified-grader"] .tag_list > b,
+.path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b,
 .path-mod-forum.nested-v2-display-mode .tag_list > b {
   position: absolute;
   width: 1px;
@@ -15370,27 +15370,27 @@ body.path-question-type {
     font: inherit;
     position: static;
     padding-right: .3em; }
-  body.path-question-type .form-group .sr-only, body.path-question-type .form-buttons .sr-only, body.path-question-type .path-admin .buttons .sr-only, .path-admin body.path-question-type .buttons .sr-only, body.path-question-type .fp-content-center form + div .sr-only, .fp-content-center body.path-question-type form + div .sr-only, body.path-question-type div.backup-section + form .sr-only, body.path-question-type .form-group #page-mod-forum-view [data-region="unified-grader"] .alert.discussionlocked, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-buttons #page-mod-forum-view [data-region="unified-grader"] .alert.discussionlocked, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-buttons .alert.discussionlocked, body.path-question-type .path-admin .buttons #page-mod-forum-view [data-region="unified-grader"] .alert.discussionlocked, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .path-admin .buttons .alert.discussionlocked, .path-admin body.path-question-type .buttons #page-mod-forum-view [data-region="unified-grader"] .alert.discussionlocked, #page-mod-forum-view [data-region="unified-grader"] .path-admin body.path-question-type .buttons .alert.discussionlocked, body.path-question-type .fp-content-center form + div #page-mod-forum-view [data-region="unified-grader"] .alert.discussionlocked, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .fp-content-center form + div .alert.discussionlocked, .fp-content-center body.path-question-type form + div #page-mod-forum-view [data-region="unified-grader"] .alert.discussionlocked, #page-mod-forum-view [data-region="unified-grader"] .fp-content-center body.path-question-type form + div .alert.discussionlocked, body.path-question-type div.backup-section + form #page-mod-forum-view [data-region="unified-grader"] .alert.discussionlocked, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type div.backup-section + form .alert.discussionlocked, body.path-question-type .form-group #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.releasenoteslink, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .form-group .discussionlocked.releasenoteslink, body.path-question-type .form-buttons #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.releasenoteslink, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .form-buttons .discussionlocked.releasenoteslink, body.path-question-type .path-admin .buttons #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.releasenoteslink, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.releasenoteslink, .path-admin body.path-question-type .buttons #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.releasenoteslink, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.releasenoteslink, body.path-question-type .fp-content-center form + div #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.releasenoteslink, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.releasenoteslink, .fp-content-center body.path-question-type form + div #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.releasenoteslink, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.releasenoteslink, body.path-question-type div.backup-section + form #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.releasenoteslink, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.releasenoteslink, body.path-question-type .form-group #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.releasenoteslink, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-group .discussionlocked.releasenoteslink, body.path-question-type .form-buttons #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.releasenoteslink, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-buttons .discussionlocked.releasenoteslink, body.path-question-type .path-admin .buttons #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.releasenoteslink, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .path-admin .buttons .discussionlocked.releasenoteslink, .path-admin body.path-question-type .buttons #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.releasenoteslink, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .path-admin body.path-question-type .buttons .discussionlocked.releasenoteslink, body.path-question-type .fp-content-center form + div #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.releasenoteslink, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .fp-content-center form + div .discussionlocked.releasenoteslink, .fp-content-center body.path-question-type form + div #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.releasenoteslink, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .fp-content-center body.path-question-type form + div .discussionlocked.releasenoteslink, body.path-question-type div.backup-section + form #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.releasenoteslink, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type div.backup-section + form .discussionlocked.releasenoteslink,
-  body.path-question-type .form-group #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminwarning, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .form-group .discussionlocked.adminwarning,
-  body.path-question-type .form-buttons #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminwarning, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .form-buttons .discussionlocked.adminwarning,
-  body.path-question-type .path-admin .buttons #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminwarning, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.adminwarning, .path-admin body.path-question-type .buttons #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminwarning, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.adminwarning,
-  body.path-question-type .fp-content-center form + div #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminwarning, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.adminwarning, .fp-content-center body.path-question-type form + div #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminwarning, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.adminwarning,
-  body.path-question-type div.backup-section + form #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminwarning, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.adminwarning, body.path-question-type .form-group #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminwarning, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-group .discussionlocked.adminwarning, body.path-question-type .form-buttons #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminwarning, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-buttons .discussionlocked.adminwarning, body.path-question-type .path-admin .buttons #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminwarning, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .path-admin .buttons .discussionlocked.adminwarning, .path-admin body.path-question-type .buttons #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminwarning, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .path-admin body.path-question-type .buttons .discussionlocked.adminwarning, body.path-question-type .fp-content-center form + div #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminwarning, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .fp-content-center form + div .discussionlocked.adminwarning, .fp-content-center body.path-question-type form + div #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminwarning, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .fp-content-center body.path-question-type form + div .discussionlocked.adminwarning, body.path-question-type div.backup-section + form #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminwarning, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type div.backup-section + form .discussionlocked.adminwarning,
-  body.path-question-type .form-group #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminerror, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .form-group .discussionlocked.adminerror,
-  body.path-question-type .form-buttons #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminerror, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .form-buttons .discussionlocked.adminerror,
-  body.path-question-type .path-admin .buttons #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminerror, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.adminerror, .path-admin body.path-question-type .buttons #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminerror, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.adminerror,
-  body.path-question-type .fp-content-center form + div #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminerror, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.adminerror, .fp-content-center body.path-question-type form + div #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminerror, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.adminerror,
-  body.path-question-type div.backup-section + form #page-mod-forum-view [data-region="unified-grader"] #page-admin-index .discussionlocked.adminerror, #page-mod-forum-view [data-region="unified-grader"] #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.adminerror, body.path-question-type .form-group #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminerror, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-group .discussionlocked.adminerror, body.path-question-type .form-buttons #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminerror, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-buttons .discussionlocked.adminerror, body.path-question-type .path-admin .buttons #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminerror, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .path-admin .buttons .discussionlocked.adminerror, .path-admin body.path-question-type .buttons #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminerror, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .path-admin body.path-question-type .buttons .discussionlocked.adminerror, body.path-question-type .fp-content-center form + div #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminerror, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .fp-content-center form + div .discussionlocked.adminerror, .fp-content-center body.path-question-type form + div #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminerror, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .fp-content-center body.path-question-type form + div .discussionlocked.adminerror, body.path-question-type div.backup-section + form #page-admin-index #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.adminerror, #page-admin-index #page-mod-forum-view [data-region="unified-grader"] body.path-question-type div.backup-section + form .discussionlocked.adminerror, body.path-question-type .form-group #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.formulation, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.formulation, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.formulation, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.formulation, #page-mod-forum-view [data-region="unified-grader"] .que .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.formulation, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.formulation, #page-mod-forum-view [data-region="unified-grader"] .que .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.formulation, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.formulation, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.formulation, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.formulation, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.formulation, .que #page-mod-forum-view [data-region="unified-grader"] .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.formulation, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.formulation, .que #page-mod-forum-view [data-region="unified-grader"] .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.formulation, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type div.backup-section + form .discussionlocked.formulation,
-  body.path-question-type .form-group #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.outcome, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .form-group .discussionlocked.outcome,
-  body.path-question-type .form-buttons #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.outcome, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .form-buttons .discussionlocked.outcome,
-  body.path-question-type .path-admin .buttons #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.outcome, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.outcome, #page-mod-forum-view [data-region="unified-grader"] .que .path-admin body.path-question-type .buttons .discussionlocked.outcome,
-  body.path-question-type .fp-content-center form + div #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.outcome, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .fp-content-center form + div .discussionlocked.outcome, .fp-content-center body.path-question-type form + div #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.outcome, #page-mod-forum-view [data-region="unified-grader"] .que .fp-content-center body.path-question-type form + div .discussionlocked.outcome,
-  body.path-question-type div.backup-section + form #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.outcome, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type div.backup-section + form .discussionlocked.outcome, body.path-question-type .form-group .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.outcome, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-buttons .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.outcome, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-buttons .discussionlocked.outcome, body.path-question-type .path-admin .buttons .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.outcome, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.outcome, .que #page-mod-forum-view [data-region="unified-grader"] .path-admin body.path-question-type .buttons .discussionlocked.outcome, body.path-question-type .fp-content-center form + div .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.outcome, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .fp-content-center form + div .discussionlocked.outcome, .fp-content-center body.path-question-type form + div .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.outcome, .que #page-mod-forum-view [data-region="unified-grader"] .fp-content-center body.path-question-type form + div .discussionlocked.outcome, body.path-question-type div.backup-section + form .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.outcome, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type div.backup-section + form .discussionlocked.outcome,
-  body.path-question-type .form-group #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.comment, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .form-group .discussionlocked.comment,
-  body.path-question-type .form-buttons #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.comment, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .form-buttons .discussionlocked.comment,
-  body.path-question-type .path-admin .buttons #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.comment, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.comment, #page-mod-forum-view [data-region="unified-grader"] .que .path-admin body.path-question-type .buttons .discussionlocked.comment,
-  body.path-question-type .fp-content-center form + div #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.comment, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.comment, #page-mod-forum-view [data-region="unified-grader"] .que .fp-content-center body.path-question-type form + div .discussionlocked.comment,
-  body.path-question-type div.backup-section + form #page-mod-forum-view [data-region="unified-grader"] .que .discussionlocked.comment, #page-mod-forum-view [data-region="unified-grader"] .que body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.comment, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-buttons .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.comment, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-buttons .discussionlocked.comment, body.path-question-type .path-admin .buttons .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.comment, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.comment, .que #page-mod-forum-view [data-region="unified-grader"] .path-admin body.path-question-type .buttons .discussionlocked.comment, body.path-question-type .fp-content-center form + div .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.comment, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.comment, .que #page-mod-forum-view [data-region="unified-grader"] .fp-content-center body.path-question-type form + div .discussionlocked.comment, body.path-question-type div.backup-section + form .que #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.comment, .que #page-mod-forum-view [data-region="unified-grader"] body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .discussionlocked.label, #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .discussionlocked.label, #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .discussionlocked.label, #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .discussionlocked.label, #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .discussionlocked.label, #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .discussionlocked.label, #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget .discussionlocked.label, #page-mod-forum-view [data-region="unified-grader"] .assignfeedback_editpdf_widget body.path-question-type div.backup-section + form .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.label, .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.label, .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.label, .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.label, .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.label, .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.label, .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] .discussionlocked.label, .assignfeedback_editpdf_widget #page-mod-forum-view [data-region="unified-grader"] body.path-question-type div.backup-section + form .discussionlocked.label,
+  body.path-question-type .form-group .sr-only, body.path-question-type .form-buttons .sr-only, body.path-question-type .path-admin .buttons .sr-only, .path-admin body.path-question-type .buttons .sr-only, body.path-question-type .fp-content-center form + div .sr-only, .fp-content-center body.path-question-type form + div .sr-only, body.path-question-type div.backup-section + form .sr-only, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .alert.discussionlocked, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .alert.discussionlocked, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .alert.discussionlocked, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .alert.discussionlocked, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .alert.discussionlocked, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-group .discussionlocked.releasenoteslink, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-buttons .discussionlocked.releasenoteslink, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.releasenoteslink, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.releasenoteslink, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.releasenoteslink, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.releasenoteslink, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.releasenoteslink, body.path-question-type .form-group #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.releasenoteslink, body.path-question-type .form-buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.releasenoteslink, body.path-question-type .path-admin .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.releasenoteslink, .path-admin body.path-question-type .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.releasenoteslink, body.path-question-type .fp-content-center form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.releasenoteslink, .fp-content-center body.path-question-type form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.releasenoteslink, body.path-question-type div.backup-section + form #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.releasenoteslink,
+  body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-group .discussionlocked.adminwarning,
+  body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-buttons .discussionlocked.adminwarning,
+  body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.adminwarning, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.adminwarning,
+  body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.adminwarning, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.adminwarning,
+  body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.adminwarning, body.path-question-type .form-group #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.adminwarning, body.path-question-type .form-buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.adminwarning, body.path-question-type .path-admin .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.adminwarning, .path-admin body.path-question-type .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.adminwarning, body.path-question-type .fp-content-center form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.adminwarning, .fp-content-center body.path-question-type form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.adminwarning, body.path-question-type div.backup-section + form #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.adminwarning,
+  body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-group .discussionlocked.adminerror,
+  body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-buttons .discussionlocked.adminerror,
+  body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.adminerror, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.adminerror,
+  body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.adminerror, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.adminerror,
+  body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.adminerror, body.path-question-type .form-group #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.adminerror, body.path-question-type .form-buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.adminerror, body.path-question-type .path-admin .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.adminerror, .path-admin body.path-question-type .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.adminerror, body.path-question-type .fp-content-center form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.adminerror, .fp-content-center body.path-question-type form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.adminerror, body.path-question-type div.backup-section + form #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.adminerror, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.formulation,
+  body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.outcome,
+  body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.outcome,
+  body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.outcome,
+  body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.outcome, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.outcome,
+  body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.outcome, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.outcome, body.path-question-type .path-admin .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.outcome, body.path-question-type .fp-content-center form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.outcome, .fp-content-center body.path-question-type form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.outcome, body.path-question-type div.backup-section + form .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.outcome,
+  body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.comment,
+  body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.comment,
+  body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.comment,
+  body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.comment,
+  body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.comment, body.path-question-type .path-admin .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.comment, body.path-question-type .fp-content-center form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.comment, body.path-question-type div.backup-section + form .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type div.backup-section + form .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.label,
   body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked,
   body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .alert.discussionlocked,
   body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .alert.discussionlocked, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .alert.discussionlocked,
@@ -15415,7 +15415,7 @@ body.path-question-type {
   body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.comment,
   body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.comment,
   body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.comment,
-  body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.comment, body.path-question-type .path-admin .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.comment, body.path-question-type .fp-content-center form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.comment, body.path-question-type div.backup-section + form .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type div.backup-section + form .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.label, body.path-question-type .form-group #page-mod-forum-view [data-region="unified-grader"] .tag_list > b, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-group .tag_list > b, body.path-question-type .form-buttons #page-mod-forum-view [data-region="unified-grader"] .tag_list > b, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .form-buttons .tag_list > b, body.path-question-type .path-admin .buttons #page-mod-forum-view [data-region="unified-grader"] .tag_list > b, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .path-admin .buttons .tag_list > b, .path-admin body.path-question-type .buttons #page-mod-forum-view [data-region="unified-grader"] .tag_list > b, #page-mod-forum-view [data-region="unified-grader"] .path-admin body.path-question-type .buttons .tag_list > b, body.path-question-type .fp-content-center form + div #page-mod-forum-view [data-region="unified-grader"] .tag_list > b, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type .fp-content-center form + div .tag_list > b, .fp-content-center body.path-question-type form + div #page-mod-forum-view [data-region="unified-grader"] .tag_list > b, #page-mod-forum-view [data-region="unified-grader"] .fp-content-center body.path-question-type form + div .tag_list > b, body.path-question-type div.backup-section + form #page-mod-forum-view [data-region="unified-grader"] .tag_list > b, #page-mod-forum-view [data-region="unified-grader"] body.path-question-type div.backup-section + form .tag_list > b,
+  body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.comment, body.path-question-type .path-admin .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.comment, body.path-question-type .fp-content-center form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.comment, body.path-question-type div.backup-section + form .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type div.backup-section + form .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.label, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .tag_list > b, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .tag_list > b, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .tag_list > b, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .tag_list > b, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .tag_list > b, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .tag_list > b, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .tag_list > b,
   body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .tag_list > b,
   body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .tag_list > b,
   body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .tag_list > b, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .tag_list > b,
@@ -16326,7 +16326,8 @@ select[size="1"] {
   overflow: visible; }
 
 textarea[data-auto-rows] {
-  overflow-x: hidden; }
+  overflow-x: hidden;
+  resize: none; }
 
 /** Display elements under labels in vertical forms regardless of the screen size. */
 .mform.full-width-labels .fitem.row {
@@ -16601,41 +16602,41 @@ select {
   to {
     background-color: inherit; } }
 
-#page-mod-forum-view [data-region="unified-grader"],
+.path-mod-forum .nested-v2-display-mode,
 .path-mod-forum.nested-v2-display-mode {
   /** Reset the badge styling back to pill style. */
   /** Style the ratings like a badge. */
   /** Don't show the discussion locked alert in this mode because it's already indicated with a badge. */
   /** Fix muted text contrast ratios for accessibility. */
   /** Make the tag list text screen reader visible only */ }
-  #page-mod-forum-view [data-region="unified-grader"] .discussionsubscription,
+  .path-mod-forum .nested-v2-display-mode .discussionsubscription,
   .path-mod-forum.nested-v2-display-mode .discussionsubscription {
     margin-top: 0;
     text-align: inherit;
     margin-bottom: 0; }
-  #page-mod-forum-view [data-region="unified-grader"] .preload-subscribe,
-  #page-mod-forum-view [data-region="unified-grader"] .preload-unsubscribe,
+  .path-mod-forum .nested-v2-display-mode .preload-subscribe,
+  .path-mod-forum .nested-v2-display-mode .preload-unsubscribe,
   .path-mod-forum.nested-v2-display-mode .preload-subscribe,
   .path-mod-forum.nested-v2-display-mode .preload-unsubscribe {
     display: none; }
-  #page-mod-forum-view [data-region="unified-grader"] .post-message,
+  .path-mod-forum .nested-v2-display-mode .post-message,
   .path-mod-forum.nested-v2-display-mode .post-message {
     line-height: 1.6; }
-  #page-mod-forum-view [data-region="unified-grader"] .indent,
+  .path-mod-forum .nested-v2-display-mode .indent,
   .path-mod-forum.nested-v2-display-mode .indent {
     margin-left: 0; }
-  #page-mod-forum-view [data-region="unified-grader"] .badge,
+  .path-mod-forum .nested-v2-display-mode .badge,
   .path-mod-forum.nested-v2-display-mode .badge {
     font-size: inherit;
     font-weight: inherit;
     padding-left: .5rem;
     padding-right: .5rem;
     border-radius: 10rem; }
-  #page-mod-forum-view [data-region="unified-grader"] .badge-light,
+  .path-mod-forum .nested-v2-display-mode .badge-light,
   .path-mod-forum.nested-v2-display-mode .badge-light {
     background-color: #f6f6f6;
     color: #5b5b5b; }
-  #page-mod-forum-view [data-region="unified-grader"] .rating-aggregate-container,
+  .path-mod-forum .nested-v2-display-mode .rating-aggregate-container,
   .path-mod-forum.nested-v2-display-mode .rating-aggregate-container {
     background-color: #f6f6f6;
     color: #5b5b5b;
@@ -16645,35 +16646,35 @@ select {
     vertical-align: middle;
     border-radius: 10rem;
     text-align: center; }
-  #page-mod-forum-view [data-region="unified-grader"] .ratinginput,
+  .path-mod-forum .nested-v2-display-mode .ratinginput,
   .path-mod-forum.nested-v2-display-mode .ratinginput {
     padding: .25em 1.75rem 0.25em .75em;
     line-height: 1;
     height: auto;
     border-radius: 10rem; }
     @media (max-width: 767.98px) {
-      #page-mod-forum-view [data-region="unified-grader"] .ratinginput,
+      .path-mod-forum .nested-v2-display-mode .ratinginput,
       .path-mod-forum.nested-v2-display-mode .ratinginput {
         margin-top: .5rem; } }
-  #page-mod-forum-view [data-region="unified-grader"] .group-image,
+  .path-mod-forum .nested-v2-display-mode .group-image,
   .path-mod-forum.nested-v2-display-mode .group-image {
     width: 35px;
     height: 35px;
     margin-right: 0;
     float: none;
     display: inline-block; }
-  #page-mod-forum-view [data-region="unified-grader"] .text-muted, #page-mod-forum-view [data-region="unified-grader"] a.dimmed,
-  #page-mod-forum-view [data-region="unified-grader"] .dimmed_text,
-  #page-mod-forum-view [data-region="unified-grader"] .dimmed_text a, .dimmed_text #page-mod-forum-view [data-region="unified-grader"] a,
-  #page-mod-forum-view [data-region="unified-grader"] .usersuspended,
-  #page-mod-forum-view [data-region="unified-grader"] .usersuspended a, .usersuspended #page-mod-forum-view [data-region="unified-grader"] a,
-  #page-mod-forum-view [data-region="unified-grader"] .dimmed_category,
-  #page-mod-forum-view [data-region="unified-grader"] .dimmed_category a, .dimmed_category #page-mod-forum-view [data-region="unified-grader"] a, #page-mod-forum-view [data-region="unified-grader"] .tag_feed .media .muted a, .tag_feed .media .muted #page-mod-forum-view [data-region="unified-grader"] a, #page-mod-forum-view [data-region="unified-grader"] #page-admin-qtypes .disabled, #page-admin-qtypes #page-mod-forum-view [data-region="unified-grader"] .disabled,
-  #page-mod-forum-view [data-region="unified-grader"] #page-admin-qbehaviours .disabled, #page-admin-qbehaviours #page-mod-forum-view [data-region="unified-grader"] .disabled, #page-mod-forum-view [data-region="unified-grader"] #page-admin-plugins #plugins-control-panel .pluginname .componentname, #page-admin-plugins #plugins-control-panel .pluginname #page-mod-forum-view [data-region="unified-grader"] .componentname, #page-mod-forum-view [data-region="unified-grader"] #page-admin-plugins #plugins-control-panel .version .versionnumber, #page-admin-plugins #plugins-control-panel .version #page-mod-forum-view [data-region="unified-grader"] .versionnumber, #page-mod-forum-view [data-region="unified-grader"] #page-admin-plugins #plugins-control-panel .notes .requiredby, #page-admin-plugins #plugins-control-panel .notes #page-mod-forum-view [data-region="unified-grader"] .requiredby, #page-mod-forum-view [data-region="unified-grader"] #plugins-check-page .page-description, #plugins-check-page #page-mod-forum-view [data-region="unified-grader"] .page-description, #page-mod-forum-view [data-region="unified-grader"] #plugins-check-page #plugins-check .requires-ok, #plugins-check-page #plugins-check #page-mod-forum-view [data-region="unified-grader"] .requires-ok, #page-mod-forum-view [data-region="unified-grader"] #plugins-check-page #plugins-check .displayname .plugindir, #plugins-check-page #plugins-check .displayname #page-mod-forum-view [data-region="unified-grader"] .plugindir, #page-mod-forum-view [data-region="unified-grader"] #plugins-check-page #plugins-check-available-dependencies .displayname .component, #plugins-check-page #plugins-check-available-dependencies .displayname #page-mod-forum-view [data-region="unified-grader"] .component, #page-mod-forum-view [data-region="unified-grader"] #page-admin-search .adminpagepath li, #page-admin-search .adminpagepath #page-mod-forum-view [data-region="unified-grader"] li, #page-mod-forum-view [data-region="unified-grader"] .block .minicalendar td.weekend, .block .minicalendar #page-mod-forum-view [data-region="unified-grader"] td.weekend, #page-mod-forum-view [data-region="unified-grader"] .section .activity .stealth, .section .activity #page-mod-forum-view [data-region="unified-grader"] .stealth, #page-mod-forum-view [data-region="unified-grader"] .course-content .section-summary .section-summary-activities .activity-count, .course-content .section-summary .section-summary-activities #page-mod-forum-view [data-region="unified-grader"] .activity-count, #page-mod-forum-view [data-region="unified-grader"] .course-content ul li.section.hidden .sectionname > span, .course-content ul li.section.hidden #page-mod-forum-view [data-region="unified-grader"] .sectionname > span,
-  #page-mod-forum-view [data-region="unified-grader"] .course-content ul li.section.hidden .content > div.summary, .course-content ul li.section.hidden #page-mod-forum-view [data-region="unified-grader"] .content > div.summary,
-  #page-mod-forum-view [data-region="unified-grader"] .course-content ul li.section.hidden .activity .activityinstance, .course-content ul li.section.hidden .activity #page-mod-forum-view [data-region="unified-grader"] .activityinstance, #page-mod-forum-view [data-region="unified-grader"] #course-category-listings .listitem[data-visible="0"], #course-category-listings #page-mod-forum-view [data-region="unified-grader"] .listitem[data-visible="0"], #page-mod-forum-view [data-region="unified-grader"] #course-category-listings .listitem[data-visible="0"] > div > a, #course-category-listings #page-mod-forum-view [data-region="unified-grader"] .listitem[data-visible="0"] > div > a, #page-mod-forum-view [data-region="unified-grader"] #course-category-listings .listing-pagination-totals.dimmed, #course-category-listings #page-mod-forum-view [data-region="unified-grader"] .listing-pagination-totals.dimmed, #page-mod-forum-view [data-region="unified-grader"] .fitem.disabled .fp-btn-choose, .fitem.disabled #page-mod-forum-view [data-region="unified-grader"] .fp-btn-choose, #page-mod-forum-view [data-region="unified-grader"] .form-defaultinfo,
-  #page-mod-forum-view [data-region="unified-grader"] .form-label .form-shortname, .form-label #page-mod-forum-view [data-region="unified-grader"] .form-shortname, #page-mod-forum-view [data-region="unified-grader"] .formsettingheading .form-horizontal, .formsettingheading #page-mod-forum-view [data-region="unified-grader"] .form-horizontal, #page-mod-forum-view [data-region="unified-grader"] .no-felement.fstatic, #page-mod-forum-view [data-region="unified-grader"] .path-backup .backup_progress .backup_stage, .path-backup .backup_progress #page-mod-forum-view [data-region="unified-grader"] .backup_stage,
-  #page-mod-forum-view [data-region="unified-grader"] .dimmed_text,
+  .path-mod-forum .nested-v2-display-mode .text-muted, .path-mod-forum .nested-v2-display-mode a.dimmed,
+  .path-mod-forum .nested-v2-display-mode .dimmed_text,
+  .path-mod-forum .nested-v2-display-mode .dimmed_text a, .dimmed_text .path-mod-forum .nested-v2-display-mode a,
+  .path-mod-forum .nested-v2-display-mode .usersuspended,
+  .path-mod-forum .nested-v2-display-mode .usersuspended a, .usersuspended .path-mod-forum .nested-v2-display-mode a,
+  .path-mod-forum .nested-v2-display-mode .dimmed_category,
+  .path-mod-forum .nested-v2-display-mode .dimmed_category a, .dimmed_category .path-mod-forum .nested-v2-display-mode a, .path-mod-forum .nested-v2-display-mode .tag_feed .media .muted a, .tag_feed .media .muted .path-mod-forum .nested-v2-display-mode a, .path-mod-forum .nested-v2-display-mode #page-admin-qtypes .disabled, #page-admin-qtypes .path-mod-forum .nested-v2-display-mode .disabled,
+  .path-mod-forum .nested-v2-display-mode #page-admin-qbehaviours .disabled, #page-admin-qbehaviours .path-mod-forum .nested-v2-display-mode .disabled, .path-mod-forum .nested-v2-display-mode #page-admin-plugins #plugins-control-panel .pluginname .componentname, #page-admin-plugins #plugins-control-panel .pluginname .path-mod-forum .nested-v2-display-mode .componentname, .path-mod-forum .nested-v2-display-mode #page-admin-plugins #plugins-control-panel .version .versionnumber, #page-admin-plugins #plugins-control-panel .version .path-mod-forum .nested-v2-display-mode .versionnumber, .path-mod-forum .nested-v2-display-mode #page-admin-plugins #plugins-control-panel .notes .requiredby, #page-admin-plugins #plugins-control-panel .notes .path-mod-forum .nested-v2-display-mode .requiredby, .path-mod-forum .nested-v2-display-mode #plugins-check-page .page-description, #plugins-check-page .path-mod-forum .nested-v2-display-mode .page-description, .path-mod-forum .nested-v2-display-mode #plugins-check-page #plugins-check .requires-ok, #plugins-check-page #plugins-check .path-mod-forum .nested-v2-display-mode .requires-ok, .path-mod-forum .nested-v2-display-mode #plugins-check-page #plugins-check .displayname .plugindir, #plugins-check-page #plugins-check .displayname .path-mod-forum .nested-v2-display-mode .plugindir, .path-mod-forum .nested-v2-display-mode #plugins-check-page #plugins-check-available-dependencies .displayname .component, #plugins-check-page #plugins-check-available-dependencies .displayname .path-mod-forum .nested-v2-display-mode .component, .path-mod-forum .nested-v2-display-mode #page-admin-search .adminpagepath li, #page-admin-search .adminpagepath .path-mod-forum .nested-v2-display-mode li, .path-mod-forum .nested-v2-display-mode .block .minicalendar td.weekend, .block .minicalendar .path-mod-forum .nested-v2-display-mode td.weekend, .path-mod-forum .nested-v2-display-mode .section .activity .stealth, .section .activity .path-mod-forum .nested-v2-display-mode .stealth, .path-mod-forum .nested-v2-display-mode .course-content .section-summary .section-summary-activities .activity-count, .course-content .section-summary .section-summary-activities .path-mod-forum .nested-v2-display-mode .activity-count, .path-mod-forum .nested-v2-display-mode .course-content ul li.section.hidden .sectionname > span, .course-content ul li.section.hidden .path-mod-forum .nested-v2-display-mode .sectionname > span,
+  .path-mod-forum .nested-v2-display-mode .course-content ul li.section.hidden .content > div.summary, .course-content ul li.section.hidden .path-mod-forum .nested-v2-display-mode .content > div.summary,
+  .path-mod-forum .nested-v2-display-mode .course-content ul li.section.hidden .activity .activityinstance, .course-content ul li.section.hidden .activity .path-mod-forum .nested-v2-display-mode .activityinstance, .path-mod-forum .nested-v2-display-mode #course-category-listings .listitem[data-visible="0"], #course-category-listings .path-mod-forum .nested-v2-display-mode .listitem[data-visible="0"], .path-mod-forum .nested-v2-display-mode #course-category-listings .listitem[data-visible="0"] > div > a, #course-category-listings .path-mod-forum .nested-v2-display-mode .listitem[data-visible="0"] > div > a, .path-mod-forum .nested-v2-display-mode #course-category-listings .listing-pagination-totals.dimmed, #course-category-listings .path-mod-forum .nested-v2-display-mode .listing-pagination-totals.dimmed, .path-mod-forum .nested-v2-display-mode .fitem.disabled .fp-btn-choose, .fitem.disabled .path-mod-forum .nested-v2-display-mode .fp-btn-choose, .path-mod-forum .nested-v2-display-mode .form-defaultinfo,
+  .path-mod-forum .nested-v2-display-mode .form-label .form-shortname, .form-label .path-mod-forum .nested-v2-display-mode .form-shortname, .path-mod-forum .nested-v2-display-mode .formsettingheading .form-horizontal, .formsettingheading .path-mod-forum .nested-v2-display-mode .form-horizontal, .path-mod-forum .nested-v2-display-mode .no-felement.fstatic, .path-mod-forum .nested-v2-display-mode .path-backup .backup_progress .backup_stage, .path-backup .backup_progress .path-mod-forum .nested-v2-display-mode .backup_stage,
+  .path-mod-forum .nested-v2-display-mode .dimmed_text,
   .path-mod-forum.nested-v2-display-mode .text-muted,
   .path-mod-forum.nested-v2-display-mode a.dimmed,
   .path-mod-forum.nested-v2-display-mode .dimmed_text,
@@ -16738,48 +16739,48 @@ select {
   .path-mod-forum.nested-v2-display-mode .dimmed_text {
     color: #707070 !important;
     /* stylelint-disable-line declaration-no-important */ }
-  #page-mod-forum-view [data-region="unified-grader"] .author-header,
+  .path-mod-forum .nested-v2-display-mode .author-header,
   .path-mod-forum.nested-v2-display-mode .author-header {
     font-style: italic; }
-    #page-mod-forum-view [data-region="unified-grader"] .author-header .author-name,
+    .path-mod-forum .nested-v2-display-mode .author-header .author-name,
     .path-mod-forum.nested-v2-display-mode .author-header .author-name {
       font-style: normal; }
-  #page-mod-forum-view [data-region="unified-grader"] :target > .focus-target,
+  .path-mod-forum .nested-v2-display-mode :target > .focus-target,
   .path-mod-forum.nested-v2-display-mode :target > .focus-target {
     animation-name: background-highlight;
     animation-duration: 1s;
     animation-timing-function: ease-in-out;
     animation-iteration-count: 1; }
-  #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .replies-container .forum-post-container,
+  .path-mod-forum .nested-v2-display-mode .forum-post-container .replies-container .forum-post-container,
   .path-mod-forum.nested-v2-display-mode .forum-post-container .replies-container .forum-post-container {
     border-top: 1px solid #dee2e6;
     padding-top: 1.5rem; }
-    #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .replies-container .forum-post-container .replies-container .forum-post-container,
+    .path-mod-forum .nested-v2-display-mode .forum-post-container .replies-container .forum-post-container .replies-container .forum-post-container,
     .path-mod-forum.nested-v2-display-mode .forum-post-container .replies-container .forum-post-container .replies-container .forum-post-container {
       border-top: none;
       padding-top: 0; }
-  #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .replies-container .inline-reply-container .reply-author,
+  .path-mod-forum .nested-v2-display-mode .forum-post-container .replies-container .inline-reply-container .reply-author,
   .path-mod-forum.nested-v2-display-mode .forum-post-container .replies-container .inline-reply-container .reply-author {
     display: none; }
-  #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .post-message p:last-of-type,
+  .path-mod-forum .nested-v2-display-mode .forum-post-container .post-message p:last-of-type,
   .path-mod-forum.nested-v2-display-mode .forum-post-container .post-message p:last-of-type {
     margin-bottom: 0; }
-  #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .author-image-container,
+  .path-mod-forum .nested-v2-display-mode .forum-post-container .author-image-container,
   .path-mod-forum.nested-v2-display-mode .forum-post-container .author-image-container {
     width: 70px;
     margin-right: 24px;
     flex-shrink: 0; }
-  #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .inline-reply-container textarea,
+  .path-mod-forum .nested-v2-display-mode .forum-post-container .inline-reply-container textarea,
   .path-mod-forum.nested-v2-display-mode .forum-post-container .inline-reply-container textarea {
     border: 0;
     resize: none; }
-  #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .indent,
+  .path-mod-forum .nested-v2-display-mode .forum-post-container .indent,
   .path-mod-forum.nested-v2-display-mode .forum-post-container .indent {
     /**
              * The first post and first set of replies have a larger author image so offset the 2nd
              * set of replies by the image width + margin to ensure they align.
              */ }
-    #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .indent .indent,
+    .path-mod-forum .nested-v2-display-mode .forum-post-container .indent .indent,
     .path-mod-forum.nested-v2-display-mode .forum-post-container .indent .indent {
       padding-left: 94px;
       /**
@@ -16788,18 +16789,18 @@ select {
       /**
                  * Adjust the indentation offset for all 3rd level replies and below for the smaller author image.
                  */ }
-      #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .indent .indent .author-image-container,
+      .path-mod-forum .nested-v2-display-mode .forum-post-container .indent .indent .author-image-container,
       .path-mod-forum.nested-v2-display-mode .forum-post-container .indent .indent .author-image-container {
         width: 30px;
         margin-right: 8px;
         padding-top: 3px; }
-      #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .indent .indent .indent,
+      .path-mod-forum .nested-v2-display-mode .forum-post-container .indent .indent .indent,
       .path-mod-forum.nested-v2-display-mode .forum-post-container .indent .indent .indent {
         padding-left: 38px;
         /**
                      * Stop indenting the replies after the 5th reply.
                      */ }
-        #page-mod-forum-view [data-region="unified-grader"] .forum-post-container .indent .indent .indent .indent .indent .indent,
+        .path-mod-forum .nested-v2-display-mode .forum-post-container .indent .indent .indent .indent .indent .indent,
         .path-mod-forum.nested-v2-display-mode .forum-post-container .indent .indent .indent .indent .indent .indent {
           padding-left: 0; }
 
@@ -16827,6 +16828,315 @@ select {
   .filter-dates-popover .mform {
     margin-left: -3em; }
 
+/* stylelint-disable-line max-line-length */
+@keyframes expandSearchButton {
+  from {
+    height: 36px;
+    width: 36px;
+    border-radius: 18px;
+    background-color: #e9ecef; }
+  to {
+    width: 100%;
+    height: calc(1.5em + 1rem + 2px);
+    border-radius: 0;
+    background-color: #fff;
+    border-color: #ced4da;
+    padding-left: calc(0.5rem + 8px);
+    padding-top: 0.5rem;
+    padding-bottom: 0.5rem;
+    font-size: 1.171875rem;
+    line-height: 1.5;
+    right: 0; } }
+
+@keyframes collapseSearchButton {
+  from {
+    width: 100%;
+    height: calc(1.5em + 1rem + 2px);
+    border-radius: 0;
+    background-color: #fff;
+    border-color: #ced4da;
+    padding-left: calc(0.5rem + 8px);
+    padding-top: 0.5rem;
+    padding-bottom: 0.5rem;
+    font-size: 1.171875rem;
+    line-height: 1.5;
+    right: 0; }
+  to {
+    height: 36px;
+    width: 36px;
+    border-radius: 18px;
+    background-color: #e9ecef; } }
+
+.path-mod-forum .unified-grader .navbar {
+  max-height: none;
+  z-index: 1; }
+
+.path-mod-forum .unified-grader .body-container.hidden {
+  display: none !important;
+  /* stylelint-disable-line declaration-no-important */ }
+
+.path-mod-forum .unified-grader .userpicture {
+  height: 60px;
+  width: 60px; }
+
+.path-mod-forum .unified-grader .grader-grading-panel {
+  position: absolute;
+  top: 0;
+  height: 100%;
+  z-index: 0;
+  width: 430px; }
+  .path-mod-forum .unified-grader .grader-grading-panel.hidden {
+    right: -430px; }
+  .path-mod-forum .unified-grader .grader-grading-panel .grading-icon {
+    width: 36px; }
+  .path-mod-forum .unified-grader .grader-grading-panel .user-picker-container .user-full-name {
+    max-width: 240px; }
+  .path-mod-forum .unified-grader .grader-grading-panel .user-picker-container .page-link {
+    width: 36px;
+    height: 36px;
+    display: flex;
+    text-align: center;
+    align-items: center;
+    justify-content: center; }
+  .path-mod-forum .unified-grader .grader-grading-panel .header-container {
+    height: 65px;
+    position: relative;
+    overflow: hidden; }
+    .path-mod-forum .unified-grader .grader-grading-panel .header-container .info-container {
+      position: absolute;
+      top: 50%;
+      left: 0;
+      transform: translateY(-50%);
+      width: 100%;
+      height: 100%;
+      padding: 0.5rem;
+      padding-right: calc(36px + 0.5rem);
+      opacity: 1;
+      visibility: visible;
+      transition: left 0.3s ease-in-out;
+      z-index: 1; }
+    .path-mod-forum .unified-grader .grader-grading-panel .header-container .toggle-search-button.expand {
+      animation-name: expandSearchButton;
+      animation-duration: 0.3s;
+      animation-timing-function: ease-in-out; }
+    .path-mod-forum .unified-grader .grader-grading-panel .header-container .toggle-search-button.collapse {
+      display: block;
+      animation-name: collapseSearchButton;
+      animation-duration: 0.3s; }
+    .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container {
+      overflow: hidden;
+      position: absolute;
+      top: 50%;
+      right: 0;
+      transform: translateY(-50%);
+      z-index: 2;
+      width: 100%;
+      height: 100% !important;
+      /* stylelint-disable-line declaration-no-important */
+      padding: 0.5rem; }
+      .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container .search-input-container {
+        position: relative;
+        overflow: visible;
+        flex-wrap: nowrap; }
+        .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container .search-input-container input {
+          padding-left: calc(0.5rem + 0.5rem + 34px);
+          padding-right: calc(0.5rem + 36px);
+          opacity: 1;
+          visibility: visible;
+          transition: opacity 0s linear 0.3s, visibility 0s linear; }
+        .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container .search-input-container .search-icon {
+          position: absolute;
+          top: 50%;
+          left: 0.5rem;
+          transform: translateY(-50%);
+          color: #495057;
+          height: 36px;
+          width: 34px;
+          background-color: #fff;
+          opacity: 1;
+          visibility: visible;
+          transition: opacity 0s linear 0.3s, visibility 0s linear 0.3s; }
+        .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container .search-input-container .toggle-search-button {
+          position: absolute;
+          top: 50%;
+          right: 0.5rem;
+          transform: translateY(-50%);
+          z-index: 1;
+          color: inherit;
+          text-align: left;
+          padding-left: 9px;
+          transition: right 0s linear 0.3s; }
+          .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container .search-input-container .toggle-search-button .expanded-icon {
+            opacity: 1;
+            visibility: visible;
+            max-width: 50px;
+            max-height: 50px;
+            transition: opacity 0s linear 0.3s, max-height 0s linear 0.3s, max-width 0s linear 0.3s, visibility 0s linear 0.3s; }
+          .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container .search-input-container .toggle-search-button .collapsed-icon {
+            opacity: 0;
+            visibility: hidden;
+            max-height: 0;
+            max-width: 0;
+            overflow: hidden;
+            transition: opacity 0s linear 0.3s, max-height 0s linear 0.3s, max-width 0s linear 0.3s, visibility 0s linear 0.3s; }
+      .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container.collapsed {
+        width: calc(36px + 0.5rem + 0.5rem);
+        transition: width 0.3s ease-in-out; }
+        .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container.collapsed .search-input-container {
+          flex-wrap: nowrap; }
+          .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container.collapsed .search-input-container input,
+          .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container.collapsed .search-input-container .search-icon {
+            opacity: 0;
+            visibility: hidden;
+            transition: opacity 0s linear, visibility 0s linear; }
+          .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container.collapsed .search-input-container input {
+            padding-left: 0;
+            padding-right: 0; }
+          .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container.collapsed .search-input-container .toggle-search-button .expanded-icon {
+            opacity: 0;
+            visibility: hidden;
+            max-height: 0;
+            max-width: 0;
+            overflow: hidden;
+            transition: opacity 0s linear, max-height 0s linear, max-width 0s linear, visibility 0s linear; }
+          .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container.collapsed .search-input-container .toggle-search-button .collapsed-icon {
+            opacity: 1;
+            visibility: visible;
+            max-width: 50px;
+            max-height: 50px;
+            transition: opacity 0s linear, max-height 0s linear, max-width 0s linear, visibility 0s linear; }
+    .path-mod-forum .unified-grader .grader-grading-panel .header-container .user-search-container:not(.collapsed) + .info-container {
+      opacity: 0;
+      visibility: hidden;
+      left: calc(100% * -1);
+      transition: left 0.3s ease-in-out, opacity 0s linear 0.3s, visibility 0s linear 0.3s, padding 0s linear 0.3s; }
+
+.path-mod-forum .unified-grader .grader-module-content {
+  overflow-y: auto;
+  margin-right: 430px;
+  transition: margin-right 0.2s ease-in-out; }
+  @media (prefers-reduced-motion: reduce) {
+    .path-mod-forum .unified-grader .grader-module-content {
+      transition: none; } }
+
+.path-mod-forum .unified-grader .grader-grading-panel.hidden + .grader-module-content {
+  margin-right: 0; }
+
+.path-mod-forum .unified-grader .drawer-button {
+  position: relative; }
+  .path-mod-forum .unified-grader .drawer-button.active::after {
+    content: "";
+    position: absolute;
+    bottom: calc(-0.5rem - 1px);
+    left: 0;
+    width: 100%;
+    height: 3px;
+    background-color: #1177d1; }
+  .path-mod-forum .unified-grader .drawer-button .icon {
+    font-size: 20px;
+    height: 20px;
+    width: 20px; }
+
+.path-mod-forum .unified-grader .grader-module-content-display .discussion-container:last-of-type > hr {
+  display: none; }
+
+.path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container:last-of-type > hr {
+  display: none; }
+
+.path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container {
+  position: relative; }
+  .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .show-content-button {
+    position: absolute;
+    height: 100%;
+    width: 100%;
+    left: 0;
+    top: 0;
+    padding-left: calc(1rem + 45px);
+    text-align: left;
+    z-index: 1; }
+    .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .show-content-button:not(.collapsed) {
+      display: none; }
+  .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .content {
+    display: block;
+    height: auto !important;
+    /* stylelint-disable-line declaration-no-important */ }
+    .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .content .header {
+      transition: margin-bottom 0.3s ease-in-out; }
+      .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .content .header div + div {
+        opacity: 1;
+        visibility: visible;
+        max-height: none;
+        transition: opacity 0.3s linear, visibility 0s linear; }
+    .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .content .body-content-container {
+      opacity: 1;
+      visibility: visible;
+      max-height: none;
+      transition: opacity 0.3s linear, visibility 0s linear; }
+    .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .content .forum-post-core {
+      opacity: 1;
+      visibility: visible;
+      max-height: none;
+      transition: opacity 0.3s linear, visibility 0s linear; }
+  .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .show-content-button.collapsed + .content {
+    opacity: .3; }
+    .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .show-content-button.collapsed + .content .header {
+      margin-bottom: 0 !important;
+      /* stylelint-disable-line declaration-no-important */ }
+      .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .show-content-button.collapsed + .content .header div + div {
+        opacity: 0;
+        visibility: hidden;
+        max-height: 0; }
+    .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .show-content-button.collapsed + .content .body-content-container {
+      opacity: 0;
+      visibility: hidden;
+      max-height: 0; }
+    .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .show-content-button.collapsed + .content .forum-post-core {
+      opacity: 0;
+      visibility: hidden;
+      max-height: 0; }
+  .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .show-content-button.collapsed:hover + .content,
+  .path-mod-forum .unified-grader .grader-module-content-display .discussion-container .posts-container .parent-container .show-content-button.collapsed:focus + .content {
+    opacity: 1; }
+
+.path-mod-forum .unified-grader .grader-module-content-display .no-post-container .icon {
+  height: 250px;
+  width: 250px;
+  margin-right: 0; }
+
+.path-mod-forum .unified-grader .grader-module-content-display .nested-v2-display-mode .discussion-container .posts-container .parent-container .show-content-button {
+  padding-left: 94px; }
+
+.path-mod-forum .unified-grader .no-search-results-container .icon {
+  height: 250px;
+  width: 250px;
+  margin-right: 0; }
+
+.path-mod-forum .unified-grader .nested-v2-display-mode .view-context-button {
+  margin-left: 94px;
+  border-radius: 0.3rem; }
+
+.path-mod-forum .unified-grader .nested-v2-display-mode .parent-container .author-image-container {
+  position: relative; }
+  .path-mod-forum .unified-grader .nested-v2-display-mode .parent-container .author-image-container:after {
+    position: absolute;
+    top: calc(70px + 0.5rem);
+    content: "";
+    background-color: #e9ecef;
+    width: 2px;
+    height: calc(100% - 70px + 0.5rem); }
+
+.path-mod-forum .unified-grader .nested-v2-display-mode .parent-container + .post-container .author-image-container img {
+  width: 30px !important;
+  /* stylelint-disable-line declaration-no-important */ }
+
+.path-mod-forum .unified-grader .nested-v2-display-mode .post-subject,
+.path-mod-forum .modal .nested-v2-display-mode .post-subject {
+  display: none; }
+
+@media (max-width: 575.98px) {
+  .path-mod-forum .unified-grader .grader-grading-panel {
+    width: 100%; } }
+
 .maincalendar .calendarmonth td,
 .maincalendar .calendarmonth th {
   border: 1px dotted #dee2e6; }
@@ -17671,29 +17981,20 @@ p.arrow_button {
     margin-left: 5px;
     margin-right: 12px; }
 
-.criterion button.collapse[aria-expanded="true"]:before {
-  content: "";
-  margin-right: 0;
-  display: inline-block;
-  font: normal normal normal 14px/1 FontAwesome;
-  font-size: inherit;
-  text-rendering: auto;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  font-size: 16px;
-  width: 16px; }
+.criterion .description {
+  font-size: 1rem; }
 
-.criterion button.collapse[aria-expanded="false"]:before {
-  content: "";
-  margin-right: 0;
-  display: inline-block;
-  font: normal normal normal 14px/1 FontAwesome;
-  font-size: inherit;
-  text-rendering: auto;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  font-size: 16px;
-  width: 16px; }
+.criterion .criterion-toggle .expanded-icon {
+  display: block; }
+
+.criterion .criterion-toggle .collapsed-icon {
+  display: none; }
+
+.criterion .criterion-toggle.collapsed .expanded-icon {
+  display: none; }
+
+.criterion .criterion-toggle.collapsed .collapsed-icon {
+  display: block; }
 
 .path-grade-edit-tree .setup-grades h4 {
   margin: 0; }
@@ -18519,17 +18820,19 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
     transform: translate(-50%, -50%); }
 
 .layout.fullscreen {
-  height: 100%;
+  height: 100vh;
   position: fixed;
   top: 0;
   left: 0;
   z-index: 1040;
-  overflow-x: hidden;
   transition: 0.5s;
-  width: 100%;
+  width: 100vw;
   margin: 0;
   opacity: 1;
   background-color: #fff; }
+  .layout.fullscreen > div {
+    height: 100%;
+    width: 100%; }
   .layout.fullscreen .loading-icon {
     margin-left: auto;
     margin-right: auto;