glossary MDL-23369 unnecessary elements when displaying glossary entries in a popup

This commit is contained in:
Andrew Davis 2010-07-19 02:57:18 +00:00
parent 47d0b1d535
commit 6528fe6b32
2 changed files with 10 additions and 2 deletions

View file

@ -40,6 +40,10 @@ if ($eid) {
print_error('invalidelementid'); print_error('invalidelementid');
} }
if ($popup) {
$PAGE->set_pagelayout('popup');
}
if ($entries) { if ($entries) {
foreach ($entries as $key => $entry) { foreach ($entries as $key => $entry) {
// Need to get the course where the entry is, // Need to get the course where the entry is,
@ -59,7 +63,9 @@ if ($entries) {
continue; continue;
} }
} }
if (!$popup) {
$entries[$key]->footer = "<p style=\"text-align:right\">&raquo;&nbsp;<a href=\"$CFG->wwwroot/mod/glossary/view.php?g=$entry->glossaryid\">".format_string($entry->glossaryname,true)."</a></p>"; $entries[$key]->footer = "<p style=\"text-align:right\">&raquo;&nbsp;<a href=\"$CFG->wwwroot/mod/glossary/view.php?g=$entry->glossaryid\">".format_string($entry->glossaryname,true)."</a></p>";
}
add_to_log($entry->courseid, 'glossary', 'view entry', "showentry.php?eid=$entry->id", $entry->id, $entry->cmid); add_to_log($entry->courseid, 'glossary', 'view entry', "showentry.php?eid=$entry->id", $entry->id, $entry->cmid);
} }
} }

View file

@ -25,3 +25,5 @@
#page-mod-glossary-view table.glossarycategoryheader {margin-bottom:0em;} #page-mod-glossary-view table.glossarycategoryheader {margin-bottom:0em;}
#page-mod-glossary-view table.glossarycategoryheader th {padding:0px;} #page-mod-glossary-view table.glossarycategoryheader th {padding:0px;}
#page-mod-glossary-showentry #page-content {min-width:600px;}