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

MDL-32325 Glossary: Entrylist print version is XHTML compliant

Browse Source
This commit is contained in:
Frederic Massart
2012-06-06 13:17:26 +08:00
parent fbbb4cc708
commit d1e6d47f1a
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/glossary/formats/entrylist/entrylist_format.php
+13 -13
View File
@@ -42,25 +42,25 @@ function glossary_show_entry_entrylist($course, $cm, $glossary, $entry, $mode=''
}
function glossary_print_entry_entrylist($course, $cm, $glossary, $entry, $mode='', $hook='', $printicons=1) {
//The print view for this format is different from the normal view, so we implement it here completely
global $CFG, $USER;
//Take out autolinking in definitions un print view
// TODO use <nolink> tags MDL-15555.
$entry->definition = '<span class="nolink">'.$entry->definition.'</span>';
echo '<table class="glossarypost entrylist">';
echo '<tr valign="top">';
echo '<td class="entry">';
echo '<b>';
echo html_writer::start_tag('table', array('class' => 'glossarypost entrylist mod-glossary-entrylist'));
echo html_writer::start_tag('tr');
echo html_writer::start_tag('td', array('class' => 'entry mod-glossary-entry'));
echo html_writer::start_tag('div', array('class' => 'mod-glossary-concept'));
glossary_print_entry_concept($entry);
echo ':</b> ';
echo html_writer::end_tag('div');
echo html_writer::start_tag('div', array('class' => 'mod-glossary-definition'));
glossary_print_entry_definition($entry, $glossary, $cm);
echo html_writer::end_tag('div');
echo html_writer::start_tag('div', array('class' => 'mod-glossary-lower-section'));
glossary_print_entry_lower_section($course, $cm, $glossary, $entry, $mode, $hook, false, false);
echo '</td>';
echo '</tr>';
echo "</table>\n";
echo html_writer::end_tag('div');
echo html_writer::end_tag('td');
echo html_writer::end_tag('tr');
echo html_writer::end_tag('table');
}
mod/glossary/lib.php
+3 -3
View File
@@ -971,9 +971,8 @@ function glossary_print_entry_default ($entry, $glossary, $cm) {
*/
function glossary_print_entry_concept($entry, $return=false) {
global $OUTPUT;
$options = new stdClass();
$options->para = false;
$text = format_text($OUTPUT->heading('<span class="nolink">' . $entry->concept . '</span>', 3, 'nolink'), FORMAT_MOODLE, $options);
$text = html_writer::tag('h3', format_string($entry->concept));
if (!empty($entry->highlight)) {
$text = highlight($entry->highlight, $text);
}
@@ -1015,6 +1014,7 @@ function glossary_print_entry_definition($entry, $glossary, $cm) {
$options->trusted = $entry->definitiontrust;
$options->context = $context;
$options->overflowdiv = true;
$text = format_text($definition, $entry->definitionformat, $options);
// Stop excluding concepts from autolinking
mod/glossary/styles.css
+2
View File
@@ -27,3 +27,5 @@
#page-mod-glossary-view table.glossarycategoryheader th {padding:0px;}
#page-mod-glossary-showentry #page-content {min-width:600px;}
#page-mod-glossary-print .mod-glossary-entrylist .mod-glossary-entry { vertical-align: top; }