Permalink
Browse files

MDL-31647 Glossary: Links to glossary entries from glossary main page…

… should not be popups
  • Loading branch information...
1 parent e0d5a17 commit bb771fc43b373a0bde9fdf4c3471056fdf38455c @sammarshallou sammarshallou committed Feb 15, 2012
Showing with 5 additions and 17 deletions.
  1. +3 −4 mod/glossary/formats/entrylist/entrylist_format.php
  2. +2 −13 mod/glossary/showentry.php
@@ -14,10 +14,9 @@ function glossary_show_entry_entrylist($course, $cm, $glossary, $entry, $mode=''
$anchortagcontents = glossary_print_entry_concept($entry, true);
- $link = "/mod/glossary/showentry.php?courseid={$course->id}&eid={$entry->id}&displayformat=dictionary";
- $action = new popup_action('click', $link.'&popup=1', 'entry',array('title'=>'entry','width'=>600,'height'=>450));
-
- $anchor = $OUTPUT->action_link($link, $anchortagcontents, $action);
+ $link = new moodle_url('/mod/glossary/showentry.php', array('courseid' => $course->id,
+ 'eid' => $entry->id, 'displayformat' => 'dictionary'));
+ $anchor = html_writer::link($link, $anchortagcontents);
echo "<div class=\"concept\">$anchor</div> ";
echo '</td><td align="right" class="entrylowersection">';
View
@@ -7,7 +7,6 @@
$courseid = optional_param('courseid', 0, PARAM_INT);
$eid = optional_param('eid', 0, PARAM_INT); // glossary entry id
$displayformat = optional_param('displayformat',-1, PARAM_SAFEDIR);
-$popup = optional_param('popup',0, PARAM_INT);
$url = new moodle_url('/mod/glossary/showentry.php');
$url->param('concept', $concept);
@@ -40,11 +39,7 @@
print_error('invalidelementid');
}
-if ($popup) {
- $PAGE->set_pagelayout('popup');
-} else {
- $PAGE->set_pagelayout('course');
-}
+$PAGE->set_pagelayout('course');
if ($entries) {
foreach ($entries as $key => $entry) {
@@ -65,9 +60,7 @@
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);
}
}
@@ -91,9 +84,5 @@
glossary_print_dynaentry($courseid, $entries, $displayformat);
}
-if ($popup) {
- echo $OUTPUT->close_window_button();
-}
-
/// Show one reduced footer
echo $OUTPUT->footer();

0 comments on commit bb771fc

Please sign in to comment.