L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-31647-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2012-02-20 11:54:30 +13:00
parent 11a3fcb1be ac98193cf3
commit bc392be2a8
2 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/glossary/formats/entrylist/entrylist_format.php
+3 -4
View File
@@ -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">';
mod/glossary/showentry.php
+2 -13
View File
@@ -7,7 +7,6 @@ $concept = optional_param('concept', '', PARAM_CLEAN);
$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 @@ if ($eid) {
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 @@ if ($entries) {
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);
}
}
@@ -89,9 +82,5 @@ if ($entries) {
glossary_print_dynaentry($courseid, $entries, $displayformat);
}
if ($popup) {
echo $OUTPUT->close_window_button();
}
/// Show one reduced footer
echo $OUTPUT->footer();