Skip to content
Permalink
Browse files

MDL-40734 mod_glossary: cleaned up some headings

  • Loading branch information...
andyjdavis authored and danpoltawski committed Aug 26, 2013
1 parent 8eb80a2 commit e5d932cce2dde105346a16484cee17dc010212a5
Showing with 15 additions and 9 deletions.
  1. +4 −1 mod/glossary/edit.php
  2. +3 −2 mod/glossary/editcategories.php
  3. +1 −0 mod/glossary/index.php
  4. +3 −3 mod/glossary/lib.php
  5. +2 −2 mod/glossary/tabs.php
  6. +2 −1 mod/glossary/view.php
@@ -185,7 +185,10 @@
$PAGE->set_title(format_string($glossary->name));
$PAGE->set_heading($course->fullname);
echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($glossary->name));
echo $OUTPUT->heading(format_string($glossary->name), 2);
if ($glossary->intro) {
echo $OUTPUT->box(format_module_intro('glossary', $glossary, $cm->id), 'generalbox', 'intro');
}
$mform->display();
@@ -78,6 +78,7 @@
$PAGE->set_title(format_string($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(
@@ -106,7 +107,7 @@
add_to_log($course->id, "glossary", "edit category", "editcategories.php?id=$cm->id", $hook,$cm->id);
} else {
echo "<h3 class=\"main\">" . get_string("edit"). " " . get_string("category","glossary") . "</h3>";
echo $OUTPUT->heading(format_string(get_string("edit"). " " . get_string("category","glossary")), 3);
$name = $category->name;
$usedynalink = $category->usedynalink;
@@ -128,7 +129,7 @@
redirect("editcategories.php?id=$cm->id");
} else {
echo "<p>" . get_string("delete"). " " . get_string("category","glossary"). "</p>";
echo $OUTPUT->heading(format_string(get_string("delete"). " " . get_string("category","glossary")), 3);
echo $OUTPUT->box_start('generalbox boxaligncenter errorboxcontent boxwidthnarrow');
echo "<div class=\"boxaligncenter deletecatconfirm\">".format_string($category->name, true, $fmtoptions)."<br/>";
@@ -35,6 +35,7 @@
$PAGE->set_title($strglossarys);
$PAGE->set_heading($course->fullname);
echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($strglossarys), 2);
/// Get all the appropriate data
@@ -1085,7 +1085,7 @@ function glossary_print_entry_default ($entry, $glossary, $cm) {
require_once($CFG->libdir . '/filelib.php');
echo '<h3>'. strip_tags($entry->concept) . ': </h3>';
echo $OUTPUT->heading(strip_tags($entry->concept), 4);
$definition = $entry->definition;
@@ -1105,13 +1105,13 @@ function glossary_print_entry_default ($entry, $glossary, $cm) {
}
/**
* Print glossary concept/term as a heading &lt;h3>
* Print glossary concept/term as a heading &lt;h4>
* @param object $entry
*/
function glossary_print_entry_concept($entry, $return=false) {
global $OUTPUT;
$text = html_writer::tag('h3', format_string($entry->concept));
$text = $OUTPUT->heading(format_string($entry->concept), 4);
if (!empty($entry->highlight)) {
$text = highlight($entry->highlight, $text);
}
@@ -102,9 +102,9 @@
default:
glossary_print_alphabet_menu($cm, $glossary, "letter", $hook, $sortkey, $sortorder);
if ($mode == 'search' and $hook) {
echo "<h3>$strsearch: $hook</h3>";
echo html_writer::tag('div', "$strsearch: $hook");
}
break;
}
echo '<hr />';
echo html_writer::empty_tag('hr');
?>
@@ -263,6 +263,7 @@
} else { /// Print standard header
echo $OUTPUT->header();
}
echo $OUTPUT->heading(format_string($glossary->name), 2);
/// All this depends if whe have $showcommonelements
if ($showcommonelements) {
@@ -449,7 +450,7 @@
echo '<th >';
}
echo $OUTPUT->heading($pivottoshow);
echo $OUTPUT->heading($pivottoshow, 3);
echo "</th></tr></table></div>\n";
}

0 comments on commit e5d932c

Please sign in to comment.
You can’t perform that action at this time.