From a2b003a917e374c0be4d7e70a2deb8e56a5f8972 Mon Sep 17 00:00:00 2001
From: Sujith Haridasan <sujith@moodle.com>
Date: Fri, 25 Feb 2022 12:15:35 +0530
Subject: [PATCH] MDL-73990 mod_assign: Show the activity info and attachments

Show the activity information in the view page and add/edit submission
page.
- Removed the line change to disable activity header. This should help
    - When any additional files are attached to the assignment by the
      teacher/admin they should be displayed in the view and add/edit
      submission page (in the default settings)
- Added more padding to the "Add submission" button.
- Changed the string 'Activity' to 'Activity instructions'.
---
 mod/assign/lang/en/assign.php                            | 2 +-
 mod/assign/locallib.php                                  | 4 +---
 mod/assign/templates/user_submission_actionmenu.mustache | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/mod/assign/lang/en/assign.php b/mod/assign/lang/en/assign.php
index 45a29180974..d4380a21710 100644
--- a/mod/assign/lang/en/assign.php
+++ b/mod/assign/lang/en/assign.php
@@ -26,7 +26,7 @@ $string['activityattachments'] = 'Assignment activity attachments';
 $string['activitydate:submissionsdue'] = 'Due:';
 $string['activitydate:submissionsopen'] = 'Opens:';
 $string['activitydate:submissionsopened'] = 'Opened:';
-$string['activityeditor'] = 'Activity';
+$string['activityeditor'] = 'Activity instructions';
 $string['activityeditor_help'] = 'The actions you would like the student to complete for this assignment. This is only shown on the submission page where a students edits and submits their assignment.';
 $string['activityoverview'] = 'You have assignments that need attention';
 $string['addattempt'] = 'Allow another attempt';
diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index 57e9ec074c1..4ceb2464f7b 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -4927,12 +4927,10 @@ class assign {
             $PAGE->blocks->add_fake_block($bc, reset($regions));
         }
 
-        $PAGE->activityheader->disable();
-
         $o .= $this->get_renderer()->render(
             new assign_header($this->get_instance(),
                               $this->get_context(),
-                              false,
+                              $this->show_intro(),
                               $this->get_course_module()->id,
                               $title,
                               '',
diff --git a/mod/assign/templates/user_submission_actionmenu.mustache b/mod/assign/templates/user_submission_actionmenu.mustache
index 2bb2c94794c..084ae04ed96 100644
--- a/mod/assign/templates/user_submission_actionmenu.mustache
+++ b/mod/assign/templates/user_submission_actionmenu.mustache
@@ -142,7 +142,7 @@
     }
 
 }}
-<div class="container-fluid mb-1">
+<div class="container-fluid mb-4">
     <div class="row">
         {{#submit}}
         <div class="col-xs-6 mr-3">