diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php index f569e4d1e28..23fe6f326aa 100644 --- a/mod/glossary/editcategories.php +++ b/mod/glossary/editcategories.php @@ -69,16 +69,14 @@ require_capability('mod/glossary:managecategories', $context); $strglossaries = get_string("modulenameplural", "glossary"); $strglossary = get_string("modulename", "glossary"); -$PAGE->navbar->add($strglossaries, new moodle_url('/mod/glossary/index.php', array('id'=>$course->id))); -$PAGE->navbar->add(get_string("categories","glossary")); +$PAGE->navbar->add(get_string("categories","glossary"), + new moodle_url('/mod/glossary/editcategories.php', array('id' => $cm->id,'mode' => 'cat'))); if (!empty($action)) { $navaction = get_string($action). " " . core_text::strtolower(get_string("category","glossary")); $PAGE->navbar->add($navaction); } $PAGE->set_title($glossary->name); $PAGE->set_heading($course->fullname); -echo $OUTPUT->header(); -echo $OUTPUT->heading(format_string($glossary->name), 2); // Prepare format_string/text options $fmtoptions = array( @@ -107,6 +105,8 @@ if ( $hook >0 ) { add_to_log($course->id, "glossary", "edit category", "editcategories.php?id=$cm->id", $hook,$cm->id); } else { + echo $OUTPUT->header(); + echo $OUTPUT->heading(format_string($glossary->name), 2); echo $OUTPUT->heading(format_string(get_string("edit"). " " . get_string("category","glossary")), 3); $name = $category->name; @@ -121,14 +121,12 @@ if ( $hook >0 ) { $DB->delete_records("glossary_entries_categories", array("categoryid"=>$hook)); $DB->delete_records("glossary_categories", array("id"=>$hook)); - echo $OUTPUT->box_start('generalbox boxaligncenter errorboxcontent boxwidthnarrow'); - echo "
" . get_string("categorydeleted","glossary") ."
"; - echo $OUTPUT->box_end(); - add_to_log($course->id, "glossary", "delete category", "editcategories.php?id=$cm->id", $hook,$cm->id); - redirect("editcategories.php?id=$cm->id"); + redirect("editcategories.php?id=$cm->id", get_string("categorydeleted", "glossary"), 2); } else { + echo $OUTPUT->header(); + echo $OUTPUT->heading(format_string($glossary->name), 2); echo $OUTPUT->heading(format_string(get_string("delete"). " " . get_string("category","glossary")), 3); echo $OUTPUT->box_start('generalbox boxaligncenter errorboxcontent boxwidthnarrow'); @@ -173,13 +171,7 @@ if ( $hook >0 ) { if ( $confirm ) { $dupcategory = $DB->get_records_sql("SELECT * FROM {glossary_categories} WHERE ".$DB->sql_like('name','?', false)." AND glossaryid=?", array($name, $glossary->id)); if ( $dupcategory ) { - echo "

" . get_string("add"). " " . get_string("category","glossary"). "

"; - - echo $OUTPUT->box_start('generalbox boxaligncenter errorboxcontent boxwidthnarrow'); - echo "
" . get_string("duplicatecategory","glossary") ."
"; - echo $OUTPUT->box_end(); - - redirect("editcategories.php?id=$cm->id&action=add&name=$name"); + redirect("editcategories.php?id=$cm->id&action=add&name=$name", get_string("duplicatecategory", "glossary"), 2); } else { $action = ""; @@ -192,6 +184,8 @@ if ( $hook >0 ) { add_to_log($course->id, "glossary", "add category", "editcategories.php?id=$cm->id", $cat->id,$cm->id); } } else { + echo $OUTPUT->header(); + echo $OUTPUT->heading(format_string($glossary->name), 2); echo "

" . get_string("add"). " " . get_string("category","glossary"). "

"; $name=""; require "editcategories.html"; @@ -203,6 +197,9 @@ if ( $action ) { die; } +echo $OUTPUT->header(); +echo $OUTPUT->heading(format_string($glossary->name), 2); + ?>