change of appearance of widget user invitations pending - refs BT#7683

app/Resources/public/css/base.css

@@ -5820,6 +5820,17 @@ footer{
 .list-backups-options{
     list-style: none;
 }
+#invitations-acordion .list-group{
+    margin-bottom: 10px;
+}
+#invitations-acordion .list-group .list-group-item{
+    padding: 0;
+    border: none;
+    margin-top: 5px;
+}
+#invitations-acordion .list-group .list-group-item img{
+    margin-right: 5px;
+}
 /* CSS NEW TOP ******************************************************************************/
 /* CSS Responsive */
 @media (min-width: 1025px) and (max-width: 1200px) {

main/social/invitations.php

@@ -110,6 +110,7 @@ if ($total_invitations == 0 && count($_GET) <= 0) {
 
 if ($number_loop != 0) {
     $invitationHtml = '';
+    
     foreach ($list_get_invitation as $invitation) {
         $sender_user_id = $invitation['user_sender_id'];
         $user_info = api_get_user_info($sender_user_id);

main/social/profile.php

@@ -192,7 +192,7 @@ function register_friend(element_input) {
         $.ajax({
             contentType: "application/x-www-form-urlencoded",
             beforeSend: function(objeto) {
-                $("div#dpending_"+user_friend_id).html("<img src=\'../inc/lib/javascript/indicator.gif\' />");
+                $("li#dpending_"+user_friend_id).html("<img src=\'../inc/lib/javascript/indicator.gif\' />");
             },
             type: "POST",
             url: "'.api_get_path(WEB_AJAX_PATH).'social.ajax.php?a=add_friend",
@@ -596,40 +596,29 @@ if ($show_full_profile) {
         //Pending invitations
         if (!isset($_GET['u']) || (isset($_GET['u']) && $_GET['u']==api_get_user_id())) {
             if ($count_pending_invitations > 0) {
-                $invitations =  '<div><h3>'.get_lang('PendingInvitations').'</h3></div>';
+                
+                $invitations =  '<ul class="list-group">';
+                
                 for ($i=0;$i<$count_pending_invitations;$i++) {
                     $user_invitation_id = $pending_invitations[$i]['user_sender_id'];
-                    $invitations .=  '<div id="dpending_'.$user_invitation_id.'" class="friend_invitations">';
-                        $invitations .=  '<div style="float:left;width:60px;" >';
-                            $invitations .=  '<img style="margin-bottom:5px;"'
+                    $invitations .=  '<li id="dpending_'.$user_invitation_id.'" class="list-group-item">';
+                    $invitations .=  '<img class="img-rounded" '
                                 .' src="'.$list_get_path_web[$i]['dir'].'/'.$list_get_path_web[$i]['file'].'"'
-                                .' width="60px">';
-                        $invitations .=  '</div>';
-
-                        $invitations .=  '<div style="padding-left:70px;">';
-                            $user_invitation_info = api_get_user_info($user_invitation_id);
-                            $invitations .=  '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php'
-                                .'?u='.$user_invitation_id.'">'
-                                .api_get_person_name(
-                                    $user_invitation_info['firstname'],
-                                    $user_invitation_info['lastname'])
-                                .'</a>';
-                            $invitations .=  '<br />';
-                            $invitations .=  Security::remove_XSS(
-                                cut($pending_invitations[$i]['content'], 50),
-                                STUDENT,
-                                true
-                            );
-                            $invitations .=  '<br />';
-                            $invitations .=  '<a id="btn_accepted_'.$user_invitation_id.'"'
-                                .' class="btn btn-default" onclick="register_friend(this)" href="javascript:void(0)">'
-                                .get_lang('SocialAddToFriends')
-                                .'</a>';
-                            $invitations .=  '<div id="id_response"></div>';
-                        $invitations .=  '</div>';
-                    $invitations .=  '</div>';
+                                .' width="40px">';
+                    $userInfo = api_get_user_info($user_invitation_id);
+                    $invitations .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$user_invitation_id.'">'
+                                 .api_get_person_name($userInfo['firstname'],$userInfo['lastname']).'</a>';
+                    
+                    $invitations .='<div class="pull-right">';
+                    $invitations .=  '<a title="'.get_lang('SocialAddToFriends').'" id="btn_accepted_'.$user_invitation_id.'" class="btn btn-default btn-sm" onclick="register_friend(this)" href="javascript:void(0)">'
+                                . Display::returnFontAwesomeIcon('plus').'</a>';
+                    $invitations .= '</div>';
+                    $invitations .=  '<div id="id_response"></div>';
+                    $invitations .=  '</li>';
                 }
-                $socialRightInformation .=  SocialManager::social_wrapper_div($invitations, 4);
+                $invitations .= '</ul>';
+                $listInvitations = Display::panelCollapse(get_lang('PendingInvitations'), $invitations, 'invitations', null, 'invitations-acordion', 'invitations-collapse');
+               
             }
         }
 
@@ -697,6 +686,7 @@ $tpl->assign('social_group_info_block', $social_group_info_block);
 $tpl->assign('social_rss_block', $social_rss_block);
 $tpl->assign('social_skill_block', SocialManager::getSkillBlock($my_user_id));
 $tpl->assign('sessionList', $social_session_block);
+$tpl->assign('invitations', $listInvitations);
 $tpl->assign('social_right_information', $socialRightInformation);
 $tpl->assign('social_auto_extend_link', $socialAutoExtendLink);
 

main/template/default/social/profile.tpl

@@ -91,6 +91,9 @@
             </div>
          </div>
          {% endif %}
+         
+         {{ invitations }}
+         
 
         {{ social_rss_block }}
         {{ social_right_information }}