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

tpl social invitatios fix refs #7539

Browse Source
1.10.x
aragonc 10 years ago
parent 21781c94ae
commit 20ac74692b
10 changed files with 110 additions and 184 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. 53
      main/css/base.css
  2. 16
      main/inc/lib/skill.lib.php
  3. 16
      main/messages/inbox.php
  4. 2
      main/social/group_add.php
  5. 2
      main/social/group_invitation.php
  6. 136
      main/social/invitations.php
  7. 4
      main/template/default/skill/badge_create.tpl
  8. 29
      main/template/default/social/add_groups.tpl
  9. 18
      main/template/default/social/inbox.tpl
  10. 18
      main/template/default/social/invitations.tpl

53
main/css/base.css
Unescape View File

@ -350,52 +350,6 @@ form .formw input {
/* New changes Chamilo 1.9 */
.well h4 {
padding: 3px 15px;
}
#login_block #formLogin,
#login_block #lang_form,
#notice_block .homepage_notice {
padding: 3px 15px;
}
.nav-list > .active > a,
.nav-list > .active > a:hover {
background-color: #999999;
}
.sidebar-nav {
padding: 8px 0px;
}
.sidebar-nav-skill-wheel {
padding-top: 0px;
}
.well_border {
/* border: 1px solid rgba(0, 0, 0, 0.05);*/
border: 1px solid #E1E1E0;
border-radius: 4px 4px 4px 4px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05) inset;
margin-bottom: 20px;
min-height: 20px;
padding: 19px;
}
.well_login {
margin: 0 auto;
width: 200px;
}
.well_login button {
margin-left: 0px;
}
#progress_bar img {
height:26px;
}
#lp_navigation_elem .buttons{
margin-bottom: 5px;
}
@ -412,13 +366,6 @@ html {
min-height: 100%;
}
body {
margin-bottom: 80px;
/* hack ignored by non-IE to enable ie to support :hover on button */
behavior:url("/main/css/csshover3.htc");
background-color: #fff;
}
footer {
position: relative;
bottom: 0;

16
main/inc/lib/skill.lib.php
Unescape View File

@ -492,7 +492,6 @@ class Skill extends Model
$result = Database::query($sql);
$skills = array();
/* $badges_default = "hola"; */
if (Database::num_rows($result)) {
while ($row = Database::fetch_array($result, 'ASSOC')) {
@ -500,27 +499,12 @@ class Skill extends Model
$a = $skill_rel_skill->get_skill_parents($row['id']);
$row['level'] = count($a) - 1;
$row['gradebooks'] = self::get_gradebooks_by_skill($row['id']);
/* if($row['icon']=="") {
$row['icon'] = $badges_default;
}*/
$skills[$row['id']] = $row;
}
}
/*
if ($load_user_data && $user_id) {
$passed_skills = $this->get_user_skills($user_id);
foreach ($skills as &$skill) {
$skill['done_by_user'] = 0;
if (in_array($skill['id'], $passed_skills)) {
$skill['done_by_user'] = 1;
}
}
}*/
//Load all children of the parent_id
if (!empty($skills) && !empty($parent_id)) {
foreach ($skills as $skill) {

16
main/messages/inbox.php
Unescape View File

@ -127,17 +127,17 @@ if (isset($_GET['f']) && $_GET['f'] == 'social' || api_get_setting('allow_social
$actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.Display::return_icon('outbox.png', get_lang('Outbox')).'</a>';
}
}
$user_info = UserManager::get_user_info_by_id($user_id);
$userInfo = UserManager::get_user_info_by_id($user_id);
//LEFT CONTENT
if (api_get_setting('allow_social_tool') == 'true') {
//Block Social Avatar
$social_avatar_block = '<div class="panel panel-info social-avatar">';
$social_avatar_block .= SocialManager::show_social_avatar_block('messages');
$social_avatar_block .= '<div class="lastname">'.$user_info['lastname'].'</div>';
$social_avatar_block .= '<div class="firstname">'.$user_info['firstname'].'</div>';
/* $social_avatar_block .= '<div class="username">'.Display::return_icon('user.png','','',ICON_SIZE_TINY).$user_info['username'].'</div>'; */
$social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$user_info['email'].'</div>';
$chat_status = $user_info['extra'];
$social_avatar_block .= '<div class="lastname">'.$userInfo['lastname'].'</div>';
$social_avatar_block .= '<div class="firstname">'.$userInfo['firstname'].'</div>';
/* $social_avatar_block .= '<div class="username">'.Display::return_icon('user.png','','',ICON_SIZE_TINY).$userInfo['username'].'</div>'; */
$social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$userInfo['email'].'</div>';
$chat_status = $userInfo['extra'];
if(!empty($chat_status['user_chat_status'])){
$social_avatar_block.= '<div class="status">'.Display::return_icon('online.png').get_lang('Chat')." (".get_lang('Online').')</div>';
}else{
@ -174,13 +174,13 @@ if (api_get_setting('allow_social_tool') == 'true') {
$social_right_content = null;
if (api_get_setting('allow_social_tool') == 'true') {
$social_right_content .= '<div class="col-md-9">';
$social_right_content .= '<div class="col-md-12">';
$social_right_content .= '<div class="actions">';
$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?f=social">'.Display::return_icon('compose_message.png', get_lang('ComposeMessage'), array(), 32).'</a>';
$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php?f=social">'.Display::return_icon('outbox.png', get_lang('Outbox'), array(), 32).'</a>';
$social_right_content .= '</div>';
$social_right_content .= '</div>';
$social_right_content .= '<div class="span9">';
$social_right_content .= '<div class="col-md-12">';
}
//MAIN CONTENT

2
main/social/group_add.php
Unescape View File

@ -81,5 +81,5 @@ $tpl->assign('social_menu_block', $social_menu_block);
$tpl->assign('social_right_content', $social_right_content);
//$tpl->assign('actions', $actions);
//$tpl->assign('message', $show_message);
$social_layout = $tpl->get_template('social/home.tpl');
$social_layout = $tpl->get_template('social/add_groups.tpl');
$tpl->display($social_layout);

2
main/social/group_invitation.php
Unescape View File

@ -602,5 +602,5 @@ $tpl->set_help('Groups');
$tpl->assign('social_avatar_block', $social_avatar_block);
$tpl->assign('social_menu_block', $social_menu_block);
$tpl->assign('social_right_content', $social_right_content);
$social_layout = $tpl->get_template('social/home.tpl');
$social_layout = $tpl->get_template('social/add_groups.tpl');
$tpl->display($social_layout);

136
main/social/invitations.php
Unescape View File

@ -92,15 +92,14 @@ if (is_array($_GET) && count($_GET)>0) {
}
}
//Block Avatar Social
$user_info = UserManager::get_user_info_by_id($user_id);
$userInfo = UserManager::get_user_info_by_id($user_id);
$social_avatar_block = '<div class="panel panel-info social-avatar">';
$social_avatar_block .= SocialManager::show_social_avatar_block('invitations');
$social_avatar_block .= '<div class="lastname">'.$user_info['lastname'].'</div>';
$social_avatar_block .= '<div class="firstname">'.$user_info['firstname'].'</div>';
/* $social_avatar_block .= '<div class="username">'.Display::return_icon('user.png','','',ICON_SIZE_TINY).$user_info['username'].'</div>'; */
$social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$user_info['email'].'</div>';
$chat_status = $user_info['extra'];
$social_avatar_block .= '<div class="lastname">'.$userInfo['lastname'].'</div>';
$social_avatar_block .= '<div class="firstname">'.$userInfo['firstname'].'</div>';
$social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$userInfo['email'].'</div>';
$chat_status = $userInfo['extra'];
if(!empty($chat_status['user_chat_status'])){
$social_avatar_block.= '<div class="status">'.Display::return_icon('online.png').get_lang('Chat')." (".get_lang('Online').')</div>';
}else{
@ -130,9 +129,8 @@ $social_avatar_block .= '<div class="edit-profile">
$social_avatar_block .= '</div>';
//Block Menu Social
$social_menu_block = SocialManager::show_social_menu('invitations');
$social_right_content = '<div class="span9">
<div id="id_response" align="center"></div>
</div></div>';
//Block Invitations
$socialInvitationsBlock = '<div id="id_response" align="center"></div>';
$user_id = api_get_user_id();
$list_get_invitation = SocialManager::get_list_invitation_of_friends_by_user_id($user_id);
@ -143,15 +141,17 @@ $number_loop = count($list_get_invitation);
$total_invitations = $number_loop + count($list_get_invitation_sent) + count($pending_invitations);
if ($total_invitations == 0 && count($_GET) <= 0) {
$social_right_content .= '<div class="row"><div class="span9"><a class="btn" href="search.php">'.get_lang('TryAndFindSomeFriends').'</a></div></div>';
$socialInvitationsBlock .= '<div class="row"><div class="col-md-12"><a class="btn btn-default" href="search.php">'.get_lang('TryAndFindSomeFriends').'</a></div></div>';
}
if ($number_loop != 0) {
$social_right_content .= '<div class="row"><div class="span9">'.Display::page_subheader(get_lang('InvitationReceived')).'</div></div>';
$socialInvitationsBlock .= '<div class="panel panel-default">';
$socialInvitationsBlock .= '<div class="panel-heading">'.get_lang('InvitationReceived').'</div>';
$socialInvitationsBlock .= '<div class="panel-body">';
foreach ($list_get_invitation as $invitation) {
$sender_user_id = $invitation['user_sender_id'];
$social_right_content .= '<div id="id_'.$sender_user_id.'" class="row invitation-clear">';
$socialInvitationsBlock .= '<div id="id_'.$sender_user_id.'" class="well">';
$picture = UserManager::get_user_picture_path_by_id($sender_user_id, 'web', false, true);
$friends_profile = SocialManager::get_picture_user($sender_user_id, $picture['file'], 92);
@ -159,34 +159,37 @@ if ($number_loop != 0) {
$title = Security::remove_XSS($invitation['title'], STUDENT, true);
$content = Security::remove_XSS($invitation['content'], STUDENT, true);
$date = api_convert_and_format_date($invitation['send_date'], DATE_TIME_FORMAT_LONG);
$social_right_content .= '<div class="span2">
<a class="thumbnail" href="profile.php?u='.$sender_user_id.'">
<img src="'.$friends_profile['file'].'" /></a></div>
<div class="span7"><div class="title-profile">
<a href="profile.php?u='.$sender_user_id.'">
'.api_get_person_name($user_info['firstName'], $user_info['lastName']).'</a>:
</div><div class="content-invitation">'.$content.'</div><div class="alert date-invitation">
'.get_lang('DateSend').' : '.$date.'
</div>
<div class="buttons">
<button class="btn btn-success" name="btn_accepted" type="submit" id="btn_accepted_'.$sender_user_id.'" value="'.get_lang('Accept').' "onclick="javascript:register_friend(this)">
'.get_lang('AcceptInvitation').'</button>
<button class="btn btn-danger" name="btn_denied" type="submit" id="btn_deniedst_'.$sender_user_id.' " value="'.get_lang('Deny').' " onclick="javascript:denied_friend(this)" >
'.get_lang('DenyInvitation').'</button>
</div>
</div>
</div>';
$socialInvitationsBlock .= '<div class="row">';
$socialInvitationsBlock .= '<div class="col-md-2">';
$socialInvitationsBlock .= '<a href="profile.php?u='.$sender_user_id.'"><img src="'.$friends_profile['file'].'"/></a>';
$socialInvitationsBlock .= '</div>';
$socialInvitationsBlock .= '<div class="col-md-10">';
$socialInvitationsBlock .= '<h4 class="title-profile"><a href="profile.php?u='.$sender_user_id.'">
'.api_get_person_name($user_info['firstName'], $user_info['lastName']).'</a>:
</h4>';
$socialInvitationsBlock .= '<div class="content-invitation">'.$content.'</div>';
$socialInvitationsBlock .= '<div class="date-invitation">'.get_lang('DateSend').' : '.$date.'</div>';
$socialInvitationsBlock .= '<div class="btn-group" role="group">
<button class="btn btn-success" type="submit" id="btn_accepted_'.$sender_user_id.'" onclick="javascript:register_friend(this)">
<i class="fa fa-check"></i> '.get_lang('AcceptInvitation').'</button>
<button class="btn btn-danger" type="submit" id="btn_deniedst_'.$sender_user_id.' " onclick="javascript:denied_friend(this)" >
<i class="fa fa-times"></i> '.get_lang('DenyInvitation').'</button>
';
$socialInvitationsBlock .= '</div>';
$socialInvitationsBlock .= '</div>';
$socialInvitationsBlock .= '</div></div>';
}
$socialInvitationsBlock .= '</div></div>';
}
if (count($list_get_invitation_sent) > 0) {
$social_right_content .= '<div class="row"><div class="span9">'.Display::page_subheader(get_lang('InvitationSent')).'</div></div>';
$socialInvitationsBlock .= '<div class="panel panel-default">';
$socialInvitationsBlock .= '<div class="panel-heading">'.get_lang('InvitationSent').'</div>';
$socialInvitationsBlock .= '<div class="panel-body">';
foreach ($list_get_invitation_sent as $invitation) {
$sender_user_id = $invitation['user_receiver_id'];
$social_right_content .= '<div id="id_'.$sender_user_id.'" class="row invitation-clear">';
$socialInvitationsBlock .= '<div id="id_'.$sender_user_id.'" class="well">';
$picture = UserManager::get_user_picture_path_by_id($sender_user_id, 'web', false, true);
$friends_profile = SocialManager::get_picture_user($sender_user_id, $picture['file'], 92);
@ -195,62 +198,53 @@ if (count($list_get_invitation_sent) > 0) {
$title = Security::remove_XSS($invitation['title'], STUDENT, true);
$content = Security::remove_XSS($invitation['content'], STUDENT, true);
$date = api_convert_and_format_date($invitation['send_date'], DATE_TIME_FORMAT_LONG);
$social_right_content .= '
<div class="span2">
<a class="thumbnail" href="profile.php?u='.$sender_user_id.'">
<img src="'.$friends_profile['file'].'" /></a>
</div>
<div class="span7">
<a class="profile_link" href="profile.php?u='.$sender_user_id.'">'.api_get_person_name($user_info['firstName'], $user_info['lastName']).'</a>
<div>
'. $title.' : '.$content.'
</div>
<div>
'. get_lang('DateSend').' : '.$date.'
</div>
</div>
</div>';
$socialInvitationsBlock .= '<div class="row">';
$socialInvitationsBlock .= '<div class="col-md-2">';
$socialInvitationsBlock .= '<a href="profile.php?u='.$sender_user_id.'"><img src="'.$friends_profile['file'].'" /></a>';
$socialInvitationsBlock .= '</div>';
$socialInvitationsBlock .= '<div class="col-md-10">';
$socialInvitationsBlock .= '<h4 class="title-profile"><a class="profile_link" href="profile.php?u='.$sender_user_id.'">'.api_get_person_name($user_info['firstName'], $user_info['lastName']).'</a></h4>';
$socialInvitationsBlock .= '<div class="content-invitation">'.$title.' : '.$content.'</div>';
$socialInvitationsBlock .= '<div class="date-invitation">'. get_lang('DateSend').' : '.$date.'</div>';
$socialInvitationsBlock .= '</div>';
$socialInvitationsBlock .= '</div></div>';
}
$socialInvitationsBlock .= '</div></div>';
}
if (count($pending_invitations) > 0) {
$social_right_content .= '<div class="row"><div class="span9">'.Display::page_subheader(get_lang('GroupsWaitingApproval')).'</div></div>';
$socialInvitationsBlock .= '<div class="panel panel-default">';
$socialInvitationsBlock .= '<div class="panel-heading">'.get_lang('GroupsWaitingApproval').'</div>';
$socialInvitationsBlock .= '<div class="panel-body">';
$new_invitation = array();
foreach ($pending_invitations as $invitation) {
$picture = GroupPortalManager::get_picture_group($invitation['id'], $invitation['picture_uri'],80);
$img = '<img class="social-groups-image" src="'.$picture['file'].'" />';
$invitation['picture_uri'] = '<a href="groups.php?id='.$invitation['id'].'">'.$img.'</a>';
$invitation['name'] = '<div class="title-group"><a href="groups.php?id='.$invitation['id'].'">'.cut($invitation['name'],120,true).'</a></div>';
$invitation['join'] = '<a class="btn btn-success" href="invitations.php?accept='.$invitation['id'].'">'.get_lang('AcceptInvitation').'</a>';
$invitation['deny'] = '<a class="btn btn-danger" href="invitations.php?deny='.$invitation['id'].'">'.get_lang('DenyInvitation').'</a>';
$invitation['name'] = '<a href="groups.php?id='.$invitation['id'].'">'.cut($invitation['name'],120,true).'</a>';
$invitation['description'] = cut($invitation['description'],220,true);
$new_invitation[]=$invitation;
$social_right_content .= '<div class="row invitation-clear">
<div class="span2"><div class="thumbnail">'.$invitation['picture_uri'].'</div></div>
<div class="span7">'
.$invitation['name'].'<div class="description-group">'.$invitation['description'].'</div>
<div class="buttons">'.$invitation['join'].' '.$invitation['deny'].'</div>
</div>
</div>
';
$socialInvitationsBlock .= '<div class="well"><div class="row">';
$socialInvitationsBlock .= '<div class="col-md-2">'.$invitation['picture_uri'].'</div>';
$socialInvitationsBlock .= '<div class="col-md-10">';
$socialInvitationsBlock .= '<h4 class="tittle-profile">'.$invitation['name'].'</h4>';
$socialInvitationsBlock .= '<div class="description-group">'.$invitation['description'].'</div>';
$socialInvitationsBlock .= '<div class="btn-group" role="group">';
$socialInvitationsBlock .= '<a class="btn btn-success" href="invitations.php?accept='.$invitation['id'].'"><i class="fa fa-check"></i> '.get_lang('AcceptInvitation').'</a>';
$socialInvitationsBlock .= '<a class="btn btn-danger" href="invitations.php?deny='.$invitation['id'].'"><i class="fa fa-times"></i> '.get_lang('DenyInvitation').'</a>';
$socialInvitationsBlock .='</div>';
$socialInvitationsBlock .= '</div></div>';
}
/*$social_right_content .= Display::return_sortable_grid(
'waiting_user',
array(),
$new_invitation,
array('hide_navigation'=>true, 'per_page' => 100),
array(),
false,
array(true, true, true, false, false, true, true, true, true)
);*/
$socialInvitationsBlock.='</div>';
}
$tpl = new Template(null);
$tpl->assign('social_avatar_block', $social_avatar_block);
$tpl->assign('social_menu_block', $social_menu_block);
$tpl->assign('social_right_content', $social_right_content);
$tpl->assign('social_invitations_block',$socialInvitationsBlock);
$tpl->assign('message', $show_message);
$tpl->assign('content', $content);
$social_layout = $tpl->get_template('social/invitations.tpl');

4
main/template/default/skill/badge_create.tpl
Unescape View File

@ -52,7 +52,7 @@
<a href="{{ _p.web_main }}admin/skill_badge.php">{{ 'Home' | get_lang }}</a>
</li>
<li>
<a href="{{ _p.web_main }}admin/skill_badge_list.php">{{ 'Insignias Actuales' | get_lang }}</a>
<a href="{{ _p.web_main }}admin/skill_badge_list.php">{{ 'BadgePreview' | get_lang }}</a>
</li>
<li class="active">
<a href="#">{{ 'Edit' | get_lang }}</a>
@ -113,7 +113,7 @@
<i class="fa fa-plus"></i> {{ 'DesignNewBadge' | get_lang }}
</button>
</div>
<p class="openbadges-text">Vista previa de la imagen</p>
<p class="openbadges-text">{{'OpenBadgeImagePreview' | get_lang }}</p>
<div class="openbadges-img {{ skill.icon ? '' : 'hide' }}" id="badge-container">
<img id="badge-preview" alt="{{ 'BadgePreview' | get_lang }}" src="{{ skill.icon ? [_p.web_data, skill.icon] | join('') : '' }}">
</div>

29
main/template/default/social/add_groups.tpl
Unescape View File

@ -0,0 +1,29 @@
{% extends template ~ "/layout/layout_1_col.tpl" %}
{% block content %}
<div class="row">
<div class="col-md-3">
<div class="social-menu">
{{ social_avatar_block }}
{{ social_menu_block }}
</div>
</div>
<div id="wallMessages" class="col-md-5" style="min-height:1px">
<div class="row">
<div class="col-md-12">
<div id="message_ajax_reponse" class=""></div>
</div>
</div>
<div class="row">
{{ social_right_content}}
</div>
<div id="display_response_id" class="col-md-5"></div>
{{ socialAutoExtendLink }}
</div>
<div class="col-md-4">
<div class="row">
{{ socialRightInformation}}
</div>
</div>
</div>
{% endblock %}

18
main/template/default/social/inbox.tpl
Unescape View File

@ -8,22 +8,8 @@
{{ social_menu_block }}
</div>
</div>
<div id="wallMessages" class="col-md-5" style="min-height:1px">
<div class="row">
<div class="col-md-12">
<div id="message_ajax_reponse" class=""></div>
</div>
</div>
<div class="row">
{{ social_right_content}}
</div>
<div id="display_response_id" class="span5"></div>
{{ socialAutoExtendLink }}
</div>
<div class="col-md-4">
<div class="row">
{{ socialRightInformation}}
</div>
<div class="col-md-9">
{{ social_right_content}}
</div>
</div>
{% endblock %}

18
main/template/default/social/invitations.tpl
Unescape View File

@ -8,22 +8,8 @@
{{ social_menu_block }}
</div>
</div>
<div id="wallMessages" class="col-md-5" style="min-height:1px">
<div class="row">
<div class="col-md-12">
<div id="message_ajax_reponse" class=""></div>
</div>
</div>
<div class="row">
{{ social_right_content}}
</div>
<div id="display_response_id" class="span5"></div>
{{ socialAutoExtendLink }}
</div>
<div class="col-md-4">
<div class="row">
{{ socialRightInformation}}
</div>
<div class="col-md-9">
{{ social_invitations_block }}
</div>
</div>
{% endblock %}
Write Preview
Loading…
Cancel
Save