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 groups - refs #2681

Browse Source
pull/2818/head
Alex Aragón 7 years ago
parent 2d0697f1ef
commit 099314625d
5 changed files with 42 additions and 54 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. 2
      main/inc/lib/text.lib.php
  2. 4
      main/social/group_add.php
  3. 68
      main/social/groups.php
  4. 10
      main/template/default/social/add_groups.html.twig
  5. 12
      main/template/default/social/groups.html.twig

2
main/inc/lib/text.lib.php
Unescape View File

@ -780,7 +780,7 @@ function cut($text, $maxchar, $embed = false)
{
if (api_strlen($text) > $maxchar) {
if ($embed) {
return '<p title="'.$text.'">'.api_substr($text, 0, $maxchar).'...</p>';
return '<div class="embed-text">'.api_substr($text, 0, $maxchar).'...</div>';
}
return api_substr($text, 0, $maxchar).' ...';

4
main/social/group_add.php
Unescape View File

@ -53,4 +53,6 @@ $tpl->assign('social_menu_block', $social_menu_block);
$tpl->assign('social_right_content', $social_right_content);
$social_layout = $tpl->get_template('social/add_groups.tpl');
$tpl->display($social_layout);
$content = $tpl->fetch($social_layout);
$tpl->assign('content', $content);
$tpl->display_one_col_template();

68
main/social/groups.php
Unescape View File

@ -105,7 +105,7 @@ if (is_array($results) && count($results) > 0) {
$result['picture'],
80
);
$result['picture'] = '<img class="social-groups-image" src="'.$picture.'" />';
$result['picture'] = '<img class="mr-3" src="'.$picture.'" />';
$members = Display::returnFontAwesomeIcon('user').$count_users_group;
$html = '<div class="row">';
@ -118,9 +118,7 @@ if (is_array($results) && count($results) > 0) {
$html .= '</div>';
$html .= '<div class="members-groups">'.$members.'</div>';
if ($result['description'] != '') {
$html .= '<div class="description-groups">'.cut($result['description'], 100, true).'</div>';
} else {
$html .= '';
$html .= cut($result['description'], 250, true);
}
$html .= '</div>';
$html .= '</div>';
@ -134,6 +132,7 @@ if (is_array($results) && count($results) > 0) {
$results = $usergroup->get_groups_by_age(4, false);
$grid_newest_groups = [];
$html = '<ul class="list-unstyled">';
foreach ($results as $result) {
$result['name'] = Security::remove_XSS($result['name'], STUDENT, true);
$result['description'] = Security::remove_XSS($result['description'], STUDENT, true);
@ -158,20 +157,17 @@ foreach ($results as $result) {
$url = '<a href="group_view.php?id='.$id.'">'.$name.'</a>';
$picture = $usergroup->get_picture_group($result['id'], $result['picture'], 80);
$result['picture'] = '<img class="social-groups-image" src="'.$picture.'" />';
$result['picture'] = '<img class="mr-3" src="'.$picture.'" />';
$members = Display::returnFontAwesomeIcon('user').$count_users_group;
$html = '<div class="row">';
$html .= '<div class="col-md-2">';
$html .= '<li class="media item-3">';
$html .= $result['picture'];
$html .= '</div>';
$html .= '<div class="col-md-10">';
$html .= '<div class="title-groups">';
$html .= Display::tag('h5', $url);
$html .= '</div>';
$html .= '<div class="members-groups">'.$members.'</div>';
$html .= '<div class="media-body">';
$html .= Display::tag('h5', $url, ['class' => 'mt-0 mb-1']);
$html .= '<div class="details">'.$members.'</div>';
if ($result['description'] != '') {
$html .= '<div class="description-groups">'.cut($result['description'], 100, true).'</div>';
$html .= cut($result['description'], 250, true);
}
// Avoiding my groups
if (!in_array($id, $my_group_list)) {
@ -181,15 +177,18 @@ foreach ($results as $result) {
$html .= '<div class="group-actions" >'.$join_url.'</div>';
$html .= '</div>';
$html .= '</div>';
$html .= '</li>';
$grid_item_2 = $html;
$grid_newest_groups[] = [$grid_item_2];
}
$html.= '</ul>';
// Pop groups
$results = $usergroup->get_groups_by_popularity(4, false);
$grid_pop_groups = [];
$html = '<ul class="list-unstyled">';
if (is_array($results) && count($results) > 0) {
foreach ($results as $result) {
$result['name'] = Security::remove_XSS($result['name'], STUDENT, true);
@ -219,21 +218,16 @@ if (is_array($results) && count($results) > 0) {
$url = '<a href="group_view.php?id='.$id.'">'.$name.'</a>';
$picture = $usergroup->get_picture_group($result['id'], $result['picture'], 80);
$result['picture'] = '<img class="social-groups-image" src="'.$picture.'" />';
$result['picture'] = '<img class="mr-3" src="'.$picture.'" />';
$html = '<div class="row">';
$html .= '<div class="col-md-2">';
$html .= '<li class="media item-3">';
$html .= $result['picture'];
$html .= '</div>';
$html .= '<div class="col-md-10">';
$html .= '<div class="title-groups">';
$html .= Display::tag('h5', $url);
$html .= '</div>';
$html .= '<div class="members-groups">'.$members.'</div>';
$html .= '<div class="media-body">';
$html .= Display::tag('h5', $url, ['class' => 'mt-0 mb-1']);
$html .= '<div class="details">'.$members.'</div>';
if ($result['description'] != '') {
$html .= '<div class="description-groups">'.cut($result['description'], 100, true).'</div>';
} else {
$html .= '';
$html .= cut($result['description'], 250, true);
}
// Avoiding my groups
if (!in_array($id, $my_group_list)) {
@ -243,11 +237,12 @@ if (is_array($results) && count($results) > 0) {
$html .= '<div class="group-actions" >'.$join_url.'</div>';
$html .= '</div>';
$html .= '</div>';
$html .= '</li>';
$grid_item_2 = $html;
$grid_pop_groups[] = [$grid_item_2];
}
$html .= '</ul>';
}
// Display groups (newest, mygroups, pop)
@ -270,12 +265,12 @@ if (isset($_GET['view']) && in_array($_GET['view'], $allowed_views)) {
}
if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
$create_group_item =
'<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
'<a class="btn btn-primary" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
get_lang('CreateASocialGroup').'</a>';
} else {
if (api_is_allowed_to_edit(null, true)) {
$create_group_item =
'<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
'<a class="btn btn-primary" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
get_lang('CreateASocialGroup').'</a>';
}
}
@ -324,12 +319,12 @@ if (isset($_GET['view']) && in_array($_GET['view'], $allowed_views)) {
}
if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
$create_group_item =
'<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
'<a class="btn btn-primary" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
get_lang('CreateASocialGroup').'</a>';
} else {
if (api_is_allowed_to_edit(null, true)) {
$create_group_item =
'<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
'<a class="btn btn-primary" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
get_lang('CreateASocialGroup').'</a>';
}
}
@ -380,11 +375,10 @@ if (isset($_GET['view']) && $_GET['view'] == 'mygroups') {
$show_menu = $_GET['view'];
}
$social_menu_block = SocialManager::getMenuSocial($show_menu);
$templateName = 'social/groups.tpl';
$tpl->setHelp('Groups');
$tpl->assign('social_menu_block', $social_menu_block);
$tpl->assign('social_right_content', $social_right_content);
$social_layout = $tpl->get_template($templateName);
$tpl->display($social_layout);
$social_layout = $tpl->get_template('social/groups.html.twig');
$content = $tpl->fetch($social_layout);
$tpl->assign('content', $content);
$tpl->display_one_col_template();

10
main/template/default/social/add_groups.html.twig
Unescape View File

@ -1,15 +1,7 @@
{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
{% block content %}
{% autoescape false %}
<div class="row">
<div class="col-md-3">
<div class="social-network-menu">
{% include '@ChamiloTheme/Social/user_block.html.twig' %}
{{ social_menu_block }}
</div>
</div>
<div class="col-md-9">
<div class="col-md-12">
{{ social_right_content }}
</div>
</div>

12
main/template/default/social/groups.html.twig
Unescape View File

@ -1,15 +1,15 @@
{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
{% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
{% block content %}
{% autoescape false %}
<div class="row">
<div class="col-md-3">
<div class="social-network-menu">
<div class="col-md-4">
{% set avatar %}
{% include '@ChamiloTheme/Social/user_block.html.twig' %}
{{ social_menu_block }}
</div>
{% endset %}
{{ macro.panel('', avatar ) }}
</div>
<div class="col-md-9">
<div class="col-md-8">
{{ social_right_content }}
</div>
</div>

Write Preview
Loading…
Cancel
Save