mirror of
https://github.com/moodle/moodle.git
synced 2025-01-18 05:58:34 +01:00
Merge branch 'MDL-60181-master' of git://github.com/mihailges/moodle
This commit is contained in:
commit
863d7ca5aa
@ -25,7 +25,7 @@ function glossary_show_entry_entrylist($course, $cm, $glossary, $entry, $mode=''
|
||||
}
|
||||
if (!empty($entry->rating)) {
|
||||
echo '<br />';
|
||||
echo '<span class="ratings">';
|
||||
echo '<span class="ratings d-block p-t-1">';
|
||||
$return = glossary_print_entry_ratings($course, $entry);
|
||||
echo '</span>';
|
||||
}
|
||||
@ -37,7 +37,8 @@ function glossary_show_entry_entrylist($course, $cm, $glossary, $entry, $mode=''
|
||||
}
|
||||
echo '</td></tr>';
|
||||
|
||||
echo "</table>\n";
|
||||
echo "</table>";
|
||||
echo "<hr>\n";
|
||||
return $return;
|
||||
}
|
||||
|
||||
|
@ -1329,7 +1329,6 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h
|
||||
$return .= '<div>'.$comment->output(true).'</div>';
|
||||
$output = true;
|
||||
}
|
||||
$return .= '<hr>';
|
||||
|
||||
//If we haven't calculated any REAL thing, delete result ($return)
|
||||
if (!$output) {
|
||||
@ -1373,11 +1372,12 @@ function glossary_print_entry_lower_section($course, $cm, $glossary, $entry, $m
|
||||
echo '<tr valign="top"><td class="icons">'.$icons.'</td></tr>';
|
||||
}
|
||||
if (!empty($entry->rating)) {
|
||||
echo '<tr valign="top"><td class="ratings">';
|
||||
echo '<tr valign="top"><td class="ratings p-t-1">';
|
||||
glossary_print_entry_ratings($course, $entry);
|
||||
echo '</td></tr>';
|
||||
}
|
||||
echo '</table>';
|
||||
echo "<hr>\n";
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user