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

Fixing social UI see #190

Browse Source
skala
Julio Montoya 16 years ago
parent 28ae52d104
commit a7240b3422
4 changed files with 53 additions and 47 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. 37
      main/css/blue_lagoon/default.css
  2. 6
      main/inc/lib/group_portal_manager.lib.php
  3. 21
      main/inc/lib/social.lib.php
  4. 36
      main/social/profile.php

37
main/css/blue_lagoon/default.css
Unescape View File

@ -2327,9 +2327,13 @@ div.image-social-content center.friend {
}
#social-content-right {
height:auto;
float:rigth;
overflow:hidden;
}
.social-content-image {
margin-bottom:10px;
}
#social-content-left {
float:left;
height:auto;
@ -2426,11 +2430,13 @@ div.image-social-content center.friend {
height:auto;
background-color:#32578b;
margin-bottom:10px;
padding-top:4px;
padding-bottom:4px;
}
.social-menu-text1 {
color:#fff;
font-size:14px;
font-weight:normal;
font-size:12px;
font-weight:bold;
}
.social-menu-text2 {
color:#000;
@ -2581,12 +2587,12 @@ div.image-social-content center.friend {
font-weight:bold;
}
.social-groups-text3 {
font-family:Verdana, Geneva, sans-serif;
font-size:12px;
color:#000;
font-weight:bold;
text-transform:capitalize;
margin-top:35px;
font-family:Verdana, Geneva, sans-serif;
font-size:12px;
color:#000;
font-weight:bold;
text-transform:capitalize;
margin-top:5px;
}
.social-groups-text4 {
font-family:Verdana, Geneva, sans-serif;
@ -2606,6 +2612,13 @@ div.image-social-content center.friend {
border:3px solid #E6E6E6;
}
#social-content-online {
background-color:#32578B;
margin-bottom:5px;
}
/*****************************************************
* BUTTONS *
*****************************************************/
@ -3233,7 +3246,7 @@ a.read {
.search_user_grid_container { width:100%;}
.search_user_grid_item { width:100px; height:100px; border:1px dotted #ccc; float:left; padding:5px; margin:5px; overflow:hidden;}
.search_user_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;}
.search_user_grid_element_0 img {width:50px;height:50px;border:3px solid #E6E6E6;}
.search_user_grid_element_0 img {width:50px;height:50px;border:2px solid #E6E6E6;}
.search_user_grid_element_1 { width:100%; text-align:center;}
.search_user_grid_element_2 { width:100%; text-align:center;}
@ -3245,6 +3258,10 @@ a.read {
height:165px;
margin-top:20px;
}
.search_group_grid_container {
margin-top:0px;
}
.search_group_grid_element_1 {
width:330px;

6
main/inc/lib/group_portal_manager.lib.php
Unescape View File

@ -896,7 +896,7 @@ class GroupPortalManager
echo '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('message_new.png', get_lang('NewTopic'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('NewTopic').'</span></a></li>';
echo '<li><a href="groups.php?id='.$group_id.'">'. Display::return_icon('notebook.gif', get_lang('MessageList'), array('hspace'=>'6')).'<span class="'.($show=='messages_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MessageList').'</span></a></li>';
echo '<li><a href="group_invitation.php?id='.$group_id.'">'. Display::return_icon('login_as.gif', get_lang('InviteFriends'), array('hspace'=>'6')).'<span class="'.($show=='invite_friends'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('InviteFriends').'</span></a></li>';
echo '<li><a href="groups.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'"><span class="social-menu-text4" >'.get_lang('LeaveGroup').'</span></a></li>';
echo '<li><a href="groups.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'. Display::return_icon('delete_data.gif', get_lang('LeaveGroup'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('LeaveGroup').'</span></a></li>';
break;
case GROUP_USER_PERMISSION_ADMIN:
$relation_group_title = get_lang('IamAnAdmin');
@ -910,7 +910,7 @@ class GroupPortalManager
echo '<li><a href="group_invitation.php?id='.$group_id.'">'. Display::return_icon('login_as.gif', get_lang('InviteFriends'), array('hspace'=>'6')).'<span class="'.($show=='invite_friends'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('InviteFriends').'</span></a></li>';
break;
case GROUP_USER_PERMISSION_PENDING_INVITATION:
echo '<li><a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'"><span class="social-menu-text4" >'.get_lang('YouHaveBeenInvitedJoinNow').'</span></a></li>';
echo '<li><a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.Display::return_icon('addd.gif', get_lang('YouHaveBeenInvitedJoinNow'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('YouHaveBeenInvitedJoinNow').'</span></a></li>';
break;
case GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER:
$relation_group_title = get_lang('WaitingForAdminResponse');
@ -926,7 +926,7 @@ class GroupPortalManager
echo '<li><a href="group_invitation.php?id='.$group_id.'">'. Display::return_icon('login_as.gif', get_lang('InviteFriends'), array('hspace'=>'6')).'<span class="'.($show=='invite_friends'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('InviteFriends').'</span></a></li>';
break;
default:
echo '<li><a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'"><span class="social-menu-text4" >'.get_lang('JoinGroup').'</a></span></li>';
echo '<li><a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.Display::return_icon('addd.gif', get_lang('YouHaveBeenInvitedJoinNow'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('JoinGroup').'</a></span></li>';
break;
}
echo '</ul>';

21
main/inc/lib/social.lib.php
Unescape View File

@ -646,7 +646,8 @@ class SocialManager extends UserManager {
$big_image = UserManager::get_picture_user($user_id, $img_array['file'],'',USER_IMAGE_SIZE_BIG);
$big_image = $big_image['file'].$big_image['dir'];
$show_groups = array('groups', 'group_messages', 'messages_list', 'group_add', 'mygroups', 'group_edit', 'member_list', 'invite_friends', 'waiting_list');
$show_messages = array('messages', 'messages_inbox', 'messages_outbox', 'messages_compose');
$show_messages = array('messages', 'messages_inbox', 'messages_outbox', 'messages_compose');
// Everybody can create groups
if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
$create_group_item = '<li class="social-menu-sub-level"><a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('edit.gif',get_lang('CreateAgroup'),array('hspace'=>'6','style'=>'float:left')).'<span class="'.($show=='group_add'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('CreateAgroup').'</span></a></li>';
@ -698,22 +699,24 @@ class SocialManager extends UserManager {
}
if ($show == 'shared_profile') {
if ($user_id != intval(api_get_user_id())) {
$user_info = api_get_user_info($user_id);
echo '<div><center><strong>'.api_get_person_name($user_info['firstName'], $user_info['lastName']).'</strong></center></div>';
}
//--- User image
echo '<div class="social-content-image">';
echo '<div class="social-background-content" style="width:80%;" ><center>';
if ($img_array['file'] != 'unknown.jpg') {
echo '<a class="thickbox" href="'.$big_image.'"><img src='.$img_array['dir'].$img_array['file'].' width="150px" /> </a><br /><br />';
echo '<a class="thickbox" href="'.$big_image.'"><img src='.$img_array['dir'].$img_array['file'].' width="150px" /> </a>';
} else {
echo '<img src='.$img_array['dir'].$img_array['file'].' width="150px"/><br /><br />';
echo '<img src='.$img_array['dir'].$img_array['file'].' width="150px"/>';
}
echo '</center></div>';
echo '</div>';
if ($user_id != intval(api_get_user_id())) {
$user_info = api_get_user_info($user_id);
echo '<div><center><strong>'.api_get_person_name($user_info['firstName'], $user_info['lastName']).'</strong></center></div><br />';
}
if ($show_full_profile && $user_id == intval(api_get_user_id())) {
echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></div>';
echo '<div>
@ -726,6 +729,8 @@ class SocialManager extends UserManager {
echo '</ul></div>';
}
$html_actions = '';
if ($user_id != api_get_user_id()) {
$html_actions = '&nbsp;<a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?height=300&width=610&user_friend='.$user_id.'&view=profile&view_panel=1" class="thickbox" title="'.get_lang('SendMessage').'">';

36
main/social/profile.php
Unescape View File

@ -207,16 +207,6 @@ $_SESSION['social_user_id'] = intval($user_id);
*/
Display :: display_header(null);
// @todo here we must show the user information as read only
//User picture size is calculated from SYSTEM path
$img_array= UserManager::get_user_picture_path_by_id($user_id,'web',true,true);
$big_image = UserManager::get_picture_user($user_id, $img_array['file'],'',USER_IMAGE_SIZE_BIG);
$big_image = $big_image['file'].$big_image['dir'];
//print_r($user_info);
// Added by Ivan Tcholakov, 03-APR-2009.
if (USE_JQUERY_CORNERS_SCRIPT) {
echo $s="<script>$(document).ready( function(){
@ -247,29 +237,23 @@ if (is_array($personal_course_list)) {
$course_list_code = array_unique_dimensional($course_list_code);
}
//show the action menu
//SocialManager::show_social_menu();
$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true);
$user_online_count = count($user_online_list);
echo '<div class="social-header">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.get_lang('ViewMySharedProfile').'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
</tr></table>';
/*
echo '<div class="social-menu-title" align="center"><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
*/
echo '</div>';
echo '<div id="social-content">';
echo '<div id="social-content-left">';
//this include the social menu div
SocialManager::show_social_menu('shared_profile', null, $user_id, $show_full_profile);
echo '</div>';
echo '<div id="social-content-left">';
//this include the social menu div
SocialManager::show_social_menu('shared_profile', null, $user_id, $show_full_profile);
echo '</div>';
echo '<div id="social-content-right">';
echo '<div id="social-content-online">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="'.api_get_path(WEB_PATH).'whoisonline.php" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a>';
echo '</div>';
echo '<div class="social-box-main1">';

Write Preview
Loading…
Cancel
Save