Issue #13 - Removed continue button from info page. Link to outage in warning bar opens in new tab.

This commit is contained in:
Daniel Thee Roperto
2016-09-08 14:43:45 +10:00
parent a4de5d6bf1
commit 54e6c40565
3 changed files with 3 additions and 51 deletions

View File

@@ -1,43 +0,0 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
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 <daniel.roperto@catalyst-au.net>
* @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'));
}
}

View File

@@ -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();

View File

@@ -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'
),