MDL-72095 theme_boost: max width for activity pages

admin/settings.php

@@ -13,6 +13,7 @@ $PAGE->set_context(context_system::instance());
 $PAGE->set_url('/admin/settings.php', array('section' => $section));
 $PAGE->set_pagetype('admin-setting-' . $section);
 $PAGE->set_pagelayout('admin');
+$PAGE->has_secondary_navigation_setter(false);
 $PAGE->navigation->clear_cache();
 navigation_node::require_admin_tree();
 

blocks/myoverview/tests/behat/block_myoverview_pagelimit_persistence.feature

@@ -43,7 +43,7 @@ Feature: The my overview block allows users to persistence of their page limits
     Then I should see "Course 13"
     And I reload the page
     Then I should see "Course 13"
-    And I should see "All" in the "[data-action='limit-toggle']" "css_element"
+    And I should see "All" in the ".block-myoverview [data-action='limit-toggle']" "css_element"
 
   Scenario: Toggle the page limit between grouping changes
     Given I am on the "My courses" page logged in as "student1"
@@ -52,4 +52,4 @@ Feature: The my overview block allows users to persistence of their page limits
     And I click on "All" "button" in the "Course overview" "block"
     And I click on "In progress" "link" in the "Course overview" "block"
     Then I should see "Course 13"
-    And I should see "All" in the "[data-action='limit-toggle']" "css_element"
+    And I should see "All" in the ".block-myoverview [data-action='limit-toggle']" "css_element"

blocks/myoverview/tests/behat/block_myoverview_pagination.feature

@@ -81,7 +81,7 @@ Feature: My overview block pagination
       | student1 | C12 | student |
       | student1 | C13 | student |
     When I am on the "My courses" page logged in as "student1"
-    Then I should see "12" in the "[data-action='limit-toggle']" "css_element"
+    Then I should see "12" in the ".block_myoverview [data-action='limit-toggle']" "css_element"
     And I log out
 
   Scenario: I should only see pagination limit options less than total number of enrolled courses

contentbank/index.php

@@ -49,6 +49,7 @@ $PAGE->set_url('/contentbank/index.php');
 $PAGE->set_context($context);
 $PAGE->set_title($title);
 $PAGE->set_heading($title);
+$PAGE->add_body_class('limitedwidth');
 $PAGE->set_pagetype('contentbank');
 
 // Get all contents managed by active plugins where the user has permission to render them.

course/edit.php

@@ -234,6 +234,7 @@ if (!empty($course->id)) {
 }
 
 $PAGE->set_title($title);
+$PAGE->add_body_class('limitedwidth');
 $PAGE->set_heading($fullname);
 
 echo $OUTPUT->header();

course/index.php

@@ -60,6 +60,7 @@ if ($categoryid) {
 }
 
 $PAGE->set_pagelayout('coursecategory');
+$PAGE->add_body_class('limitedwidth');
 $courserenderer = $PAGE->get_renderer('core', 'course');
 
 $PAGE->set_heading($heading);

course/modedit.php

@@ -138,6 +138,8 @@ if (!empty($type)) { //TODO: hopefully will be removed in 2.0
 }
 $PAGE->set_pagetype($pagepath);
 $PAGE->set_pagelayout('admin');
+$PAGE->add_body_class('limitedwidth');
+
 
 $modmoodleform = "$CFG->dirroot/mod/$module->name/mod_form.php";
 if (file_exists($modmoodleform)) {

course/view.php

@@ -94,6 +94,7 @@
 
     // Must set layout before gettting section info. See MDL-47555.
     $PAGE->set_pagelayout('course');
+    $PAGE->add_body_class('limitedwidth');
 
     if ($section and $section > 0) {
 

grade/grading/form/guide/tests/behat/edit_guide.feature

@@ -99,7 +99,7 @@ Feature: Marking guides can be created and edited
     And I wait "1" seconds
     Then the field "Guide criterion B criterion remark" matches value "Comment \"4\""
     When I press "Save changes"
-    And I follow "Assignment: Test assignment 1 name"
+    And I am on the "Test assignment 1 name" "assign activity" page
     And I follow "View all submissions"
     # Checking that the user grade is correct.
     Then I should see "80" in the "Student 1" "table_row"

index.php

@@ -39,6 +39,7 @@ if (!empty($CFG->defaulthomepage) && ($CFG->defaulthomepage == HOMEPAGE_MY) && o
 }
 $PAGE->set_url('/', $urlparams);
 $PAGE->set_pagelayout('frontpage');
+$PAGE->add_body_class('limitedwidth');
 $PAGE->set_other_editing_capability('moodle/course:update');
 $PAGE->set_other_editing_capability('moodle/course:manageactivities');
 $PAGE->set_other_editing_capability('moodle/course:activityvisibility');

lib/templates/full_header.mustache

@@ -29,37 +29,34 @@
         "welcomemessage": "welcomemessage"
     }
 }}
-<header id="page-header" class="row">
-    <div class="col-12 py-3">
-        <div class="card border-0">
-            <div class="card-body p-2 navigation-card">
-                <div class="d-flex flex-wrap">
-                    {{#hasnavbar}}
-                    <div id="page-navbar" class="p-1">
-                        {{{navbar}}}
-                    </div>
-                    {{/hasnavbar}}
-                    <div class="ml-auto d-flex">
-                        {{{pageheadingbutton}}}
-                    </div>
-                    <div id="course-header">
-                        {{{courseheader}}}
-                    </div>
-                </div>
-                <div class="d-sm-flex align-items-center">
-                    {{#contextheader}}
-                        <div class="mr-auto">
-                            {{{contextheader}}}
-                        </div>
-                    {{/contextheader}}
-                    <div class="header-actions-container flex-shrink-0" data-region="header-actions-container">
-                        {{#headeractions}}
-                            <div class="header-action ml-2">{{{.}}}</div>
-                        {{/headeractions}}
-                    </div>
-                </div>
+<header id="page-header" class="header-maxwidth">
+    <div class="w-100">
+        <div class="d-flex flex-wrap">
+            {{#hasnavbar}}
+            <div id="page-navbar" class="p-1">
+                {{{navbar}}}
+            </div>
+            {{/hasnavbar}}
+            <div class="ml-auto d-flex">
+                {{{pageheadingbutton}}}
+            </div>
+            <div id="course-header">
+                {{{courseheader}}}
             </div>
         </div>
+        <div class="d-sm-flex align-items-center">
+            {{#contextheader}}
+                <div class="mr-auto">
+                    {{{contextheader}}}
+                </div>
+            {{/contextheader}}
+            <div class="header-actions-container flex-shrink-0" data-region="header-actions-container">
+                {{#headeractions}}
+                    <div class="header-action ml-2">{{{.}}}</div>
+                {{/headeractions}}
+            </div>
+        </div>
+
         {{> core/welcome }}
     </div>
 </header>

mod/assign/locallib.php

@@ -493,6 +493,10 @@ class assign {
             $nextpageparams['id'] = $this->get_course_module()->id;
         }
 
+        if (empty($action)) {
+            $PAGE->add_body_class('limitedwidth');
+        }
+
         // Handle form submissions first.
         if ($action == 'savesubmission') {
             $action = 'editsubmission';
@@ -649,6 +653,7 @@ class assign {
         } else if ($action == 'viewpluginassignsubmission') {
             $o .= $this->view_plugin_content('assignsubmission');
         } else if ($action == 'editsubmission') {
+            $PAGE->add_body_class('limitedwidth');
             $o .= $this->view_edit_submission_page($mform, $notices);
         } else if ($action == 'grader') {
             $o .= $this->view_grader();

mod/assign/tests/behat/quickgrading.feature

@@ -32,7 +32,7 @@ Feature: In an assignment, teachers grade multiple students on one page
     And I follow "View all submissions"
     When I click on "Grade" "link" in the "Student 1" "table_row"
     And I press "Save changes"
-    And I follow "Test assignment name"
+    And I am on the "Test assignment name" "assign activity" page
     Then I should see "1" in the "Needs grading" "table_row"
 
   @skip_chrome_zerosize

mod/assign/tests/behat/rescale_grades.feature

@@ -74,7 +74,7 @@ Feature: Check that the assignment grade can be rescaled when the max grade is c
     Given I follow "View all submissions"
     And I click on "Grade" "link" in the "Student 2" "table_row"
     And I wait until the page is ready
-    And I follow "Assignment: Test assignment name"
+    And I am on the "Test assignment name" "assign activity" page
     And I navigate to "Settings" in current page administration
     And I expand all fieldsets
     And I set the field "Rescale existing grades" to "Yes"

mod/book/edit.php

@@ -42,6 +42,7 @@ require_capability('mod/book:edit', $context);
 
 $PAGE->set_url('/mod/book/edit.php', array('cmid'=>$cmid, 'id'=>$chapterid, 'pagenum'=>$pagenum, 'subchapter'=>$subchapter));
 $PAGE->set_pagelayout('admin'); // TODO: Something. This is a bloody hack!
+$PAGE->add_body_class('limitedwidth');
 
 if ($chapterid) {
     $chapter = $DB->get_record('book_chapters', array('id'=>$chapterid, 'bookid'=>$book->id), '*', MUST_EXIST);

mod/book/view.php

@@ -120,6 +120,7 @@ $strtoc   = get_string('toc', 'mod_book');
 $pagetitle = $book->name . ": " . $chapter->title;
 $PAGE->set_title($pagetitle);
 $PAGE->set_heading($course->fullname);
+$PAGE->add_body_class('limitedwidth');
 
 book_add_fake_block($chapters, $chapter, $book, $cm, $edit);
 

mod/chat/view.php

@@ -83,6 +83,7 @@ $title = $courseshortname . ': ' . format_string($chat->name);
 $PAGE->set_url('/mod/chat/view.php', array('id' => $cm->id));
 $PAGE->set_title($title);
 $PAGE->set_heading($course->fullname);
+$PAGE->add_body_class('limitedwidth');
 
 // Print the page header.
 echo $OUTPUT->header();

mod/choice/view.php

@@ -97,6 +97,8 @@ if (data_submitted() && !empty($action) && confirm_sesskey()) {
 // Completion and trigger events.
 choice_view($choice, $course, $cm, $context);
 
+$PAGE->add_body_class('limitedwidth');
+
 echo $OUTPUT->header();
 if (!$PAGE->has_secondary_navigation()) {
     echo $OUTPUT->heading(format_string($choice->name), 2, null);

mod/feedback/analysis.php

@@ -48,6 +48,7 @@ if (!$feedbackstructure->can_view_analysis()) {
 
 $PAGE->set_heading($course->fullname);
 $PAGE->set_title($feedback->name);
+$PAGE->add_body_class('limitedwidth');
 echo $OUTPUT->header();
 if (!$PAGE->has_secondary_navigation()) {
     echo $OUTPUT->heading(format_string($feedback->name));
@@ -96,4 +97,3 @@ if ($check_anonymously) {
 echo '</div>';
 
 echo $OUTPUT->footer();
-

mod/feedback/complete.php

@@ -69,6 +69,7 @@ $PAGE->set_heading($course->fullname);
 $PAGE->set_title($feedback->name);
 $PAGE->set_pagelayout('incourse');
 $PAGE->set_secondary_active_tab('modulepage');
+$PAGE->add_body_class('limitedwidth');
 
 // Check if the feedback is open (timeopen, timeclose).
 if (!$feedbackcompletion->is_open()) {

mod/feedback/edit.php

@@ -85,6 +85,7 @@ $PAGE->set_url($url);
 $PAGE->set_heading($course->fullname);
 $PAGE->set_title($feedback->name);
 $actionbar = new \mod_feedback\output\edit_action_bar($cm->id, $url, $lastposition);
+$PAGE->add_body_class('limitedwidth');
 
 //Adding the javascript module for the items dragdrop.
 if (count($feedbackitems) > 1) {

mod/feedback/index.php

@@ -39,6 +39,7 @@ $context = context_course::instance($course->id);
 
 require_login($course);
 $PAGE->set_pagelayout('incourse');
+$PAGE->add_body_class('limitedwidth');
 
 // Trigger instances list viewed event.
 $event = \mod_feedback\event\course_module_instance_list_viewed::create(array('context' => $context));
@@ -126,4 +127,3 @@ echo html_writer::table($table);
 /// Finish the page
 
 echo $OUTPUT->footer();
-

mod/feedback/show_entries.php

@@ -86,6 +86,7 @@ if ($data = $courseselectform->get_data()) {
 navigation_node::override_active_url($baseurl);
 $PAGE->set_heading($course->fullname);
 $PAGE->set_title($feedback->name);
+$PAGE->add_body_class('limitedwidth');
 echo $OUTPUT->header();
 
 /** @var \mod_feedback\output\renderer $renderer */
@@ -163,4 +164,3 @@ if ($userid || $showcompleted) {
 
 // Finish the page.
 echo $OUTPUT->footer();
-

mod/feedback/view.php

@@ -43,6 +43,7 @@ if ($course->id == SITEID) {
 $PAGE->set_url('/mod/feedback/view.php', array('id' => $cm->id));
 $PAGE->set_title($feedback->name);
 $PAGE->set_heading($course->fullname);
+$PAGE->add_body_class('limitedwidth');
 
 // Check access to the given courseid.
 if ($courseid AND $courseid != SITEID) {
@@ -152,4 +153,3 @@ if ($feedbackcompletion->can_complete()) {
 }
 
 echo $OUTPUT->footer();
-

mod/folder/edit.php

@@ -43,6 +43,7 @@ $PAGE->set_title($course->shortname.': '.$folder->name);
 $PAGE->set_heading($course->fullname);
 $PAGE->set_activity_record($folder);
 $PAGE->set_secondary_active_tab('modulepage');
+$PAGE->add_body_class('limitedwidth');
 
 $data = new stdClass();
 $data->id = $cm->id;

mod/folder/view.php

@@ -69,6 +69,7 @@ $PAGE->set_title($course->shortname.': '.$folder->name);
 $PAGE->set_heading($course->fullname);
 $PAGE->set_activity_record($folder);
 
+$PAGE->add_body_class('limitedwidth');
 
 $output = $PAGE->get_renderer('mod_folder');
 

mod/forum/export.php

@@ -181,6 +181,7 @@ $PAGE->set_context($context);
 $PAGE->set_url($url);
 $PAGE->set_title($pagetitle);
 $PAGE->set_pagelayout('admin');
+$PAGE->add_body_class('limitedwidth');
 $PAGE->set_heading($pagetitle);
 
 echo $OUTPUT->header();

mod/lesson/edit.php

@@ -47,6 +47,7 @@ $url = new moodle_url('/mod/lesson/edit.php', ['id' => $cm->id, 'mode' => $mode]
 $PAGE->set_url($url);
 $PAGE->force_settings_menu();
 $PAGE->set_secondary_active_tab('modulepage');
+$PAGE->add_body_class('limitedwidth');
 
 if ($mode != get_user_preferences('lesson_view', 'collapsed') && $mode !== 'single') {
     set_user_preference('lesson_view', $mode);

mod/lesson/editpage.php

@@ -53,6 +53,7 @@ require_capability('mod/lesson:edit', $context);
 $PAGE->set_url('/mod/lesson/editpage.php', array('pageid'=>$pageid, 'id'=>$id, 'qtype'=>$qtype));
 $PAGE->set_pagelayout('admin');
 $PAGE->set_secondary_active_tab('modulepage');
+$PAGE->add_body_class('limitedwidth');
 
 if ($edit) {
     $editpage = lesson_page::load($pageid, $lesson);

mod/lesson/import.php

@@ -57,6 +57,7 @@ $mform->set_data($data);
     $PAGE->navbar->add($strimportquestions);
     $PAGE->set_title($strimportquestions);
     $PAGE->set_heading($course->fullname);
+    $PAGE->add_body_class('limitedwidth');
     echo $OUTPUT->header();
     echo $OUTPUT->heading(format_string($lesson->name), 2);
     echo $OUTPUT->heading_with_help($strimportquestions, 'importquestions', 'lesson', '', '', 3);

mod/lesson/overridedelete.php

@@ -82,6 +82,7 @@ $title = get_string('deletecheck', null, $stroverride);
 
 $PAGE->set_url($url);
 $PAGE->set_pagelayout('admin');
+$PAGE->add_body_class('limitedwidth');
 $PAGE->navbar->add($title);
 $PAGE->set_title($title);
 $PAGE->set_heading($course->fullname);

mod/lesson/overrideedit.php

@@ -236,6 +236,7 @@ $pagetitle = get_string('editoverride', 'lesson');
 $PAGE->navbar->add($pagetitle);
 $PAGE->set_pagelayout('admin');
 $PAGE->set_secondary_active_tab('mod_lesson_useroverrides');
+$PAGE->add_body_class('limitedwidth');
 $PAGE->set_title($pagetitle);
 $PAGE->set_heading($course->fullname);
 echo $OUTPUT->header();

mod/lesson/overrides.php

@@ -64,6 +64,7 @@ $PAGE->set_url($url);
 
 // Display a list of overrides.
 $PAGE->set_pagelayout('admin');
+$PAGE->add_body_class('limitedwidth');
 $PAGE->set_title(get_string('overrides', 'lesson'));
 $PAGE->set_heading($course->fullname);
 

mod/lesson/view.php

@@ -54,6 +54,7 @@ if ($pageid !== null) {
 }
 $PAGE->set_url($url);
 $PAGE->force_settings_menu();
+$PAGE->add_body_class('limitedwidth');
 
 $context = $lesson->context;
 $canmanage = $lesson->can_manage();

mod/page/view.php

@@ -63,6 +63,7 @@ if ($inpopup and $page->display == RESOURCELIB_DISPLAY_POPUP) {
     $PAGE->set_title($course->shortname.': '.$page->name);
     $PAGE->set_heading($course->fullname);
 } else {
+    $PAGE->add_body_class('limitedwidth');
     $PAGE->set_title($course->shortname.': '.$page->name);
     $PAGE->set_heading($course->fullname);
     $PAGE->set_activity_record($page);

mod/quiz/attempt.php

@@ -127,6 +127,7 @@ $PAGE->blocks->add_fake_block($navbc, reset($regions));
 
 $headtags = $attemptobj->get_html_head_contributions($page);
 $PAGE->set_title($attemptobj->attempt_page_title($page));
+$PAGE->add_body_class('limitedwidth');
 $PAGE->set_heading($attemptobj->get_course()->fullname);
 
 if ($attemptobj->is_last_page($page)) {

mod/quiz/edit.php

@@ -176,6 +176,7 @@ $questionbank->set_quiz_has_attempts($quizhasattempts);
 // End of process commands =====================================================.
 
 $PAGE->set_pagelayout('incourse');
+$PAGE->add_body_class('limitedwidth');
 $PAGE->set_pagetype('mod-quiz-edit');
 
 $output = $PAGE->get_renderer('mod_quiz', 'edit');

mod/quiz/editrandom.php

@@ -51,6 +51,7 @@ if ($returnurl) {
 $url = new moodle_url('/mod/quiz/editrandom.php', array('slotid' => $slotid));
 $PAGE->set_url($url);
 $PAGE->set_pagelayout('admin');
+$PAGE->add_body_class('limitedwidth');
 
 if (!$question = $DB->get_record('question', array('id' => $slot->questionid))) {
     print_error('questiondoesnotexist', 'question', $returnurl);

mod/quiz/view.php

@@ -143,6 +143,7 @@ if (!empty($grading_info->items)) {
 $title = $course->shortname . ': ' . format_string($quiz->name);
 $PAGE->set_title($title);
 $PAGE->set_heading($course->fullname);
+$PAGE->add_body_class('limitedwidth');
 $output = $PAGE->get_renderer('mod_quiz');
 // MDL-71915 Will remove this place holder.
 if (defined('BEHAT_SITE_RUNNING')) {

mod/resource/view.php

@@ -106,4 +106,3 @@ switch ($displaytype) {
         resource_print_workaround($resource, $cm, $course, $file);
         break;
 }
-

mod/survey/view.php

@@ -70,6 +70,7 @@ if ($surveyalreadydone) {
 $strsurvey = get_string("modulename", "survey");
 $PAGE->set_title($survey->name);
 $PAGE->set_heading($course->fullname);
+$PAGE->add_body_class('limitedwidth');
 echo $OUTPUT->header();
 if (!$PAGE->has_secondary_navigation()) {
     echo $OUTPUT->heading(format_string($survey->name));
@@ -184,5 +185,3 @@ echo '</div>';
 echo "</form>";
 
 echo $OUTPUT->footer();
-
-

mod/wiki/files.php

@@ -85,6 +85,7 @@ if (!wiki_user_can_view($subwiki, $wiki)) {
 
 $PAGE->set_title(get_string('wikifiles', 'wiki'));
 $PAGE->set_heading($course->fullname);
+$PAGE->add_body_class('limitedwidth');
 $PAGE->navbar->add(format_string(get_string('wikifiles', 'wiki')));
 $PAGE->set_secondary_active_tab('modulepage');
 

mod/wiki/filesedit.php

@@ -79,6 +79,7 @@ $PAGE->set_heading($course->fullname);
 $PAGE->navbar->add(format_string(get_string('wikifiles', 'wiki')), $CFG->wwwroot . '/mod/wiki/files.php?pageid=' . $pageid);
 $PAGE->navbar->add(format_string($title));
 $PAGE->set_secondary_active_tab('modulepage');
+$PAGE->add_body_class('limitedwidth');
 
 $data = new stdClass();
 $data->returnurl = $returnurl;

mod/wiki/pagelib.php

@@ -114,6 +114,7 @@ abstract class page_wiki {
         if ($activesecondarytab) {
             $PAGE->set_secondary_active_tab($activesecondarytab);
         }
+        $PAGE->add_body_class('limitedwidth');
         // the search box
         if (!empty($subwiki->id)) {
             $search = optional_param('searchstring', null, PARAM_TEXT);

mod/wiki/view.php

@@ -52,6 +52,7 @@ $action = optional_param('action', '', PARAM_ALPHA);
 $swid = optional_param('swid', 0, PARAM_INT); // Subwiki ID
 
 $PAGE->force_settings_menu();
+$PAGE->add_body_class('limitedwidth');
 
 /*
  * Case 0:

my/index.php

@@ -84,6 +84,7 @@ $params = array();
 $PAGE->set_context($context);
 $PAGE->set_url('/my/index.php', $params);
 $PAGE->set_pagelayout('mydashboard');
+$PAGE->add_body_class('limitedwidth');
 $PAGE->set_pagetype('my-index');
 $PAGE->blocks->add_region('content');
 $PAGE->set_subpage($currentpage->id);

theme/boost/config.php

@@ -36,14 +36,14 @@ $THEME->scss = function($theme) {
 };
 
 $THEME->layouts = [
-    // Most backwards compatible layout without the blocks - this is the layout used by default.
+    // Most backwards compatible layout without the blocks.
     'base' => array(
         'file' => 'columns2.php',
         'regions' => array(),
     ),
-    // Standard layout with blocks, this is recommended for most pages with general information.
+    // Standard layout with blocks.
     'standard' => array(
-        'file' => 'columns2.php',
+        'file' => 'drawers.php',
         'regions' => array('side-pre'),
         'defaultregion' => 'side-pre',
     ),
@@ -55,7 +55,7 @@ $THEME->layouts = [
         'options' => array('langmenu' => true),
     ),
     'coursecategory' => array(
-        'file' => 'columns2.php',
+        'file' => 'drawers.php',
         'regions' => array('side-pre'),
         'defaultregion' => 'side-pre',
     ),
@@ -67,32 +67,32 @@ $THEME->layouts = [
     ),
     // The site home page.
     'frontpage' => array(
-        'file' => 'columns2.php',
+        'file' => 'drawers.php',
         'regions' => array('side-pre'),
         'defaultregion' => 'side-pre',
         'options' => array('nonavbar' => true),
     ),
     // Server administration scripts.
     'admin' => array(
-        'file' => 'columns2.php',
+        'file' => 'drawers.php',
         'regions' => array('side-pre'),
         'defaultregion' => 'side-pre',
     ),
     // My courses page.
     'mycourses' => array(
-        'file' => 'columns2.php',
+        'file' => 'drawers.php',
         'regions' => array()
     ),
     // My dashboard page.
     'mydashboard' => array(
-        'file' => 'columns2.php',
+        'file' => 'drawers.php',
         'regions' => array('side-pre'),
         'defaultregion' => 'side-pre',
         'options' => array('nonavbar' => true, 'langmenu' => true, 'nocontextheader' => true),
     ),
     // My public page.
     'mypublic' => array(
-        'file' => 'columns2.php',
+        'file' => 'drawers.php',
         'regions' => array('side-pre'),
         'defaultregion' => 'side-pre',
     ),
@@ -140,7 +140,7 @@ $THEME->layouts = [
     ),
     // The pagelayout used for reports.
     'report' => array(
-        'file' => 'columns2.php',
+        'file' => 'drawers.php',
         'regions' => array('side-pre'),
         'defaultregion' => 'side-pre',
     ),

theme/boost/scss/moodle/blocks.scss

@@ -200,76 +200,6 @@ $card-gutter : $card-deck-margin * 2;
             width: calc(33.33% - #{$card-gutter});
         }
     }
-    @media (min-width: 1100px) {
-        .dashboard-card {
-            width: calc(25% - #{$card-gutter});
-        }
-    }
-    @media (min-width: 1360px) {
-        .dashboard-card {
-            width: calc(20% - #{$card-gutter});
-        }
-    }
-}
-
-#region-main.has-blocks {
-    .dashboard-card-deck:not(.fixed-width-cards) {
-        @media (min-width: 1200px) {
-            .dashboard-card {
-                width: calc(33.33% - #{$card-gutter});
-            }
-        }
-        @media (min-width: 1470px) {
-            .dashboard-card {
-                width: calc(25% - #{$card-gutter});
-            }
-        }
-    }
-}
-
-body.drawer-open-left {
-    .dashboard-card-deck:not(.fixed-width-cards) {
-        @media (min-width: 768px) {
-            .dashboard-card {
-                width: calc(100% - #{$card-gutter});
-            }
-        }
-        @media (min-width: 861px) {
-            .dashboard-card {
-                width: calc(50% - #{$card-gutter});
-            }
-        }
-        @media (min-width: 1122px) {
-            .dashboard-card {
-                width: calc(33.33% - #{$card-gutter});
-            }
-        }
-        @media (min-width: 1381px) {
-            .dashboard-card {
-                width: calc(25% - #{$card-gutter});
-            }
-        }
-    }
-}
-
-body.drawer-open-left #region-main.has-blocks {
-    .dashboard-card-deck:not(.fixed-width-cards) {
-        @media (min-width: 1200px) {
-            .dashboard-card {
-                width: calc(100% - #{$card-gutter});
-            }
-        }
-        @media (min-width: 1236px) {
-            .dashboard-card {
-                width: calc(50% - #{$card-gutter});
-            }
-        }
-        @media (min-width: 1497px) {
-            .dashboard-card {
-                width: calc(33.33% - #{$card-gutter});
-            }
-        }
-    }
 }
 
 @media (min-width: 1200px) {

theme/boost/scss/moodle/core.scss

@@ -2361,6 +2361,9 @@ $footer-link-color: $bg-inverse-link-color !default;
         display: block;
         z-index: $zindex-dropdown;
     }
+    .jsenabled .drawers.show-drawer-right .btn-footer-popover {
+        display: none;
+    }
 }
 
 .bg-inverse a {

theme/boost/scss/moodle/dashboard.scss

@@ -2,4 +2,4 @@
 $dashboard-bg: darken($body-bg, 3%) !default;
 #page-my-index {
     background-color: $dashboard-bg;
-}
+}

theme/boost/scss/moodle/forms.scss

@@ -27,6 +27,9 @@
     .custom-select {
         max-width: 100%;
     }
+    textarea.form-control {
+        width: 100%;
+    }
     .form-group {
         margin: 0.1rem 0.25rem 0.1rem 0;
     }

theme/boost/scss/moodle/layout.scss

@@ -41,13 +41,36 @@
         max-width: 100%;
         width: 100%;
         margin: 0 auto;
+        @include border-radius();
+        background-color: $white;
+        padding: 1.5rem;
+        margin-top: 3rem;
+        margin-bottom: 3rem;
     }
 }
 
-@include media-breakpoint-up(xl) {
-    .pagelayout-course {
-        #page.drawers .main-inner {
-            max-width: $course-content-maxwidth;
+@include media-breakpoint-up(md) {
+    .pagelayout-standard,
+    body.limitedwidth {
+        #page.drawers {
+            .main-inner {
+                max-width: $course-content-maxwidth;
+            }
+            .footer-popover {
+                max-width: $course-content-maxwidth;
+                width: 100%;
+                margin: 0 auto;
+                @include border-radius();
+            }
+        }
+    }
+    .header-maxwidth {
+        max-width: $course-content-maxwidth;
+        margin: 0 auto;
+
+        .header-inner {
+            padding-left: 0;
+            padding-right: 0;
         }
     }
 }

theme/boost/scss/moodle/secondarynavigation.scss

@@ -1,6 +1,8 @@
 .secondary-navigation {
     border-top: 1px solid $nav-tabs-border-color;
     border-bottom: 1px solid $nav-tabs-border-color;
+    max-width: $course-content-maxwidth;
+    margin: 0 auto;
     .navigation {
         height: $moremenu-height;
         background-color: $body-bg;

theme/boost/scss/moodle/user.scss

@@ -6,6 +6,7 @@
 
 .userprofile .page-context-header {
     margin-bottom: 10px;
+    column-count: 1;
 }
 
 .userprofile .description {

theme/boost/style/moodle.css

@@ -11768,7 +11768,9 @@ ul {
     display: none; }
   .jsenabled .btn-footer-popover {
     display: block;
-    z-index: 1000; } }
+    z-index: 1000; }
+  .jsenabled .drawers.show-drawer-right .btn-footer-popover {
+    display: none; } }
 
 .bg-inverse a {
   color: #fff;
@@ -12973,50 +12975,6 @@ body.dragging .dragging {
   .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
     width: calc(33.33% - 0.5rem); } }
 
-@media (min-width: 1100px) {
-  .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(25% - 0.5rem); } }
-
-@media (min-width: 1360px) {
-  .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(20% - 0.5rem); } }
-
-@media (min-width: 1200px) {
-  #region-main.has-blocks .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(33.33% - 0.5rem); } }
-
-@media (min-width: 1470px) {
-  #region-main.has-blocks .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(25% - 0.5rem); } }
-
-@media (min-width: 768px) {
-  body.drawer-open-left .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(100% - 0.5rem); } }
-
-@media (min-width: 861px) {
-  body.drawer-open-left .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(50% - 0.5rem); } }
-
-@media (min-width: 1122px) {
-  body.drawer-open-left .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(33.33% - 0.5rem); } }
-
-@media (min-width: 1381px) {
-  body.drawer-open-left .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(25% - 0.5rem); } }
-
-@media (min-width: 1200px) {
-  body.drawer-open-left #region-main.has-blocks .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(100% - 0.5rem); } }
-
-@media (min-width: 1236px) {
-  body.drawer-open-left #region-main.has-blocks .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(50% - 0.5rem); } }
-
-@media (min-width: 1497px) {
-  body.drawer-open-left #region-main.has-blocks .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(33.33% - 0.5rem); } }
-
 @media (min-width: 1200px) {
   #block-region-side-pre .dashboard-card-deck:not(.fixed-width-cards) {
     margin-left: 0;
@@ -16710,7 +16668,8 @@ body.path-question-type .mform fieldset.hidden {
   margin: 10px; }
 
 .userprofile .page-context-header {
-  margin-bottom: 10px; }
+  margin-bottom: 10px;
+  column-count: 1; }
 
 .userprofile .description {
   margin-top: 10px;
@@ -17046,6 +17005,9 @@ body.path-question-type .mform fieldset.hidden {
 .mform .form-inline .custom-select {
   max-width: 100%; }
 
+.mform .form-inline textarea.form-control {
+  width: 100%; }
+
 .mform .form-inline .form-group {
   margin: 0.1rem 0.25rem 0.1rem 0; }
 
@@ -20056,11 +20018,29 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
   #page.drawers .main-inner {
     max-width: 100%;
     width: 100%;
-    margin: 0 auto; }
+    margin: 0 auto;
+    border-radius: 0.25rem;
+    background-color: #fff;
+    padding: 1.5rem;
+    margin-top: 3rem;
+    margin-bottom: 3rem; }
 
-@media (min-width: 1200px) {
-  .pagelayout-course #page.drawers .main-inner {
-    max-width: 800px; } }
+@media (min-width: 768px) {
+  .pagelayout-standard #page.drawers .main-inner,
+  body.limitedwidth #page.drawers .main-inner {
+    max-width: 800px; }
+  .pagelayout-standard #page.drawers .footer-popover,
+  body.limitedwidth #page.drawers .footer-popover {
+    max-width: 800px;
+    width: 100%;
+    margin: 0 auto;
+    border-radius: 0.25rem; }
+  .header-maxwidth {
+    max-width: 800px;
+    margin: 0 auto; }
+    .header-maxwidth .header-inner {
+      padding-left: 0;
+      padding-right: 0; } }
 
 .drawer-toggles .drawer-toggler {
   position: fixed;
@@ -21172,7 +21152,9 @@ div.editor_atto_toolbar button .icon {
 
 .secondary-navigation {
   border-top: 1px solid #dee2e6;
-  border-bottom: 1px solid #dee2e6; }
+  border-bottom: 1px solid #dee2e6;
+  max-width: 800px;
+  margin: 0 auto; }
   .secondary-navigation .navigation {
     height: 60px;
     background-color: #fff; }

theme/boost/templates/drawers.mustache

@@ -150,8 +150,8 @@
                     </section>
                 </div>
             </div>
-            {{> theme_boost/footer }}
         </div>
+        {{> theme_boost/footer }}
     </div>
     {{{ output.standard_after_main_region_html }}}
 </div>

theme/boost/templates/footer.mustache

@@ -63,7 +63,7 @@
         </div>
     </div>
 
-    <div class="footer-content-debugging py-sm-3">
+    <div class="footer-content-debugging">
         <div class="container">
             {{{ output.debug_footer_html }}}
         </div>

theme/classic/scss/classic/post.scss

@@ -141,13 +141,13 @@
 }
 
 @include media-breakpoint-up(sm) {
-    .dashboard-card-deck .dashboard-card {
+    .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
         width: calc(50% - #{$card-gutter});
     }
 }
 
 @include media-breakpoint-up(md) {
-    .dashboard-card-deck .dashboard-card {
+    .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
         width: calc(50% - #{$card-gutter});
     }
     .blocks-post,
@@ -159,7 +159,7 @@
 }
 
 @include media-breakpoint-up(lg) {
-    .dashboard-card-deck .dashboard-card {
+    .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
         width: calc(33.33% - #{$card-gutter});
     }
     .blocks-post,
@@ -171,7 +171,7 @@
 }
 
 @include media-breakpoint-up(xl) {
-    .dashboard-card-deck .dashboard-card {
+    .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
         width: calc(25% - #{$card-gutter});
     }
     .blocks-post,
@@ -182,6 +182,18 @@
     }
 }
 
+@media (min-width: 1360px) {
+    .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
+        width: calc(20% - #{$card-gutter});
+    }
+    .blocks-post,
+    .blocks-pre {
+        .dashboard-card-deck .dashboard-card {
+            width: calc(25% - #{$card-gutter});
+        }
+    }
+}
+
 @include media-breakpoint-up(md) {
     .blockcolumn {
         .dashboard-card-deck {

theme/classic/style/moodle.css

@@ -11768,7 +11768,9 @@ ul {
     display: none; }
   .jsenabled .btn-footer-popover {
     display: block;
-    z-index: 1000; } }
+    z-index: 1000; }
+  .jsenabled .drawers.show-drawer-right .btn-footer-popover {
+    display: none; } }
 
 .bg-inverse a {
   color: #fff;
@@ -12973,50 +12975,6 @@ body.dragging .dragging {
   .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
     width: calc(33.33% - 0.5rem); } }
 
-@media (min-width: 1100px) {
-  .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(25% - 0.5rem); } }
-
-@media (min-width: 1360px) {
-  .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(20% - 0.5rem); } }
-
-@media (min-width: 1200px) {
-  #region-main.has-blocks .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(33.33% - 0.5rem); } }
-
-@media (min-width: 1470px) {
-  #region-main.has-blocks .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(25% - 0.5rem); } }
-
-@media (min-width: 768px) {
-  body.drawer-open-left .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(100% - 0.5rem); } }
-
-@media (min-width: 861px) {
-  body.drawer-open-left .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(50% - 0.5rem); } }
-
-@media (min-width: 1122px) {
-  body.drawer-open-left .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(33.33% - 0.5rem); } }
-
-@media (min-width: 1381px) {
-  body.drawer-open-left .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(25% - 0.5rem); } }
-
-@media (min-width: 1200px) {
-  body.drawer-open-left #region-main.has-blocks .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(100% - 0.5rem); } }
-
-@media (min-width: 1236px) {
-  body.drawer-open-left #region-main.has-blocks .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(50% - 0.5rem); } }
-
-@media (min-width: 1497px) {
-  body.drawer-open-left #region-main.has-blocks .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
-    width: calc(33.33% - 0.5rem); } }
-
 @media (min-width: 1200px) {
   #block-region-side-pre .dashboard-card-deck:not(.fixed-width-cards) {
     margin-left: 0;
@@ -16710,7 +16668,8 @@ body.path-question-type .mform fieldset.hidden {
   margin: 10px; }
 
 .userprofile .page-context-header {
-  margin-bottom: 10px; }
+  margin-bottom: 10px;
+  column-count: 1; }
 
 .userprofile .description {
   margin-top: 10px;
@@ -17046,6 +17005,9 @@ body.path-question-type .mform fieldset.hidden {
 .mform .form-inline .custom-select {
   max-width: 100%; }
 
+.mform .form-inline textarea.form-control {
+  width: 100%; }
+
 .mform .form-inline .form-group {
   margin: 0.1rem 0.25rem 0.1rem 0; }
 
@@ -20002,11 +19964,29 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
   #page.drawers .main-inner {
     max-width: 100%;
     width: 100%;
-    margin: 0 auto; }
+    margin: 0 auto;
+    border-radius: 0.25rem;
+    background-color: #fff;
+    padding: 1.5rem;
+    margin-top: 3rem;
+    margin-bottom: 3rem; }
 
-@media (min-width: 1200px) {
-  .pagelayout-course #page.drawers .main-inner {
-    max-width: 800px; } }
+@media (min-width: 768px) {
+  .pagelayout-standard #page.drawers .main-inner,
+  body.limitedwidth #page.drawers .main-inner {
+    max-width: 800px; }
+  .pagelayout-standard #page.drawers .footer-popover,
+  body.limitedwidth #page.drawers .footer-popover {
+    max-width: 800px;
+    width: 100%;
+    margin: 0 auto;
+    border-radius: 0.25rem; }
+  .header-maxwidth {
+    max-width: 800px;
+    margin: 0 auto; }
+    .header-maxwidth .header-inner {
+      padding-left: 0;
+      padding-right: 0; } }
 
 .drawer-toggles .drawer-toggler {
   position: fixed;
@@ -21118,7 +21098,9 @@ div.editor_atto_toolbar button .icon {
 
 .secondary-navigation {
   border-top: 1px solid #dee2e6;
-  border-bottom: 1px solid #dee2e6; }
+  border-bottom: 1px solid #dee2e6;
+  max-width: 800px;
+  margin: 0 auto; }
   .secondary-navigation .navigation {
     height: 50px;
     background-color: #fff; }
@@ -21408,30 +21390,37 @@ body {
     /* stylelint-disable-line declaration-no-important */ } }
 
 @media (min-width: 576px) {
-  .dashboard-card-deck .dashboard-card {
+  .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
     width: calc(50% - 0.5rem); } }
 
 @media (min-width: 768px) {
-  .dashboard-card-deck .dashboard-card {
+  .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
     width: calc(50% - 0.5rem); }
   .blocks-post .dashboard-card-deck .dashboard-card,
   .blocks-pre .dashboard-card-deck .dashboard-card {
     width: calc(100% - 0.5rem); } }
 
 @media (min-width: 992px) {
-  .dashboard-card-deck .dashboard-card {
+  .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
     width: calc(33.33% - 0.5rem); }
   .blocks-post .dashboard-card-deck .dashboard-card,
   .blocks-pre .dashboard-card-deck .dashboard-card {
     width: calc(50% - 0.5rem); } }
 
 @media (min-width: 1200px) {
-  .dashboard-card-deck .dashboard-card {
+  .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
     width: calc(25% - 0.5rem); }
   .blocks-post .dashboard-card-deck .dashboard-card,
   .blocks-pre .dashboard-card-deck .dashboard-card {
     width: calc(33.33% - 0.5rem); } }
 
+@media (min-width: 1360px) {
+  .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
+    width: calc(20% - 0.5rem); }
+  .blocks-post .dashboard-card-deck .dashboard-card,
+  .blocks-pre .dashboard-card-deck .dashboard-card {
+    width: calc(25% - 0.5rem); } }
+
 @media (min-width: 768px) {
   .blockcolumn .dashboard-card-deck {
     margin-left: 0;

user/edit.php

@@ -128,6 +128,7 @@ if ($user->deleted) {
 }
 
 $PAGE->set_pagelayout('admin');
+$PAGE->add_body_class('limitedwidth');
 $PAGE->set_context($personalcontext);
 if ($USER->id != $user->id) {
     $PAGE->navigation->extend_for_user($user);
@@ -324,4 +325,3 @@ if ($emailchanged) {
 
 // And proper footer.
 echo $OUTPUT->footer();
-

user/editadvanced.php

@@ -53,6 +53,7 @@ if (!empty($USER->newadminuser)) {
         require_login($course);
     }
     $PAGE->set_pagelayout('admin');
+    $PAGE->add_body_class('limitedwidth');
 }
 
 if ($course->id == SITEID) {
@@ -358,4 +359,3 @@ $userform->display();
 
 // And proper footer.
 echo $OUTPUT->footer();
-

user/editlib.php

@@ -113,6 +113,7 @@ function useredit_setup_preference_page($userid, $courseid) {
     }
 
     $PAGE->set_pagelayout('admin');
+    $PAGE->add_body_class('limitedwidth');
     $PAGE->set_context($personalcontext);
     if ($USER->id != $user->id) {
         $PAGE->navigation->extend_for_user($user);

user/editor.php

@@ -61,6 +61,7 @@ $userfullname     = fullname($user, true);
 
 $PAGE->navbar->includesettingsbase = true;
 
+$PAGE->add_body_class('limitedwidth');
 $PAGE->set_title("$course->shortname: $streditmyeditor");
 $PAGE->set_heading($userfullname);
 
@@ -72,4 +73,3 @@ $editorform->display();
 
 // And proper footer.
 echo $OUTPUT->footer();
-

user/files.php

@@ -40,6 +40,7 @@ $PAGE->set_context($context);
 $PAGE->set_title($title);
 $PAGE->set_heading(fullname($USER));
 $PAGE->set_pagelayout('standard');
+$PAGE->add_body_class('limitedwidth');
 $PAGE->set_pagetype('user-files');
 
 echo $OUTPUT->header();

user/forum.php

@@ -81,6 +81,7 @@ $userfullname     = fullname($user, true);
 
 $PAGE->navbar->includesettingsbase = true;
 
+$PAGE->add_body_class('limitedwidth');
 $PAGE->set_title("$course->shortname: $streditmyforum");
 $PAGE->set_heading($userfullname);
 
@@ -92,4 +93,3 @@ $forumform->display();
 
 // And proper footer.
 echo $OUTPUT->footer();
-

user/preferences.php

@@ -42,6 +42,7 @@ if (!$user || !core_user::is_real_user($userid)) {
 $PAGE->set_context(context_user::instance($userid));
 $PAGE->set_url('/user/preferences.php', array('userid' => $userid));
 $PAGE->set_pagelayout('admin');
+$PAGE->add_body_class('limitedwidth');
 $PAGE->set_pagetype('user-preferences');
 $PAGE->set_title(get_string('preferences'));
 $PAGE->set_heading(fullname($user));

user/profile.php

@@ -83,6 +83,7 @@ if (!user_can_view_profile($user, null, $context)) {
     $PAGE->set_title("$SITE->shortname: $struser");  // Do not leak the name.
     $PAGE->set_heading($struser);
     $PAGE->set_pagelayout('mypublic');
+    $PAGE->add_body_class('limitedwidth');
     $PAGE->set_url('/user/profile.php', array('id' => $userid));
     $PAGE->navbar->add($struser);
     echo $OUTPUT->header();
@@ -98,6 +99,7 @@ if (!$currentpage = my_get_page($userid, MY_PAGE_PUBLIC)) {
 
 $PAGE->set_context($context);
 $PAGE->set_pagelayout('mypublic');
+$PAGE->add_body_class('limitedwidth');
 $PAGE->set_pagetype('user-profile');
 
 // Set up block editing capabilities.

user/view.php

@@ -160,6 +160,7 @@ if ($currentuser) {
 $PAGE->set_title("$course->fullname: $strpersonalprofile: $fullname");
 $PAGE->set_heading($course->fullname);
 $PAGE->set_pagelayout('mypublic');
+$PAGE->add_body_class('limitedwidth');
 
 // Locate the users settings in the settings navigation and force it open.
 // This MUST be done after we've set up the page as it is going to cause theme and output to initialise.