From 2f1f2d0222a23f9a6bde10a326f71552540761d9 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Thu, 3 Mar 2016 16:30:37 +0800 Subject: [PATCH] MDL-53247 adminlib: change ordering of global search setup helper Now put 'enable global search' as last step, thanks to David for the idea. --- lib/adminlib.php | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/adminlib.php b/lib/adminlib.php index eedbcea2a00..9ffb787cc67 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -9358,22 +9358,10 @@ class admin_setting_searchsetupinfo extends admin_setting { $return .= $brtag . get_string('searchsetupdescription', 'search') . $brtag . $brtag; - // Enable global search. - $row = array(); - $url = new moodle_url("/admin/search.php?query=enableglobalsearch"); - $row[0] = '1. ' . html_writer::tag('a', get_string('enableglobalsearch', 'admin'), - array('href' => $url)); - $status = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical')); - if (\core_search\manager::is_global_search_enabled()) { - $status = html_writer::tag('span', get_string('yes'), array('class' => 'statusok')); - } - $row[1] = $status; - $table->data[] = $row; - // Select a search engine. $row = array(); $url = new moodle_url('/admin/settings.php?section=manageglobalsearch#admin-searchengine'); - $row[0] = '2. ' . html_writer::tag('a', get_string('selectsearchengine', 'admin'), + $row[0] = '1. ' . html_writer::tag('a', get_string('selectsearchengine', 'admin'), array('href' => $url)); $status = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical')); @@ -9388,7 +9376,7 @@ class admin_setting_searchsetupinfo extends admin_setting { // Available areas. $row = array(); $url = new moodle_url('/admin/settings.php?section=manageglobalsearch#admin-searchengine'); - $row[0] = '3. ' . html_writer::tag('a', get_string('enablesearchareas', 'admin'), + $row[0] = '2. ' . html_writer::tag('a', get_string('enablesearchareas', 'admin'), array('href' => $url)); $status = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical')); @@ -9402,11 +9390,11 @@ class admin_setting_searchsetupinfo extends admin_setting { // Setup search engine. $row = array(); if (empty($CFG->searchengine)) { - $row[0] = '4. ' . get_string('setupsearchengine', 'admin'); + $row[0] = '3. ' . get_string('setupsearchengine', 'admin'); $row[1] = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical')); } else { $url = new moodle_url('/admin/settings.php?section=search' . $CFG->searchengine); - $row[0] = '4. ' . html_writer::tag('a', get_string('setupsearchengine', 'admin'), + $row[0] = '3. ' . html_writer::tag('a', get_string('setupsearchengine', 'admin'), array('href' => $url)); // Check the engine status. $searchengine = \core_search\manager::search_engine_instance(); @@ -9423,7 +9411,7 @@ class admin_setting_searchsetupinfo extends admin_setting { // Indexed data. $row = array(); $url = new moodle_url('/report/search/index.php#searchindexform'); - $row[0] = '5. ' . html_writer::tag('a', get_string('indexdata', 'admin'), array('href' => $url)); + $row[0] = '4. ' . html_writer::tag('a', get_string('indexdata', 'admin'), array('href' => $url)); if ($anyindexed) { $status = html_writer::tag('span', get_string('yes'), array('class' => 'statusok')); } else { @@ -9432,6 +9420,18 @@ class admin_setting_searchsetupinfo extends admin_setting { $row[1] = $status; $table->data[] = $row; + // Enable global search. + $row = array(); + $url = new moodle_url("/admin/search.php?query=enableglobalsearch"); + $row[0] = '5. ' . html_writer::tag('a', get_string('enableglobalsearch', 'admin'), + array('href' => $url)); + $status = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical')); + if (\core_search\manager::is_global_search_enabled()) { + $status = html_writer::tag('span', get_string('yes'), array('class' => 'statusok')); + } + $row[1] = $status; + $table->data[] = $row; + $return .= html_writer::table($table); return highlight($query, $return); -- 2.17.1