From 6a80186ebbd345fb76ae213812dfaa4d99ba20ff Mon Sep 17 00:00:00 2001 From: Mathew May Date: Wed, 13 Feb 2019 14:20:23 +0800 Subject: [PATCH] MDL-58428 renderer: Move renderer override from blocks --- blocks/settings/renderer.php | 14 ++++++------- .../output/block_settings_renderer.php | 20 ++++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) rename theme/{boost => bootstrapbase}/classes/output/block_settings_renderer.php (60%) diff --git a/blocks/settings/renderer.php b/blocks/settings/renderer.php index 34e99ef7d93..bceefd8a5d8 100644 --- a/blocks/settings/renderer.php +++ b/blocks/settings/renderer.php @@ -143,14 +143,12 @@ class block_settings_renderer extends plugin_renderer_base { } public function search_form(moodle_url $formtarget, $searchvalue) { - $content = html_writer::start_tag('form', array('class'=>'adminsearchform', 'method'=>'get', 'action'=>$formtarget, 'role' => 'search')); - $content .= html_writer::start_tag('div'); - $content .= html_writer::tag('label', s(get_string('searchinsettings', 'admin')), array('for'=>'adminsearchquery', 'class'=>'accesshide')); - $content .= html_writer::empty_tag('input', array('id'=>'adminsearchquery', 'type'=>'text', 'name'=>'query', 'value'=>s($searchvalue))); - $content .= html_writer::empty_tag('input', array('type'=>'submit', 'value'=>s(get_string('search')))); - $content .= html_writer::end_tag('div'); - $content .= html_writer::end_tag('form'); - return $content; + $data = [ + 'action' => $formtarget->out(false), + 'label' => get_string('searchinsettings', 'admin'), + 'searchvalue' => $searchvalue + ]; + return $this->render_from_template('block_settings/search_form', $data); } } diff --git a/theme/boost/classes/output/block_settings_renderer.php b/theme/bootstrapbase/classes/output/block_settings_renderer.php similarity index 60% rename from theme/boost/classes/output/block_settings_renderer.php rename to theme/bootstrapbase/classes/output/block_settings_renderer.php index 17554f03882..d1c4cb3fee9 100644 --- a/theme/boost/classes/output/block_settings_renderer.php +++ b/theme/bootstrapbase/classes/output/block_settings_renderer.php @@ -17,12 +17,12 @@ /** * Overriden block settings renderer. * - * @package theme_boost + * @package theme_bootstrapbase * @copyright 2016 Frédéric Massart - FMCorz.net * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace theme_boost\output; +namespace theme_bootstrapbase\output; defined('MOODLE_INTERNAL') || die(); require_once($CFG->dirroot . '/blocks/settings/renderer.php'); @@ -32,19 +32,21 @@ use moodle_url; /** * Overriden block settings renderer. * - * @package theme_boost + * @package theme_bootstrapbase * @copyright 2016 Frédéric Massart - FMCorz.net * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ class block_settings_renderer extends \block_settings_renderer { public function search_form(moodle_url $formtarget, $searchvalue) { - $data = [ - 'action' => $formtarget->out(false), - 'label' => get_string('searchinsettings', 'admin'), - 'searchvalue' => $searchvalue - ]; - return $this->render_from_template('block_settings/search_form', $data); + $content = html_writer::start_tag('form', array('class'=>'adminsearchform', 'method'=>'get', 'action'=>$formtarget, 'role' => 'search')); + $content .= html_writer::start_tag('div'); + $content .= html_writer::tag('label', s(get_string('searchinsettings', 'admin')), array('for'=>'adminsearchquery', 'class'=>'accesshide')); + $content .= html_writer::empty_tag('input', array('id'=>'adminsearchquery', 'type'=>'text', 'name'=>'query', 'value'=>s($searchvalue))); + $content .= html_writer::empty_tag('input', array('type'=>'submit', 'value'=>s(get_string('search')))); + $content .= html_writer::end_tag('div'); + $content .= html_writer::end_tag('form'); + return $content; } } -- 2.17.1