Now the add/update entry page XHTML validates and doesn't show

the tabs and intro anymore.

Merged from MOODLE_18_STABLE

diff --git a/mod/glossary/edit.php b/mod/glossary/edit.php
index e2656ad14bbfdc01c1c5a176e89bb2cbb8cc79f6..0e44b8bee6872826a026a6ad4e426828641fbcea 100644 (file)
--- a/mod/glossary/edit.php
+++ b/mod/glossary/edit.php
@@ -190,7 +190,7 @@ if ($mform->is_cancelled()){
 
 $strglossary = get_string("modulename", "glossary");
 $strglossaries = get_string("modulenameplural", "glossary");
-$stredit = get_string("edit");
+$stredit = empty($e) ? get_string('addentry', 'glossary') : get_string("edit");
 
 
 print_header_simple(format_string($glossary->name), "",
@@ -204,15 +204,13 @@ print_heading(format_string($glossary->name));
 
 /// Info box
 
-if ( $glossary->intro ) {
-    print_simple_box(format_text($glossary->intro), 'center', '70%', '', 5, 'generalbox', 'intro');
-}
-
-echo '<br />';
+///if ( $glossary->intro ) {
+///    print_simple_box(format_text($glossary->intro), 'center', '70%', '', 5, 'generalbox', 'intro');
+///}
 
 /// Tabbed browsing sections
-$tab = GLOSSARY_ADDENTRY_VIEW;
-include("tabs.php");
+///$tab = GLOSSARY_ADDENTRY_VIEW;
+///include("tabs.php");
 
 if (!$e) {
     require_capability('mod/glossary:write', $context);
@@ -220,7 +218,7 @@ if (!$e) {
 
 $mform->display();
 
-glossary_print_tabbed_table_end();
+///glossary_print_tabbed_table_end();
 
 
 print_footer($course);