Merge branch 'MDL-65876-master' of https://github.com/lucaboesch/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2019-10-01 00:07:30 +02:00
commit 12c377bbb6
2 changed files with 7 additions and 20 deletions

View File

@ -48,15 +48,17 @@ class mod_forum_renderer extends plugin_renderer_base {
if ($prev) {
$url = new moodle_url('/mod/forum/discuss.php', array('d' => $prev->id));
$html .= html_writer::start_tag('li', array('class' => 'prev-discussion'));
$html .= html_writer::link($url, format_string($prev->name),
array('aria-label' => get_string('prevdiscussiona', 'mod_forum', format_string($prev->name))));
$html .= html_writer::link($url, $this->output->larrow() . ' ' . format_string($prev->name),
array('aria-label' => get_string('prevdiscussiona', 'mod_forum', format_string($prev->name)),
'class' => 'btn btn-link'));
$html .= html_writer::end_tag('li');
}
if ($next) {
$url = new moodle_url('/mod/forum/discuss.php', array('d' => $next->id));
$html .= html_writer::start_tag('li', array('class' => 'next-discussion'));
$html .= html_writer::link($url, format_string($next->name),
array('aria-label' => get_string('nextdiscussiona', 'mod_forum', format_string($next->name))));
$html .= html_writer::link($url, format_string($next->name) . ' ' . $this->output->rarrow(),
array('aria-label' => get_string('nextdiscussiona', 'mod_forum', format_string($next->name)),
'class' => 'btn btn-link'));
$html .= html_writer::end_tag('li');
}
$html .= html_writer::end_tag('ul');

View File

@ -273,22 +273,7 @@ span.unread {
.path-mod-forum .discussion-nav ul {
margin: 0;
list-style: none;
}
.path-mod-forum .discussion-nav .prev-discussion:before {
/*rtl:raw:
content: ' ► ';
*/
/*rtl:remove*/
content: ' ◄ ';
}
.path-mod-forum .discussion-nav .next-discussion:after {
/*rtl:raw:
content: ' ◄ ';
*/
/*rtl:remove*/
content: ' ► ';
padding-left: 0;
}
.path-mod-forum .discussion-nav .next-discussion {