Merge pull request #1301 from aragonc/1.11.x

Improved design invitations from friends on social network - refs BT#…

app/Resources/public/css/base.css

@@ -5803,6 +5803,41 @@ footer{
     margin-bottom: 2px;
 }
 /* CSS BACKUP *****/
+.elfinder-cwd-filename {
+    color: black !important;
+}
+.skill-badge-img{
+    width: 150px;
+    overflow: hidden;
+}
+.text-light{
+    color: #00CCFF;
+}
+#dropzone {
+    position: relative;
+    overflow: hidden;
+    direction: ltr;
+    cursor: pointer;
+    text-align: center;
+    color: #333;
+    font-weight: bold;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
+    border-radius: 10px;
+    width: auto;
+    margin-left: auto;
+    margin-right: auto;
+    height: auto;
+    line-height: 50px;
+    background-color: #D4E6F0;
+    border: 2px dashed #bbbbbb;
+    font-size: 120%;
+    margin-bottom: 0;
+}
+
+#upload_form .fa-plus-square-o, #upload_form .fa-minus-square-o {
+    cursor:pointer;
+}
 .item-backup{
     padding-top: 5px;
     padding-bottom: 5px;
@@ -5831,6 +5866,18 @@ footer{
 #invitations-acordion .list-group .list-group-item img{
     margin-right: 5px;
 }
+.block-invitation{
+    padding:10px;
+    border-radius: 5px;
+    border: 1px solid #ECF0F1;
+    margin-bottom: 10px;
+}
+.block-invitation .date-invitation{
+    font-size: 12px;
+}
+.block-invitation .title-profile{
+    font-weight: bold;
+}
 /* CSS NEW TOP ******************************************************************************/
 /* CSS Responsive */
 @media (min-width: 1025px) and (max-width: 1200px) {
@@ -6034,41 +6081,7 @@ footer{
         margin: -2.5px -15px;
     }
 }
-.elfinder-cwd-filename {
-    color: black !important;
-}
-.skill-badge-img{
-    width: 150px;
-    overflow: hidden;
-}
-.text-light{
-    color: #00CCFF;
-}
-#dropzone {
-    position: relative;
-    overflow: hidden;
-    direction: ltr;
-    cursor: pointer;
-    text-align: center;
-    color: #333;
-    font-weight: bold;
-    -moz-border-radius: 10px;
-    -webkit-border-radius: 10px;
-    border-radius: 10px;
-    width: auto;
-    margin-left: auto;
-    margin-right: auto;
-    height: auto;
-    line-height: 50px;
-    background-color: #D4E6F0;
-    border: 2px dashed #bbbbbb;
-    font-size: 120%;
-    margin-bottom: 0;
-}
 
-#upload_form .fa-plus-square-o, #upload_form .fa-minus-square-o {
-    cursor:pointer;
-}
 
 @-moz-keyframes wobblebar-loader {
     0% {

main/social/invitations.php

@@ -115,45 +115,50 @@ if ($number_loop != 0) {
         $sender_user_id = $invitation['user_sender_id'];
         $user_info = api_get_user_info($sender_user_id);
         $userPicture = $user_info['avatar'];
-        $invitationHtml .= '<div id="id_'.$sender_user_id.'" class="panel panel-default">';
+        $invitationHtml .= '<div id="id_'.$sender_user_id.'" class="block-invitation">';
 
         $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);
         $invitationHtml .= '<div class="row">';
         $invitationHtml .= '<div class="col-md-2">';
-        $invitationHtml .= '<a href="profile.php?u='.$sender_user_id.'"><img class="img-responsive" src="'.$userPicture.'"/></a>';
+        $invitationHtml .= '<a href="profile.php?u='.$sender_user_id.'"><img class="img-responsive img-rounded" src="'.$userPicture.'"/></a>';
         $invitationHtml .= '</div>';
         $invitationHtml .= '<div class="col-md-10">';
-        $invitationHtml .= '<h4 class="title-profile"><a href="profile.php?u='.$sender_user_id.'">
-                                    '.$user_info['complete_name'].'</a>:
-                                    </h4>';
-        $invitationHtml .= '<div class="content-invitation">'.$content.'</div>';
-        $invitationHtml .= '<div class="date-invitation">'.get_lang('DateSend').' : '.$date.'</div>';
-
-        $invitationHtml .= '<div class="btn-group" role="group">';
+        
+        $invitationHtml .= '<div class="pull-right">';
+        $invitationHtml .= '<div class="btn-group btn-group-sm" role="group">';
         $invitationHtml .= Display::toolbarButton(
-            get_lang('AcceptInvitation'),
+            null,
             api_get_path(WEB_AJAX_PATH) . 'social.ajax.php?' . http_build_query([
                 'a' => 'add_friend',
                 'friend_id' => $sender_user_id,
                 'is_my_friend' => 'friend'
             ]),
             'check',
-            'success',
+            'default',
             ['id' => 'btn-accept-' . $sender_user_id]
         );
         $invitationHtml .= Display::toolbarButton(
-            get_lang('DenyInvitation'),
+            null,
             api_get_path(WEB_AJAX_PATH) . 'social.ajax.php?' . http_build_query([
                 'a' => 'deny_friend',
                 'denied_friend_id' => $sender_user_id,
             ]),
             'times',
-            'danger',
+            'default',
             ['id' => 'btn-deny-' . $sender_user_id]
         );
         $invitationHtml .= '</div>';
+        $invitationHtml .= '</div>';
+        
+        $invitationHtml .= '<h5 class="title-profile"><a href="profile.php?u='.$sender_user_id.'">
+                            '.$user_info['complete_name'].'</a>:
+                            </h5>';
+        $invitationHtml .= '<div class="content-invitation">'.$content.'</div>';
+        $invitationHtml .= '<div class="date-invitation">'.get_lang('DateSend').' : '.$date.'</div>';
+        
+        
         $invitationHtml .= '</div>';
         $invitationHtml .= '</div></div>';
     }