diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 4499e38f5d..24a8d06c34 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -6049,6 +6049,7 @@ div#chat-remote-video video { width: 100px; height: 100px; } +/* FORUM DISQUSS */ .forum-disqus{ padding: 10px; } @@ -6073,6 +6074,10 @@ div#chat-remote-video video { font-size: 14px; font-weight: 700; } +.forum-disqus .username-disqus .fa-calendar{ + color: #666666; + font-size: 14px; +} .forum-disqus .description-disqus{ font-size: 14px; line-height: 21px; @@ -6080,7 +6085,6 @@ div#chat-remote-video video { } .forum-disqus .time{ font-size: 12px; - color:rgba(0, 39, 59, 0.5); } .forum-disqus .reply-post { @@ -6093,6 +6097,8 @@ div#chat-remote-video video { } .forum-disqus .thumbnail{ padding: 0px; + width: 45px; + height: 45px; } .top-disqus{ border: 1px solid #dddddd; diff --git a/main/forum/forumfunction.inc.php b/main/forum/forumfunction.inc.php index 1f8a41da12..a58a3ececf 100755 --- a/main/forum/forumfunction.inc.php +++ b/main/forum/forumfunction.inc.php @@ -3461,18 +3461,19 @@ function display_user_link($user_id, $name, $origin = '', $in_title = '') * This function displays the user image from the profile, with a link to the user's details. * @param int User's database ID * @param str User's name + * @param array * @return string An HTML with the anchor and the image of the user * @author Julio Montoya */ -function display_user_image($user_id, $name, $origin = '') +function display_user_image($user_id, $name, $origin = '', $attributes = array()) { $userInfo = api_get_user_info($user_id); $link = ''; if ($user_id != 0) { - return $link.''.$name.''; + return $link.''.$name.''; } else { - return $link.''.$name.''; + return $link.''.$name.''; } } diff --git a/main/inc/ajax/forum.ajax.php b/main/inc/ajax/forum.ajax.php index afc05a7430..a7c904d598 100644 --- a/main/inc/ajax/forum.ajax.php +++ b/main/inc/ajax/forum.ajax.php @@ -268,6 +268,7 @@ if (!empty($action)) { ) ) ); + $template->assign('locked', $locked); $template->assign('allow_reply', $allowReply); $template->assign('thread_id', $thread->getThreadId()); @@ -279,7 +280,7 @@ if (!empty($action)) { 'text' => $post->getPostText() ], 'user' => [ - 'image' => display_user_image($user->getId(), $user->getCompleteName()), + 'image' => display_user_image($user->getId(), $user->getCompleteName(),null,array('class'=>'media-object')), 'link' => display_user_link($user->getId(), $user->getCompleteName()), ] ]); diff --git a/main/template/games/forum/flat_learnpath.tpl b/main/template/games/forum/flat_learnpath.tpl index f7fd3f09a6..98518df9a5 100644 --- a/main/template/games/forum/flat_learnpath.tpl +++ b/main/template/games/forum/flat_learnpath.tpl @@ -60,6 +60,7 @@ if (post.parentId > 0) { $('[data-post="' + post.parentId +'"] > .media-body').append(post.html); + $(".timeago").timeago(); } else { $(post.html).insertBefore('#form-reply-to-post-0'); } diff --git a/main/template/games/forum/flat_learnpath_post.tpl b/main/template/games/forum/flat_learnpath_post.tpl index f59278e3ef..e49000489b 100644 --- a/main/template/games/forum/flat_learnpath_post.tpl +++ b/main/template/games/forum/flat_learnpath_post.tpl @@ -11,7 +11,6 @@ {{ post_data.post.date }} -
{{ post_data.post.text }}