MDL-72095 theme_boost: max width for activity pages

admin/settings.php

@@ -13,6 +13,7 @@
 $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_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 @@
 }
 
 $PAGE->set_title($title);
+$PAGE->add_body_class('limitedwidth');
 $PAGE->set_heading($fullname);
 
 echo $OUTPUT->header();

course/index.php

@@ -60,6 +60,7 @@
 }
 
 $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 @@
 }
 $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 @@
 }
 $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>
+<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 @@ public function view($action='', $args = array()) {
             $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 @@ public function view($action='', $args = array()) {
         } 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 @@
 
 $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 @@
 $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 @@
 $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 @@
 // 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 @@
 
 $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 @@
 echo '</div>';
 
 echo $OUTPUT->footer();
-

mod/feedback/complete.php

@@ -69,6 +69,7 @@
 $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_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 @@
 
 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 @@
 /// Finish the page
 
 echo $OUTPUT->footer();
-

mod/feedback/show_entries.php

@@ -86,6 +86,7 @@
 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 @@
 
 // Finish the page.
 echo $OUTPUT->footer();
-

mod/feedback/view.php

@@ -43,6 +43,7 @@
 $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 @@
 }
 
 echo $OUTPUT->footer();
-

mod/folder/edit.php

@@ -43,6 +43,7 @@
 $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_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 @@ function($exportdata) use ($fields, $striphtml, $humandates, $canviewfullname, $
 $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 @@
 $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 @@
 $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 @@
     $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 @@
 
 $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 @@
 $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 @@
 
 // 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 @@
 }
 $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 @@
     $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 @@
 
 $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 @@
 // 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');