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

Merge branch 'MDL-55364-master' of https://github.com/xow/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2017-08-01 11:34:18 +01:00
parent e3a2d7a473 0433d36de3
commit 2a2f7b6493
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/lib.php
+6 -4
View File
@@ -3788,14 +3788,16 @@ function forum_print_discussion_header(&$post, $forum, $group = -1, $datestring
$postuserfields = explode(',', user_picture::fields());
$postuser = username_load_fields_from_object($postuser, $post, null, $postuserfields);
$postuser->id = $post->userid;
echo '<td class="picture">';
echo '<td class="author">';
echo '<span class="picture">';
echo $OUTPUT->user_picture($postuser, array('courseid'=>$forum->course));
echo "</td>\n";
echo '</span>';
echo '<span class="name">';
// User name
$fullname = fullname($postuser, has_capability('moodle/site:viewfullnames', $modcontext));
echo '<td class="author">';
echo '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$post->userid.'&amp;course='.$forum->course.'">'.$fullname.'</a>';
echo '</span>';
echo "</td>\n";
// Group picture
@@ -5520,7 +5522,7 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions = -1, $
echo '<thead>';
echo '<tr>';
echo '<th class="header topic" scope="col">'.get_string('discussion', 'forum').'</th>';
echo '<th class="header author" colspan="2" scope="col">'.get_string('startedby', 'forum').'</th>';
echo '<th class="header author" scope="col">'.get_string('startedby', 'forum').'</th>';
if ($groupmode > 0) {
echo '<th class="header group" scope="col">'.get_string('group').'</th>';
}
theme/bootstrapbase/less/moodle/modules.less
+4 -1
View File
@@ -164,12 +164,15 @@ body.path-mod-feedback #region-main .mform.feedback_form .feedback-item-pagebrea
.topic,
.discussionsubscription,
.topic.starter,
.picture,
.author,
.replies,
.lastpost {
vertical-align: top;
}
.picture {
margin: 0 20px;
float: left;
}
.unread {
img {
margin: 0;
theme/bootstrapbase/style/moodle.css
+4 -1
View File
@@ -17177,12 +17177,15 @@ body.path-mod-feedback #region-main .mform.feedback_form .feedback-item-pagebrea
.path-mod-forum .forumheaderlist .discussion .topic,
.path-mod-forum .forumheaderlist .discussion .discussionsubscription,
.path-mod-forum .forumheaderlist .discussion .topic.starter,
.path-mod-forum .forumheaderlist .discussion .picture,
.path-mod-forum .forumheaderlist .discussion .author,
.path-mod-forum .forumheaderlist .discussion .replies,
.path-mod-forum .forumheaderlist .discussion .lastpost {
vertical-align: top;
}
.path-mod-forum .forumheaderlist .discussion .picture {
margin: 0 20px;
float: left;
}
.path-mod-forum .forumheaderlist .discussion .unread img {
margin: 0;
}