moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-40759 fontawesome: Fix bugs from rebase

Browse source
This commit is contained in:
Damyon Wiese 2017-03-17 09:57:03 +08:00
parent c8d0efc332
commit 07171e831e
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
comment/lib.php
View file

@ -220,7 +220,7 @@ class comment {
// load template // load template
$this->template = html_writer::start_tag('div', array('class' => 'comment-message')); $this->template = html_writer::start_tag('div', array('class' => 'comment-message'));
$this->template .= html_writer::start_tag('div', array('class' => 'comment-message-meta')); $this->template .= html_writer::start_tag('div', array('class' => 'comment-message-meta m-r-3'));
$this->template .= html_writer::tag('span', '___picture___', array('class' => 'picture')); $this->template .= html_writer::tag('span', '___picture___', array('class' => 'picture'));
$this->template .= html_writer::tag('span', '___name___', array('class' => 'user')) . ' - '; $this->template .= html_writer::tag('span', '___name___', array('class' => 'user')) . ' - ';
@ -264,6 +264,7 @@ class comment {
'commentscount', 'commentscount',
'commentsrequirelogin', 'commentsrequirelogin',
'deletecommentbyon', 'deletecommentbyon',
'deletecomment',
), ),
'moodle' 'moodle'
); );
@ -577,7 +578,7 @@ class comment {
$c->content = $u->ccontent; $c->content = $u->ccontent;
$c->format = $u->cformat; $c->format = $u->cformat;
$c->timecreated = $u->ctimecreated; $c->timecreated = $u->ctimecreated;
$c->strftimeformat = get_string('strftimerecentfull', 'langconfig'); $c->strftimeformat = get_string('strftimerecent', 'langconfig');
$url = new moodle_url('/user/view.php', array('id'=>$u->id, 'course'=>$this->courseid)); $url = new moodle_url('/user/view.php', array('id'=>$u->id, 'course'=>$this->courseid));
$c->profileurl = $url->out(false); // URL should not be escaped just yet. $c->profileurl = $url->out(false); // URL should not be escaped just yet.
$c->fullname = fullname($u); $c->fullname = fullname($u);

2
theme/boost/templates/core/action_menu_trigger.mustache
View file

@ -17,7 +17,7 @@
{{! {{!
Action menu trigger. Action menu trigger.
}} }}
<span class="dropdown"> <div class="dropdown d-inline">
<a href="#" class="dropdown-toggle" id="dropdown-{{instance}}" title="{{title}}" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{{actiontext}}}{{{menutrigger}}}{{#icon}}{{#pix}}{{key}},{{component}},{{title}}{{/pix}}{{/icon}}{{#rawicon}}{{{.}}}{{/rawicon}}{{#menutrigger}}<b class="caret"></b>{{/menutrigger}}</a> <a href="#" class="dropdown-toggle" id="dropdown-{{instance}}" title="{{title}}" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{{actiontext}}}{{{menutrigger}}}{{#icon}}{{#pix}}{{key}},{{component}},{{title}}{{/pix}}{{/icon}}{{#rawicon}}{{{.}}}{{/rawicon}}{{#menutrigger}}<b class="caret"></b>{{/menutrigger}}</a>
{{#secondary}} {{#secondary}}
<div class="dropdown-menu dropdown-menu-right {{classes}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}}> <div class="dropdown-menu dropdown-menu-right {{classes}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}}>