MDL-60726 assign: Fix assign submission confirmation alignment

moodle · Apr 4, 2018 · 5687cd0 · 5687cd0
1 parent 39fab18
commit 5687cd0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/mod/assign/lang/en/assign.php b/mod/assign/lang/en/assign.php
@@ -121,6 +121,7 @@
 $string['conversionexception'] = 'Could not convert assignment. Exception was: {$a}.';
 $string['configshowrecentsubmissions'] = 'Everyone can see notifications of submissions in recent activity reports.';
 $string['confirmsubmission'] = 'Are you sure you want to submit your work for grading? You will not be able to make any more changes.';
+$string['confirmsubmissionheading'] = 'Confirm submission';
 $string['confirmbatchgradingoperation'] = 'Are you sure you want to {$a->operation} for {$a->count} students?';
 $string['couldnotconvertgrade'] = 'Could not convert assignment grade for user {$a}.';
 $string['couldnotconvertsubmission'] = 'Could not convert assignment submission for user {$a}.';

diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
@@ -4921,7 +4921,11 @@ protected function check_submit_for_grading($mform) {
                                                                         $data));
         }
         $o = '';
-        $o .= $this->get_renderer()->header();
+        $o .= $this->get_renderer()->render(new assign_header($this->get_instance(),
+                                                              $this->get_context(),
+                                                              $this->show_intro(),
+                                                              $this->get_course_module()->id,
+                                                              get_string('confirmsubmissionheading', 'assign')));
         $submitforgradingpage = new assign_submit_for_grading_page($notifications,
                                                                    $this->get_course_module()->id,
                                                                    $mform);

diff --git a/mod/assign/renderer.php b/mod/assign/renderer.php
@@ -178,8 +178,7 @@ public function render_assign_submit_for_grading_page($page) {
         $o = '';
 
         $o .= $this->output->container_start('submitforgrading');
-        $o .= $this->output->heading(get_string('submitassignment', 'assign'), 3);
-        $o .= $this->output->spacer(array('height'=>30));
+        $o .= $this->output->heading(get_string('confirmsubmissionheading', 'assign'), 3);
 
         $cancelurl = new moodle_url('/mod/assign/view.php', array('id' => $page->coursemoduleid));
         if (count($page->notifications)) {
@@ -194,9 +193,7 @@ public function render_assign_submit_for_grading_page($page) {
             $o .= $this->output->continue_button($cancelurl);
         } else {
             // All submission plugins ready - show the confirmation form.
-            $o .= $this->output->box_start('generalbox submitconfirm');
             $o .= $this->moodleform($page->confirmform);
-            $o .= $this->output->box_end();
         }
         $o .= $this->output->container_end();