From 44bd656a98b0fd7bd766172b89f0b09d6f3355d1 Mon Sep 17 00:00:00 2001
From: Ilya Tregubov <ilya@moodle.com>
Date: Wed, 31 May 2023 17:27:57 +0800
Subject: [PATCH] MDL-77635 core_grades: Use sticky footer on import grades
 page

---
 grade/import/direct/classes/import_form.php  |  2 +-
 grade/import/direct/classes/mapping_form.php |  2 +-
 grade/import/direct/index.php                | 19 ++++++++++++++-----
 grade/import/grade_import_form.php           |  4 ++--
 grade/import/xml/index.php                   |  6 ++++--
 grade/report/user/styles.css                 |  4 ++++
 6 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/grade/import/direct/classes/import_form.php b/grade/import/direct/classes/import_form.php
index 0fbe0828d7d..71069a19113 100644
--- a/grade/import/direct/classes/import_form.php
+++ b/grade/import/direct/classes/import_form.php
@@ -74,6 +74,6 @@ class gradeimport_direct_import_form extends moodleform {
         $mform->addElement('advcheckbox', 'forceimport', get_string('forceimport', 'grades'));
         $mform->addHelpButton('forceimport', 'forceimport', 'grades');
         $mform->setDefault('forceimport', false);
-        $this->add_action_buttons(false, get_string('uploadgrades', 'grades'));
+        $this->add_sticky_action_buttons(false, get_string('uploadgrades', 'grades'));
     }
 }
diff --git a/grade/import/direct/classes/mapping_form.php b/grade/import/direct/classes/mapping_form.php
index 735fe833434..0b01c9677d5 100644
--- a/grade/import/direct/classes/mapping_form.php
+++ b/grade/import/direct/classes/mapping_form.php
@@ -112,6 +112,6 @@ class gradeimport_direct_mapping_form extends moodleform {
         $mform->addElement('hidden', 'forceimport', $this->_customdata['forceimport']);
         $mform->setType('forceimport', PARAM_BOOL);
         $mform->setConstant('forceimport', $this->_customdata['forceimport']);
-        $this->add_action_buttons(false, get_string('uploadgrades', 'grades'));
+        $this->add_sticky_action_buttons(false, get_string('uploadgrades', 'grades'));
     }
 }
diff --git a/grade/import/direct/index.php b/grade/import/direct/index.php
index c68b4dc5367..5adbc148e72 100644
--- a/grade/import/direct/index.php
+++ b/grade/import/direct/index.php
@@ -14,10 +14,19 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-require_once(__DIR__ . "/../../../config.php");
-require_once($CFG->libdir.'/gradelib.php');
-require_once($CFG->dirroot.'/grade/lib.php');
-require_once($CFG->dirroot.'/grade/import/lib.php');
+/**
+ * Page to import grades directly from a spreadsheet (Excel or Libre Office):
+ *
+ * @package   gradeimport
+ * @copyright 2007 Moodle Pty Ltd (http://moodle.com)
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once("../../../config.php");
+require_once($CFG->libdir . '/gradelib.php');
+require_once($CFG->dirroot . '/grade/lib.php');
+require_once($CFG->dirroot . '/grade/import/grade_import_form.php');
+require_once($CFG->dirroot . '/grade/import/lib.php');
 require_once($CFG->libdir . '/csvlib.class.php');
 
 $id            = required_param('id', PARAM_INT); // Course id.
@@ -124,4 +133,4 @@ if ($formdata = $mform2->get_data()) {
     // If data hasn't been submitted then display the data mapping form.
     $mform2->display();
     echo $OUTPUT->footer();
-}
\ No newline at end of file
+}
diff --git a/grade/import/grade_import_form.php b/grade/import/grade_import_form.php
index 96c766bf0b7..c1ffad6880a 100644
--- a/grade/import/grade_import_form.php
+++ b/grade/import/grade_import_form.php
@@ -80,7 +80,7 @@ class grade_import_form extends moodleform {
         $mform->setType('forceimport', PARAM_BOOL);
         $mform->addElement('hidden', 'groupid', groups_get_course_group($COURSE));
         $mform->setType('groupid', PARAM_INT);
-        $this->add_action_buttons(false, get_string('uploadgrades', 'grades'));
+        $this->add_sticky_action_buttons(false, get_string('uploadgrades', 'grades'));
     }
 }
 
@@ -165,7 +165,7 @@ class grade_import_mapping_form extends moodleform {
         $mform->addElement('hidden', 'forceimport', $this->_customdata['forceimport']);
         $mform->setType('forceimport', PARAM_BOOL);
         $mform->setConstant('forceimport', $this->_customdata['forceimport']);
-        $this->add_action_buttons(false, get_string('uploadgrades', 'grades'));
+        $this->add_sticky_action_buttons(false, get_string('uploadgrades', 'grades'));
 
     }
 }
diff --git a/grade/import/xml/index.php b/grade/import/xml/index.php
index 3cf315e5a7a..765b9281ce6 100644
--- a/grade/import/xml/index.php
+++ b/grade/import/xml/index.php
@@ -16,8 +16,10 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 require_once('../../../config.php');
-require_once('lib.php');
-require_once('grade_import_form.php');
+require_once($CFG->libdir . '/gradelib.php');
+require_once($CFG->dirroot . '/grade/lib.php');
+require_once($CFG->dirroot . '/grade/import/grade_import_form.php');
+require_once($CFG->dirroot . '/grade/import/lib.php');
 
 $id = required_param('id', PARAM_INT); // course id
 
diff --git a/grade/report/user/styles.css b/grade/report/user/styles.css
index 05335c51e98..7dc2621dc2b 100644
--- a/grade/report/user/styles.css
+++ b/grade/report/user/styles.css
@@ -185,3 +185,7 @@
         display: none;
     }
 }
+
+#fitem_id_submitbutton {
+    padding-right: 2em;
+}