From 54e6c405652e3b8bee2fd6c7abaa4e06badb8b98 Mon Sep 17 00:00:00 2001 From: Daniel Thee Roperto Date: Thu, 8 Sep 2016 14:43:45 +1000 Subject: [PATCH] Issue #13 - Removed continue button from info page. Link to outage in warning bar opens in new tab. --- classes/forms/gohome.php | 43 ---------------------------------------- info.php | 7 ------- renderer.php | 4 +++- 3 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 classes/forms/gohome.php diff --git a/classes/forms/gohome.php b/classes/forms/gohome.php deleted file mode 100644 index a457ca5..0000000 --- a/classes/forms/gohome.php +++ /dev/null @@ -1,43 +0,0 @@ -. - -namespace auth_outage\forms; - -if (!defined('MOODLE_INTERNAL')) { - die('Direct access to this script is forbidden.'); // It must be included from a Moodle page. -} - -require_once($CFG->libdir . '/formslib.php'); - -/** - * Home form. Shows a button 'Continue' and moves to home page once clicked. - * - * @package auth_outage - * @author Daniel Thee Roperto - * @copyright Catalyst IT - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ -class gohome extends \moodleform { - const TITLE_MAX_CHARS = 100; - - /** - * {@inheritDoc} - * @see moodleform::definition() - */ - public function definition() { - $this->add_action_buttons(false, get_string('continue')); - } -} \ No newline at end of file diff --git a/info.php b/info.php index 73783f4..4fca52b 100644 --- a/info.php +++ b/info.php @@ -38,15 +38,8 @@ $PAGE->set_title("Outage Warning"); $PAGE->set_heading("Outage Warning"); $PAGE->set_url(new \moodle_url('/auth/outage/info.php')); -$mform = new \auth_outage\forms\gohome(); -if ($mform->get_data()) { - redirect(new moodle_url('/')); -} - - echo $OUTPUT->header(); echo outagelib::get_renderer()->renderoutagepage($outage); -$mform->display(); echo $OUTPUT->footer(); diff --git a/renderer.php b/renderer.php index 3f76b52..0b9f8ab 100644 --- a/renderer.php +++ b/renderer.php @@ -160,7 +160,9 @@ class auth_outage_renderer extends plugin_renderer_base { . html_writer::div( $message . ' ' . html_writer::tag('small', - '[' . html_writer::link(new moodle_url('/auth/outage/info.php'), 'more') . ']' + '[' . html_writer::link( + new moodle_url('/auth/outage/info.php'), 'more', ['target' => 'outage'] + ) . ']' ), 'auth_outage_warningbar_box_message' ),