diff --git a/search/indexersplash.php b/search/indexersplash.php index 916a3ef6da35e..94c8c296202d6 100644 --- a/search/indexersplash.php +++ b/search/indexersplash.php @@ -45,12 +45,14 @@ $strquery = get_string('stats'); // print page header - $navlinks[] = array('name' => $strsearch, 'link' => "index.php", 'type' => 'misc'); - $navlinks[] = array('name' => $strquery, 'link' => "stats.php", 'type' => 'misc'); - $navlinks[] = array('name' => get_string('runindexer','search'), 'link' => null, 'type' => 'misc'); - $navigation = build_navigation($navlinks); $site = get_site(); - print_header("$strsearch", "$site->fullname" , $navigation, "", "", true, " ", navmenu($site)); + + $PAGE->navbar->add($strsearch, new moodle_url($CFG->wwwroot.'/search/index.php')); + $PAGE->navbar->add($strquery, new moodle_url($CFG->wwwroot.'/search/stats.php')); + $PAGE->navbar->add(get_string('runindexer','search')); + $PAGE->set_title($strsearch); + $PAGE->set_heading($site->fullname); + echo $OUTPUT->header(); mtrace("
The data directory ($indexinfo->path) contains $indexinfo->filecount files, and\n" ."there are ".$indexinfo->dbcount." records in the block_search_documents table.\n" diff --git a/search/query.php b/search/query.php index 55253859e319f..6182fd169776a 100644 --- a/search/query.php +++ b/search/query.php @@ -157,11 +157,13 @@ $strquery = get_string('enteryoursearchquery', 'search'); // print the header - $navlinks[] = array('name' => $strsearch, 'link' => "index.php", 'type' => 'misc'); - $navlinks[] = array('name' => $strquery, 'link' => null, 'type' => 'misc'); - $navigation = build_navigation($navlinks); $site = get_site(); - print_header("$strsearch", "$site->fullname" , $navigation, '', '', true, ' ', navmenu($site)); + + $PAGE->navbar->add($strsearch, new moodle_url($CFG->wwwroot.'/search/index.php')); + $PAGE->navbar->add($strquery, new moodle_url($CFG->wwwroot.'/search/stats.php')); + $PAGE->set_title($strsearch); + $PAGE->set_heading($site->fullname); + echo $OUTPUT->header(); if (!empty($error)){ notice ($error); diff --git a/search/stats.php b/search/stats.php index 995929ace3281..88bc62c17c6aa 100644 --- a/search/stats.php +++ b/search/stats.php @@ -44,11 +44,13 @@ $strsearch = get_string('search', 'search'); $strquery = get_string('statistics', 'search'); - $navlinks[] = array('name' => $strsearch, 'link' => "index.php", 'type' => 'misc'); - $navlinks[] = array('name' => $strquery, 'link' => null, 'type' => 'misc'); - $navigation = build_navigation($navlinks); $site = get_site(); - print_header("$strsearch", "$site->fullname" , $navigation, '', '', true, ' ', navmenu($site)); + + $PAGE->navbar->add($strsearch, new moodle_url($CFG->wwwroot.'/search/index.php')); + $PAGE->navbar->add($strquery, new moodle_url($CFG->wwwroot.'/search/stats.php')); + $PAGE->set_title($strsearch); + $PAGE->set_heading($site->fullname); + echo $OUTPUT->header(); /// keep things pretty, even if php5 isn't available