From 2949dedcda686f29fc7a04be15e8d5969392cafd Mon Sep 17 00:00:00 2001
From: Sam Hemelryk <sam@moodle.com>
Date: Thu, 20 Nov 2014 10:18:09 +1300
Subject: [PATCH] MDL-43628 mod_assign: fixed formatting of statement

---
 mod/assign/locallib.php              | 26 ++++++++++++++++++++++----
 mod/assign/styles.css                |  7 +++++++
 mod/assign/submissionconfirmform.php |  2 +-
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index 2e3fec6a1c0..5fdb56e7dde 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -3739,7 +3739,13 @@ class assign {
 
         $submissionstatement = '';
         if (!empty($adminconfig->submissionstatement)) {
-            $submissionstatement = $adminconfig->submissionstatement;
+            // Format the submissino statement before its sent. We turn off para because this is going within
+            // a form element.
+            $options = array(
+                'context' => $this->get_context(),
+                'para' => false
+            );
+            $submissionstatement = format_text($adminconfig->submissionstatement, FORMAT_MOODLE, $options);
         }
 
         if ($mform == null) {
@@ -4996,7 +5002,13 @@ class assign {
 
         $submissionstatement = '';
         if (!empty($adminconfig->submissionstatement)) {
-            $submissionstatement = $adminconfig->submissionstatement;
+            // Format the submissino statement before its sent. We turn off para because this is going within
+            // a form element.
+            $options = array(
+                'context' => $this->get_context(),
+                'para' => false
+            );
+            $submissionstatement = format_text($adminconfig->submissionstatement, FORMAT_MOODLE, $options);
         }
 
         if ($mform == null) {
@@ -6196,9 +6208,15 @@ class assign {
 
             $submissionstatement = '';
             if (!empty($adminconfig->submissionstatement)) {
-                $submissionstatement = $adminconfig->submissionstatement;
+                // Format the submissino statement before its sent. We turn off para because this is going within
+                // a form element.
+                $options = array(
+                    'context' => $this->get_context(),
+                    'para' => false
+                );
+                $submissionstatement = format_text($adminconfig->submissionstatement, FORMAT_MOODLE, $options);
             }
-            $mform->addElement('checkbox', 'submissionstatement', '', '&nbsp;' . $submissionstatement);
+            $mform->addElement('checkbox', 'submissionstatement', '', $submissionstatement);
             $mform->addRule('submissionstatement', get_string('required'), 'required', null, 'client');
         }
 
diff --git a/mod/assign/styles.css b/mod/assign/styles.css
index 868d48d4138..2ed075efbe8 100644
--- a/mod/assign/styles.css
+++ b/mod/assign/styles.css
@@ -301,3 +301,10 @@
 .path-mod-assign .gradingtable .menu-action img {
     display: none;
 }
+
+.path-mod-assign .editsubmissionform input[name="submissionstatement"] {
+    vertical-align: top;
+}
+.path-mod-assign .editsubmissionform label[for="id_submissionstatement"] {
+    display: inline-block;
+}
\ No newline at end of file
diff --git a/mod/assign/submissionconfirmform.php b/mod/assign/submissionconfirmform.php
index 5790cb9d570..1508026a850 100644
--- a/mod/assign/submissionconfirmform.php
+++ b/mod/assign/submissionconfirmform.php
@@ -47,7 +47,7 @@ class mod_assign_confirm_submission_form extends moodleform {
              $data) = $this->_customdata;
 
         if ($requiresubmissionstatement) {
-            $mform->addElement('checkbox', 'submissionstatement', '', '&nbsp;' . format_text($submissionstatement));
+            $mform->addElement('checkbox', 'submissionstatement', '', $submissionstatement);
             $mform->addRule('submissionstatement', get_string('required'), 'required', null, 'client');
         }
 
-- 
2.17.1