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

Merge pull request #399 from aragonc/C7304

Browse Source 
Fix HTML and CSS structure social group - refs #7304
1.9.x
Yannick Warnier 11 years ago
parent d4d5d77aca 9046c68b58
commit 3638827dce
5 changed files with 61 additions and 37 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. 24
      main/css/base_chamilo.css
  2. 2
      main/css/chamilo/default.css
  3. 2
      main/inc/lib/display.lib.php
  4. 63
      main/social/invitations.php
  5. 7
      main/template/default/layout/social_layout.tpl

24
main/css/base_chamilo.css
Unescape View File

@ -1393,14 +1393,26 @@ a.read {
/* INVITATIONS */
.invitation_confirm {
padding-bottom: 10px;
border-bottom: 1px solid #D8DFEA;
.invitation-clear{
padding-bottom: 1em;
padding-top: 1em;
}
.invitation_image {
width:110px;
.invitation-clear .title-profile, .invitation-clear .title-group {
font-size: 15px;
font-weight: bold;
padding-bottom: 0.2em;
}
.invitation-clear .title-profile a, .invitation-clear .title-group a{
color: #333;
}
.invitation-clear .title-profile a:hover, .invitation-clear .title-group a:hover{
color: #666;
}
.invitation-clear .content-invitation, .invitation-clear .description-group {
color: #666;
font-size: 13px;
padding-bottom: 0.3em;
}
/* DASHBOARD */
/* Head section */

2
main/css/chamilo/default.css
Unescape View File

@ -118,7 +118,6 @@ a.thumbnail:hover{
}
.breadcrumb a{
line-height: 30px;
text-transform: none;
}
@ -441,7 +440,6 @@ a.thumbnail:hover{
}
.breadcrumb a{
padding-top: 0;
line-height: 30px;
text-transform: none;
}

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

@ -1661,7 +1661,7 @@ class Display
$second_title = Security::remove_XSS($second_title);
$title .= "<small> $second_title<small>";
}
return '<div class="page-header"><h2>'.Security::remove_XSS($title).'</h2></div>';
return '<h3>'.Security::remove_XSS($title).'</h3>';
}
public static function page_subheader2($title, $second_title = null)

63
main/social/invitations.php
Unescape View File

@ -94,7 +94,9 @@ if (is_array($_GET) && count($_GET)>0) {
$social_avatar_block = SocialManager::show_social_avatar_block('invitations');
$social_menu_block = SocialManager::show_social_menu('invitations');
$social_right_content = '<div id="id_response" align="center"></div>';
$social_right_content = '<div class="span9">
<div id="id_response" align="center"></div>
</div></div>';
$user_id = api_get_user_id();
$list_get_invitation = SocialManager::get_list_invitation_of_friends_by_user_id($user_id);
@ -105,15 +107,15 @@ $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="span8"><a class="btn" href="search.php">'.get_lang('TryAndFindSomeFriends').'</a></div>';
$social_right_content .= '<div class="row"><div class="span9"><a class="btn" href="search.php">'.get_lang('TryAndFindSomeFriends').'</a></div></div>';
}
if ($number_loop != 0) {
$social_right_content .= '<div class="span8">'.Display::page_subheader(get_lang('InvitationReceived')).'</div>';
$social_right_content .= '<div class="row"><div class="span9">'.Display::page_subheader(get_lang('InvitationReceived')).'</div></div>';
foreach ($list_get_invitation as $invitation) {
$sender_user_id = $invitation['user_sender_id'];
$social_right_content .= '<div id="id_'.$sender_user_id.'" class="invitation_confirm span8">';
$social_right_content .= '<div id="id_'.$sender_user_id.'" class="row invitation-clear">';
$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);
@ -123,20 +125,20 @@ if ($number_loop != 0) {
$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="span3">
<a href="profile.php?u='.$sender_user_id.'">'.api_get_person_name($user_info['firstName'], $user_info['lastName']).'</a> :
'.$content.'
<div>
<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="save" name="btn_accepted" type="submit" id="btn_accepted_'.$sender_user_id.'" value="'.get_lang('Accept').' "onclick="javascript:register_friend(this)">
'.get_lang('Accept').'</button>
<button class="cancel" name="btn_denied" type="submit" id="btn_deniedst_'.$sender_user_id.' " value="'.get_lang('Deny').' " onclick="javascript:denied_friend(this)" >
'.get_lang('Deny').'</button>
<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>';
@ -144,11 +146,11 @@ if ($number_loop != 0) {
}
if (count($list_get_invitation_sent) > 0) {
$social_right_content .= '<div class="span8">'.Display::page_subheader(get_lang('InvitationSent')).'</div>';
$social_right_content .= '<div class="row"><div class="span9">'.Display::page_subheader(get_lang('InvitationSent')).'</div></div>';
foreach ($list_get_invitation_sent as $invitation) {
$sender_user_id = $invitation['user_receiver_id'];
$social_right_content .= '<div id="id_'.$sender_user_id.'" class="invitation_confirm span8">';
$social_right_content .= '<div id="id_'.$sender_user_id.'" class="row invitation-clear">';
$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);
@ -162,7 +164,7 @@ if (count($list_get_invitation_sent) > 0) {
<a class="thumbnail" href="profile.php?u='.$sender_user_id.'">
<img src="'.$friends_profile['file'].'" /></a>
</div>
<div class="span3">
<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.'
@ -176,21 +178,28 @@ if (count($list_get_invitation_sent) > 0) {
}
if (count($pending_invitations) > 0) {
$social_right_content .= Display::page_subheader(get_lang('GroupsWaitingApproval'));
$social_right_content .= '<div class="row"><div class="span9">'.Display::page_subheader(get_lang('GroupsWaitingApproval')).'</div></div>';
$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'].'" hspace="4" height="50" border="2" align="left" width="50" />';
$img = '<img class="social-groups-image" src="'.$picture['file'].'" />';
$invitation['picture_uri'] = '<a href="groups.php?id='.$invitation['id'].'">'.$img.'</a>';
$invitation['name'] = '<a href="groups.php?id='.$invitation['id'].'">'.cut($invitation['name'],120,true).'</a>';
$invitation['join'] = '<a href="invitations.php?accept='.$invitation['id'].'">'.
Display::return_icon('accept_invitation.png', get_lang('AcceptInvitation')).'&nbsp;&nbsp;'.get_lang('AcceptInvitation').'</a>';
$invitation['deny'] = '<a href="invitations.php?deny='.$invitation['id'].'">'.
Display::return_icon('denied_invitation.png', get_lang('DenyInvitation')).'&nbsp;&nbsp;'.get_lang('DenyInvitation').'</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['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>
';
}
$social_right_content .= Display::return_sortable_grid(
/*$social_right_content .= Display::return_sortable_grid(
'waiting_user',
array(),
$new_invitation,
@ -198,7 +207,7 @@ if (count($pending_invitations) > 0) {
array(),
false,
array(true, true, true, false, false, true, true, true, true)
);
);*/
}
$tpl = new Template(null);

7
main/template/default/layout/social_layout.tpl
Unescape View File

@ -10,8 +10,13 @@
</div>
<div class="span9">
<div class="row">
<span id="message_ajax_reponse" class="span9"></span>
<div class="span9">
<div id="message_ajax_reponse" class=""></div>
</div>
</div>
<div class="row">
{{ social_right_content}}
</div>
<div id="display_response_id" class="span9"></div>
</div>
</div>

Write Preview
Loading…
Cancel
Save