fix chat global active profiel friends BT#7683

app/Resources/public/css/base.css

@@ -6317,18 +6317,34 @@ a.sessionView {
   font-size: 20px;
   border-bottom: 1px solid #E5E5E5;
 }
-#chat-video-panel #listFriends .list-group-item{
+#listFriends .list-group-item{
   border: none;
   padding: 6px;
   font-size: 12px;
 }
-#chat-video-panel #listFriends a{
+
+#listFriends a{
   display: block;
+  text-overflow: ellipsis;
+}
+#listFriends a .username{
+    display: inline-block;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    width: 120px;
+}
+#chat-video-panel #listFriends a .username{
+    display: inline-block;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    width: 180px;
 }
-#chat-video-panel #listFriends .status{
+#listFriends .status{
   float: right;
 }
-#chat-video-panel #listFriends .user-image{
+#listFriends .user-image{
   width: 32px;
   height: 32px;
   margin-right: 5px;

main/inc/lib/social.lib.php

@@ -1649,16 +1649,21 @@ class SocialManager extends UserManager
                         $statusIcon = Display::return_icon('statusoffline.png',get_lang('Offline'));
                         $status=0;
                     }
-
+                    
                     $friendHtml.= '<li class="list-group-item">';
                     $friendAvatarMedium = UserManager::getUserPicture($friend['friend_user_id'], USER_IMAGE_SIZE_MEDIUM);
                     $friendAvatarSmall = UserManager::getUserPicture($friend['friend_user_id'], USER_IMAGE_SIZE_SMALL);
                     $friend_avatar = '<img src="'.$friendAvatarMedium.'" id="imgfriend_'.$friend['friend_user_id'].'" title="'.$name_user.'" class="user-image"/>';
-                    error_log($friendAvatarSmall);
-                    $friendHtml .= '<a onclick="javascript:chatWith(\''.$friend['friend_user_id'].'\', \''.$name_user.'\', \''.$status.'\',\''.$friendAvatarSmall.'\')" href="javascript:void(0);">';
-                    $link_shared = (empty($link_shared)) ? '' : '&'.$link_shared;
-                    $friendHtml .=  $friend_avatar.' '.$name_user;
-                    $friendHtml .= '<span class="status">' . $statusIcon . '</span>';
+                    if (api_is_global_chat_enabled()){
+                        $friendHtml .= '<a onclick="javascript:chatWith(\''.$friend['friend_user_id'].'\', \''.$name_user.'\', \''.$status.'\',\''.$friendAvatarSmall.'\')" href="javascript:void(0);">';
+                        $friendHtml .=  $friend_avatar.' <span class="username">' . $name_user . '</span>';
+                        $friendHtml .= '<span class="status">' . $statusIcon . '</span>';
+                    }else{
+                        $link_shared = (empty($link_shared)) ? '' : '&'.$link_shared;
+                        $friendHtml .= '<a href="profile.php?' .'u=' . $friend['friend_user_id'] . $link_shared . '">';
+                        $friendHtml .=  $friend_avatar.' <span class="username-all">' . $name_user . '</span>';
+                    }
+                    
                     $friendHtml .= '</a>';
                     $friendHtml.= '</li>';
                 }

main/social/profile.php

@@ -255,7 +255,7 @@ foreach ($sessionList as $session) {
 }
 
 // My friends
-$friend_html = SocialManager::listMyFriends(
+$friend_html = SocialManager::listMyFriendsBlock(
     $user_id,
     $link_shared,
     $show_full_profile

main/template/default/social/profile.tpl

@@ -4,8 +4,7 @@
 <div class="row">
     <div class="col-md-3">
         {{ social_avatar_block }}
-        {{ social_extra_info_block }}
-        {{ social_friend_block }}
+        {{ social_extra_info_block }}        
         <div class="social-menu">
             {{ social_menu_block }}
         </div>
@@ -16,6 +15,24 @@
         {{ social_auto_extend_link }}
     </div>
     <div class="col-md-3">
+        <div class="chat-friends">
+                <div class="panel-group" id="blocklistFriends" role="tablist" aria-multiselectable="true">
+                    <div class="panel panel-default">
+                        <div class="panel-heading" role="tab" id="headingOne">
+                            <h4 class="panel-title">
+                                <a role="button" data-toggle="collapse" data-parent="#blocklistFriends" href="#listFriends" aria-expanded="true" aria-controls="listFriends">
+                                    {{ "SocialFriend" | get_lang }}
+                                </a>
+                            </h4>
+                        </div>
+                    <div id="listFriends" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+                        <div class="panel-body">
+                            {{ social_friend_block }}
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
         {{ social_skill_block }}
         {{ social_group_info_block }}
         {{ social_course_block }}