chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix tpl post blog - refs BT#12324

Browse Source
pull/2487/head
aragonc 9 years ago
parent afd7217399
commit d07603cc17
4 changed files with 139 additions and 60 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 17
      app/Resources/public/css/base.css
  2. 3
      main/blog/blog.php
  3. 133
      main/inc/lib/blog.lib.php
  4. 40
      main/template/default/blog/post.tpl

17
app/Resources/public/css/base.css
Unescape View File

@ -5999,7 +5999,22 @@ ul#toolnavbox-two li a.btn{
.blog .article-post{
margin-bottom: 20px;
margin-top: 10px;
}
.blog .media .avatar{
width: 70px;
}
.blog .comments-post{
margin-top: 20px;
margin-bottom: 20px;
}
.blog .comments-post .title{
padding-bottom: 20px;
}
.blog .comments-post .media{
border-top: 1px solid #eaeaea;
padding-bottom: 10px;
padding-top: 10px;
margin-bottom: 10px;
}
/* CSS NEW TOP ******************************************************************************/
/* CSS Responsive */

3
main/blog/blog.php
Unescape View File

@ -12,6 +12,7 @@ $blog_id = intval($_GET['blog_id']);
if (empty($blog_id)) {
api_not_allowed(true);
}
$tpl = new Template(get_lang('Blog'));
$this_section = SECTION_COURSES;
$current_course_tool = TOOL_BLOGS;
@ -351,7 +352,6 @@ if (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) {
$user_task = true;
}
$tpl = new Template(get_lang('Blog'));
$tpl->assign('title', $titleBlog);
$tpl->assign('description', $descriptionBlog);
$tpl->assign('id_blog', $idBlog);
@ -479,4 +479,3 @@ $tpl->display($blogLayout);
// Display the footer
Display::display_footer();
?>

133
main/inc/lib/blog.lib.php
Unescape View File

@ -983,12 +983,13 @@ class Blog
WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND post_id = '".(int)$post_id."'";
$result = Database::query($sql);
$blog_post_comments = Database::fetch_array($result);
$blogActions = null;
$task_id = (isset($_GET['task_id']) && is_numeric($_GET['task_id'])) ? intval($_GET['task_id']) : 0;
// Display comments if there are any
if($blog_post_comments['number_of_comments'] > 0) {
$commentsHtml = Blog::get_threaded_comments(0, 0, $blog_id, $post_id, $task_id);
$listComments = Blog::get_threaded_comments(0, 0, $blog_id, $post_id, $task_id);
}
// Display comment form
if (api_is_allowed('BLOG_' . $blog_id, 'article_comments_add')) {
@ -996,6 +997,26 @@ class Blog
}
// Prepare data
$fileArray = get_blog_attachment($blog_id, $post_id);
$post_text = make_clickable(stripslashes($blog_post['full_text']));
$post_text = stripslashes($post_text);
if (api_is_allowed('BLOG_' . $blog_id, 'article_edit', $task_id)) {
$blogActions .= '<a class="btn btn-default" href="blog.php?action=edit_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('EditThisPost') . '">';
$blogActions .= Display::return_icon('edit.png',get_lang('Edit'), null, ICON_SIZE_TINY);
$blogActions .= '</a>';
}
if (api_is_allowed('BLOG_' . $blog_id, 'article_delete', $task_id)) {
$blogActions .= '<a class="btn btn-default" href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_article&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisArticle') . '" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;">';
$blogActions .= Display::return_icon('delete.png', get_lang('Delete'), null, ICON_SIZE_TINY);
$blogActions .= '</a>';
}
if (api_is_allowed('BLOG_' . $blog_id, 'article_rate')){
$ratingSelect = Blog::display_rating_form('post',$blog_id,$post_id);
}
$article = [
'id_blog' => $blog_post['blog_id'],
'c_id' => $blog_post['c_id'],
@ -1005,34 +1026,16 @@ class Blog
'username' => $blog_post['username'],
'title' => stripslashes($blog_post['title']),
'extract' => api_get_short_text_from_html(stripslashes($blog_post['full_text']),400),
'content' => stripslashes($blog_post['full_text']),
'content' => $post_text,
'post_date' => api_convert_and_format_date($blog_post['date_creation'], null, date_default_timezone_get()),
'n_comments' => $blog_post_comments['number_of_comments'],
'files' => $fileArray,
'id_task' => $task_id,
'comments_html' => $commentsHtml,
'form_html' => $formComments
'comments' => $listComments,
'form_html' => $formComments,
'actions' => $blogActions
];
/* $task_id = (isset($_GET['task_id']) && is_numeric($_GET['task_id'])) ? intval($_GET['task_id']) : 0;
if (api_is_allowed('BLOG_' . $blog_id, 'article_edit', $task_id)) {
$blog_post_actions .= '<a href="blog.php?action=edit_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('EditThisPost') . '">';
$blog_post_actions .= Display::return_icon('edit.png');
$blog_post_actions .= '</a>';
}
if (api_is_allowed('BLOG_' . $blog_id, 'article_delete', $task_id)) {
$blog_post_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_article&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisArticle') . '" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;">';
$blog_post_actions .= Display::return_icon('delete.png');
$blog_post_actions .= '</a>';
} */
if (api_is_allowed('BLOG_' . $blog_id, 'article_rate')){
$rating_select = Blog::display_rating_form('post',$blog_id,$post_id);
}
return $article;
}
@ -1121,6 +1124,7 @@ class Blog
$_user = api_get_user_info();
$tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
$course_id = api_get_course_int_id();
$html = null;
if ($type == 'post') {
// Check if the user has already rated this post
@ -1133,7 +1137,15 @@ class Blog
$result = Database::query($sql);
// Add rating
if (Database::num_rows($result) == 0) {
return ' - ' . get_lang('RateThis') . ': <form method="get" action="blog.php" style="display: inline" id="frm_rating_' . $type . '_' . $post_id . '" name="frm_rating_' . $type . '_' . $post_id . '"><select name="rating" onchange="document.forms[\'frm_rating_' . $type . '_' . $post_id . '\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="' . $type . '" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="' . $blog_id . '" /><input type="hidden" name="post_id" value="' . $post_id . '" /></form>';
$html .= '<form class="form-horizontal" method="get" action="blog.php" id="frm_rating_' . $type . '_' . $post_id . '" name="frm_rating_' . $type . '_' . $post_id . '">';
$html .= '<div class="form-group">';
$html .= '<label class="col-sm-3 control-label">' . get_lang('RateThis') . '</label>';
$html .= '<div class="col-sm-9">';
$html .= '<select class="selectpicker" name="rating" onchange="document.forms[\'frm_rating_' . $type . '_' . $post_id . '\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="' . $type . '" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="' . $blog_id . '" /><input type="hidden" name="post_id" value="' . $post_id . '" />';
$html .= '</div>';
$html .= '</div>';
$html .= '</form>';
return $html;
} else {
return '';
}
@ -1145,11 +1157,18 @@ class Blog
WHERE c_id = $course_id AND blog_id = '".(int)$blog_id ."'
AND item_id = '".(int)$comment_id."'
AND rating_type = '".Database::escape_string($type)."'
AND user_id = '".(int)$_user['user_id']."'";
AND user_id = '".(int)$_user['user_id']."' ";
$result = Database::query($sql);
if (Database::num_rows($result) == 0) {
return ' - ' . get_lang('RateThis') . ': <form method="get" action="blog.php" style="display: inline" id="frm_rating_' . $type . '_' . $comment_id . '" name="frm_rating_' . $type . '_' . $comment_id . '"><select name="rating" onchange="document.forms[\'frm_rating_' . $type . '_' . $comment_id . '\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="' . $type . '" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="' . $blog_id . '" /><input type="hidden" name="post_id" value="' . $post_id . '" /><input type="hidden" name="comment_id" value="' . $comment_id . '" /></form>';
$html .= '<form class="form-horizontal" method="get" action="blog.php" id="frm_rating_' . $type . '_' . $comment_id . '" name="frm_rating_' . $type . '_' . $comment_id . '">';
$html .= '<div class="form-group">';
$html .= '<label class="col-sm-3 control-label">' . get_lang('RateThis') . '</label>';
$html .= '<div class="col-sm-9">';
$html .= '<select name="rating" onchange="document.forms[\'frm_rating_' . $type . '_' . $comment_id . '\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="' . $type . '" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="' . $blog_id . '" /><input type="hidden" name="post_id" value="' . $post_id . '" /><input type="hidden" name="comment_id" value="' . $comment_id . '" />';
$html .= '</div>';
$html .= '</div>';
$html .= '</form>';
return $html;
} else {
return '';
}
@ -1171,6 +1190,7 @@ class Blog
$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
global $charset;
$course_id = api_get_course_int_id();
// Select top level comments
@ -1186,8 +1206,9 @@ class Blog
parent_comment_id = $current AND
comments.blog_id = '".(int)$blog_id."' AND
comments.post_id = '".(int)$post_id."'";
$result = Database::query($sql);
$result = Database::query($sql);
$html = null;
while($comment = Database::fetch_array($result)) {
// Select the children recursivly
$tmp = "SELECT comments.*, user.lastname, user.firstname, user.username
@ -1196,41 +1217,68 @@ class Blog
ON comments.author_id = user.user_id
WHERE
comments.c_id = $course_id AND
comment_id = $current
comment_id = ".$comment['comment_id']."
AND blog_id = '".(int)$blog_id."'
AND post_id = '".(int)$post_id."'";
$tmp = Database::query($tmp);
$tmp = Database::fetch_array($tmp);
$commentActions = null;
$ratingSelect = null;
$parent_cat = $tmp['parent_comment_id'];
$border_color = '';
// Prepare data
$comment_text = make_clickable(stripslashes($comment['comment']));
$blog_comment_date = api_convert_and_format_date($comment['date_creation'], null, date_default_timezone_get());
$blog_comment_actions = "";
$comment_text = stripslashes($comment_text);
$infoUser = UserManager::get_user_picture_path_by_id($comment['author_id']);
if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) {
$blog_comment_actions .= '<a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$post_id.'&do=delete_comment&comment_id='.$comment['comment_id'].'&task_id='.$task_id.'" title="'.get_lang(
$commentActions .= '<a class="btn btn-default" href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$post_id.'&do=delete_comment&comment_id='.$comment['comment_id'].'&task_id='.$task_id.'" title="'.get_lang(
'DeleteThisComment'
).'" onclick="javascript:if(!confirm(\''.addslashes(
api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)
).'\')) return false;">';
$blog_comment_actions .= Display::return_icon('delete.png');
$blog_comment_actions .= '</a>';
$commentActions .= Display::returnFontAwesomeIcon('trash');
$commentActions .= '</a>';
}
if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_rate')) {
$rating_select = Blog::display_rating_form('comment', $blog_id, $post_id, $comment['comment_id']);
}
$ratingSelect = Blog::display_rating_form('comment', $blog_id, $post_id, $comment['comment_id']);
}
$comments = [
'iid' => $comment['iid'],
'id_comment' => $comment['comment_id'],
'id_curso' => $comment['c_id'],
'title' => $comment['title'],
'content' => $comment_text,
'id_author' => $comment['author_id'],
'comment_date' => api_convert_and_format_date($comment['date_creation'], null, date_default_timezone_get()),
'id_blog' => $comment['blog_id'],
'id_post' => $comment['post_id'],
'id_task' => $comment['task_id'],
'id_parent' => $parent_cat,
'name_author' => api_get_person_name($comment['firstname'], $comment['lastname']),
'info_user' => $infoUser,
'username' => $comment['username'],
'color' => $comment['color'],
'actions' => $commentActions,
'ranking' => $ratingSelect
];
$listComments[] = $comments;
// Prepare data
/*
if (!is_null($comment['task_id'])) {
$border_color = ' border-left: 3px solid #' . $comment['color'];
}
$comment_text = stripslashes($comment_text);
// Output...
$margin = $current_level * 30;
$html = null;
$html.= '<div class="blogpost_comment" style="margin-left: ' . $margin . 'px;' . $border_color . '">';
$html.= '<span class="blogpost_comment_title"><a href="#add_comment" onclick="document.getElementById(\'comment_parent_id\').value=\'' . $comment['comment_id'] . '\'; document.getElementById(\'comment_title\').value=\'Re: '.addslashes($comment['title']) . '\'" title="' . get_lang('ReplyToThisComment') . '" >'.stripslashes($comment['title']) . '</a></span>';
$html.= '<span class="blogpost_comment_date">' . $blog_comment_date . '</span>';
@ -1252,10 +1300,11 @@ class Blog
$html.= '<span class="blogpost_actions">' . $blog_comment_actions . '</span>';
$html.= '</div>';
return $html;
*/
// Go further down the tree.
//return $html.= Blog::get_threaded_comments($comment['comment_id'], $next_level, $blog_id, $post_id);
}
return $listComments;
}
/**

40
main/template/default/blog/post.tpl
Unescape View File

@ -43,17 +43,9 @@
<div class="panel-body">
<div id="blog-header">
<div id="post-action" class="pull-right">
<div class="btn-group" role="group" aria-label="...">
<a class="btn btn-default" href="blog.php?action=edit_post&blog_id={{ post.id_blog }}&post_id={{ post.id_post }}&article_id={{ post.id_post }}&task_id={{ post.id_task }}" title="{{ 'EditThisPost' | get_lang }}">
{{ 'edit.png' |img }}
</a>
<a class="btn btn-default" href="blog.php?action=view_post&blog_id={{ post.id_blog }}&post_id={{ post.id_post }}&do=delete_article&article_id={{ post.id_post }}&task_id={{ post.id_task }}"
title="{{ 'DeleteThisArticle' | get_lang}}"
onclick="javascript:if(!confirm('{{ 'ConfirmYourChoice' | get_lang }}')) return false;" >
{{ 'delete.png' |img }}
</a>
<div class="btn-group btn-group-sm" role="group" aria-label="...">
{{ post.actions }}
</div>
</div>
<div class="title">
<h1 title="{{ post.title }}">{{ post.title }}</h1>
@ -72,8 +64,32 @@
</div>
{% endif %}
<div class="comments-post">
<h3>{{ post.n_comments }} {{ 'Comments' | get_lang }} </h3>
{{ post.comments_html }}
<h3 class="title">{{ post.n_comments }} {{ 'Comments' | get_lang }} </h3>
<div id="list-comments">
{% for item in post.comments %}
<div class="media">
<div class="media-left">
<a href="{{ _p.web }}main/social/profile.php?u={{ item.id_author }}">
<img class="media-object thumbnail avatar" src="{{ item.info_user.dir }}{{ item.info_user.file }}" alt="{{ item.name_author }}">
</a>
</div>
<div class="media-body">
<div class="pull-right">
{{ item.actions }}
</div>
<h4 class="media-heading">{{ item.title }}</h4>
<div class="info-post">
<span class="date"><i class="fa fa-clock-o"></i> {{ item.comment_date }}</span>
<span class="autor"><i class="fa fa-user"></i> {{ item.name_author }}</span>
</div>
{{ item.content }}
<div class="ranking">
{{ item.ranking }}
</div>
</div>
</div>
{% endfor %}
</div>
</div>
<div class="form-post">
{{ post.form_html }}

Write Preview
Loading…
Cancel
Save