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

Merge branch 'MDL-60181-34' of git://github.com/mihailges/moodle into MOODLE_34_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2018-01-22 12:51:29 +01:00
parent e4fac0f267 1bd8a0a2aa
commit 6d05b0db52
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/glossary/formats/entrylist/entrylist_format.php
+3 -2
View File
@@ -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;
}
mod/glossary/lib.php
+2 -2
View File
@@ -1325,7 +1325,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) {
@@ -1369,11 +1368,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";
}
}