Merge branch 'MDL-73464-master' of https://github.com/Chocolate-lightning/moodle

mod/book/templates/main_action_menu.mustache

@@ -42,12 +42,12 @@
     <div class="row">
         {{#previous}}
             <div class="navitem">
-                <a class="btn btn-secondary" href="{{url}}">{{title}}</a>
+                <a class="btn btn-secondary" href="{{url}}#mod_book-chaptersnavigation">{{title}}</a>
             </div>
         {{/previous}}
         {{#next}}
             <div class="navitem ml-auto">
-                <a class="btn btn-secondary" href="{{url}}">{{title}}</a>
+                <a class="btn btn-secondary" href="{{url}}#mod_book-chaptersnavigation">{{title}}</a>
             </div>
         {{/next}}
     </div>

mod/book/view.php

@@ -123,7 +123,7 @@ if (!$chapterid) {
     $renderer = $PAGE->get_renderer('mod_book');
     $actionmenu = new \mod_book\output\main_action_menu($cm->id, $chapters, $chapter, $book);
     $renderedmenu = $renderer->render($actionmenu);
-    echo $renderedmenu;
+    echo html_writer::div($renderedmenu, '', ['id' => 'mod_book-chaptersnavigation']);
 
     // The chapter itself.
     $hidden = $chapter->hidden ? ' dimmed_text' : null;