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 template forum - refs #2681

Browse Source
pull/3016/head
Alex Aragón 6 years ago
parent 223f3658c6
commit 5b6eb88465
4 changed files with 128 additions and 89 deletions
  1. 75
      assets/css/scss/_base.scss
  2. 2
      main/dropbox/dropbox_init.inc.php
  3. 8
      main/forum/index.php
  4. 132
      main/template/default/forum/list.html.twig

75
assets/css/scss/_base.scss
Unescape View File

@ -2064,30 +2064,65 @@ hr {
/****** FORUM CSS ******/
.forum{
.number-post {
background-color: #F7F7F9;
border: 1px solid #E1E1E1;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
padding: 10px;
text-align: center;
p {
padding: 0;
margin: 0;
.card{
margin-bottom: 0;
.card-header{
padding: 0.25rem;
.btn{
padding: 0;
margin: 0;
}
.float-actions{
position: absolute;
right: 17px;
top: 10px;
}
}
}
.title {
margin: 0;
padding: 0;
font-size: 18px;
}
.description {
font-size: 14px;
color: #666666;
.list-forum{
.card{
border: none;
box-shadow: none;
&:hover{
.toolbar{
opacity: 1;
transition: opacity 1s;
}
}
.toolbar{
opacity: 0;
margin-left: 5px;
img{
border: 1px solid #cdcdcd;
background-color: #ffffff;
padding: 2px;
border-radius: 4px;
}
}
}
.d-flex{
border-bottom: 1px solid #dddddd;
}
.avatar{
img{
border: 1px solid #cdcdcd;
}
}
.forum-threads{
font-size: 12px;
list-style: none;
margin: 0;
padding: 0;
color: #666666;
li{
display: inline-block;
padding-left: 5px;
padding-right: 5px;
}
}
}
}
.forum-post {
border-color: #dddddd !important;
.title-username {

2
main/dropbox/dropbox_init.inc.php
Unescape View File

@ -180,7 +180,7 @@ if (empty($session_id)) {
// only when it is needed.
if ($action == 'add') {
$dropbox_person = new Dropbox_Person(
$_user['user_id'],
$user_id,
$is_courseAdmin,
$is_courseTutor
);

8
main/forum/index.php
Unescape View File

@ -307,6 +307,7 @@ if (is_array($forumCategories)) {
if (!empty($forumsInCategory)) {
$forumsDetailsList = [];
// We display all the forums in this category.
foreach ($allCourseForums as $forum) {
// Here we clean the whatnew_post_info array a little bit because to display the icon we
// test if $whatsnew_post_info[$forum['forum_id']] is empty or not.
@ -347,7 +348,7 @@ if (is_array($forumCategories)) {
);
}
}
//var_dump($forum);
if ($show_forum) {
$form_count++;
$mywhatsnew_post_info = isset($whatsnew_post_info[$forum['forum_id']])
@ -460,6 +461,9 @@ if (is_array($forumCategories)) {
if (!empty($forum['last_poster_id'])) {
$forumInfo['last_poster_date'] = api_convert_and_format_date($forum['last_post_date']);
$forumInfo['last_poster_user'] = display_user_link($poster_id, $name, null, $username);
$forumInfo['avatar'] = UserManager::getUserPicture($poster_id);
} else {
$forumInfo['avatar'] = UserManager::getUserPicture($forum['insert_user_id']);
}
if (api_is_allowed_to_edit(false, true)
@ -539,5 +543,5 @@ $tpl->assign('introduction', $introduction);
$tpl->assign('actions', $actions);
$tpl->assign('data', $listForumCategory);
$tpl->assign('form_content', $formContent);
$layout = $tpl->get_template('forum/list.tpl');
$layout = $tpl->get_template('forum/list.html.twig');
$tpl->display($layout);

132
main/template/default/forum/list.html.twig
Unescape View File

@ -1,90 +1,90 @@
{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
{% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
{% block content %}
{% autoescape false %}
{{ introduction_section }}
{{ form_content }}
<div class="accordion forum" id="accordion-forum">
{% if data is not empty %}
{% for item in data %}
<div class="category-forum" id="category_{{ item.id }}">
<div class="float-right">
{{ item.tools }}
</div>
<h3>
{{ 'forum_blue.png'|img(32) }}
<div class="card">
<h5 class="card-header" id="heading-{{ item.id }}">
<div class="float-actions">
{{ item.tools }}
</div>
<a href="#" data-toggle="collapse" class="btn btn-link" data-target="#collapse-{{ item.id }}" aria-expanded="true" aria-controls="collapse-{{ item.id }}">
{{ 'forum_blue.png'|img(32) }}
</a>
<a href="{{ item.url }}" title="{{ item.title }}">{{ item.title }}{{ item.icon_session }}</a>
</h3>
<div class="forum-description">
{{ item.description }}
</div>
</div>
{% for subitem in item.forums %}
<div class="forum_display">
<div class="card forum">
<div class="card-body">
<div class="row">
<div class="col-md-3">
<div class="number-post">
<a href="{{ forum.url }}" title="{{forum.title}}">
{% if subitem.forum_image is not empty %}
<img src="{{ subitem.forum_image }}" width="48px">
{% else %}
{% if subitem.forum_of_group == 0 %}
{{ 'forum_group.png'|img(48) }}
{% else %}
{{ 'forum.png'|img(48) }}
{% endif %}
{% endif %}
</a>
<p>{{ 'ForumThreads'| get_lang }}: {{ subitem.number_threads }} </p>
</h5>
<div id="collapse-{{ item.id }}" class="collapse show" aria-labelledby="heading-{{ item.id }}" data-parent="#accordion-forum">
<div class="card-body">
<div class="forum-description">
{{ item.description }}
</div>
{% for subitem in item.forums %}
{% set content %}
<div class="d-flex flex-row bd-highlight mb-3">
<div class="p-2 bd-highlight">
<div class="avatar">
<img src="{{ subitem.avatar }}" width="32px" class="rounded-circle">
</div>
</div>
<div class="col-md-9">
<div class="float-right">
<div class="toolbar">
{{ subitem.tools }}
</div>
</div>
<h3 class="title">
{{ 'forum_yellow.png'|img(32) }}
<a href="{{ subitem.url }}" title="{{ subitem.title }}" class="{{ subitem.visibility != '1' ? 'text-muted': '' }}">{{ subitem.title }}</a>
{% if subitem.forum_of_group != 0 %}
<a class="forum-goto" href="../group/group_space.php?{{ _p.web_cid_query }}&gidReq={{ subitem.forum_of_group }}">
{{ "forum.png"|img(22) }} {{ "GoTo"|get_lang }} {{ subitem.forum_group_title }}
</a>
{% endif %}
{{ subitem.icon_session }}
</h3>
{% if subitem.last_poster_id is not empty %}
<div class="forum-date">
<i class="fa fa-comments" aria-hidden="true"></i>
{{ subitem.last_poster_date }}
{{ "By"|get_lang }}
{{ subitem.last_poster_user }}
<div class="p-2 bd-highlight">
<h4 class="title">
<a href="{{ subitem.url }}" title="{{ subitem.title }}" class="{{ subitem.visibility != '1' ? 'text-muted': '' }}">{{ subitem.title }}</a>
{% if subitem.forum_of_group != 0 %}
<a class="forum-goto" href="../group/group_space.php?{{ _p.web_cid_query }}&gidReq={{ subitem.forum_of_group }}">
{{ "forum.png"|img(22) }} {{ "GoTo"|get_lang }} {{ subitem.forum_group_title }}
</a>
{% endif %}
{{ subitem.icon_session }}
<div class="float-right">
<div class="toolbar">
{{ subitem.tools }}
</div>
</div>
{% endif %}
<div class="description">
{{ subitem.description }}
</div>
{{ subitem.alert }}
{% if subitem.moderation is not empty %}
<span class="label label-warning">
{{ "PostsPendingModeration"|get_lang }}: {{ subitem.moderation }}
</span>
{% endif %}
</h4>
<ul class="forum-threads">
<li class="threads">{{ 'ForumThreads'| get_lang }}: {{ subitem.number_threads }} </li>
{% if subitem.last_poster_id is not empty %}
<li class="date">
<i class="fa fa-comments" aria-hidden="true"></i>
{{ subitem.last_poster_date }}
{{ "By"|get_lang }}
{{ subitem.last_poster_user }}
</li>
{% endif %}
</ul>
</div>
</div>
<div class="description">
{{ subitem.description }}
</div>
{{ subitem.alert }}
{% if subitem.moderation is not empty %}
<span class="label label-warning">
{{ "PostsPendingModeration"|get_lang }}: {{ subitem.moderation }}
</span>
{% endif %}
{% endset %}
{% set forum_id = 'forum-'~ subitem.id %}
<div class="list-forum">
{{ macro.panel_box(forum_id,'', content ) }}
</div>
</div>
{% endfor %}
</div>
{% endfor %}
</div>
</div>
{% endfor %}
{% else %}
<div class="alert alert-warning">
{{ 'NoForumInThisCategory'|get_lang }}
</div>
{% endif %}
</div>
{% endautoescape %}
{% endblock %}

Write Preview
Loading…
Cancel
Save