Browse Source

Merge pull request #836 from aragonc/bootstrap

Cambios Bootstrap 20
Yannick Warnier 9 years ago
parent
commit
3c6634b485
3 changed files with 9 additions and 9 deletions
  1. 1 1
      main/inc/lib/usermanager.lib.php
  2. 3 3
      main/social/friends.php
  3. 5 5
      main/social/invitations.php

+ 1 - 1
main/inc/lib/usermanager.lib.php

@@ -3615,7 +3615,7 @@ class UserManager
             FormValidator::LAYOUT_HORIZONTAL
         );
 
-        $form->addText('q', get_lang('UsersGroups'));
+        $form->addText('q', get_lang('UsersGroups'), false);
         $options = array(
             0 => get_lang('Select'),
             1 => get_lang('User'),

+ 3 - 3
main/social/friends.php

@@ -93,9 +93,9 @@ if (isset($name_search) && $name_search != 'undefined') {
 $social_right_content = '<div class="col-md-9">';
 
 if (count($friends) == 0) {
-    $social_right_content .= get_lang('NoFriendsInYourContactList').'<br /><br />';
-    $social_right_content .= '<a class="btn btn-primary" href="search.php">
-								<i class="fa fa-search"></i>'.get_lang('TryAndFindSomeFriends').'</a>';
+    $social_right_content .= get_lang('NoFriendsInYourContactList').'<br />';
+    $social_right_content .= '<a class="btn btn-success" href="search.php">
+								<i class="fa fa-search"></i> '.get_lang('TryAndFindSomeFriends').'</a>';
 } else {
     $social_right_content .= get_lang('Search').'&nbsp;&nbsp; : &nbsp;&nbsp;';
     $social_right_content .= '<input class="social-search-image" type="text" id="id_search_image" name="id_search_image" onkeyup="search_image_social()" />';

+ 5 - 5
main/social/invitations.php

@@ -86,7 +86,7 @@ $total_invitations = $number_loop + count($list_get_invitation_sent) + count($pe
 if ($total_invitations == 0 && count($_GET) <= 0) {
     $socialInvitationsBlock .= '<div class="row">
         <div class="col-md-12">
-            <a class="btn btn-default" href="search.php">'.
+            <a class="btn btn-success" href="search.php"><i class="fa fa-search"></i> '.
                 get_lang('TryAndFindSomeFriends').'
             </a>
             </div>
@@ -99,16 +99,16 @@ 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="well">';
+        $invitationHtml .= '<div id="id_'.$sender_user_id.'" class="panel panel-default">';
 
         $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-3">';
-        $invitationHtml .= '<a href="profile.php?u='.$sender_user_id.'"><img src="'.$userPicture.'"/></a>';
+        $invitationHtml .= '<div class="col-md-2">';
+        $invitationHtml .= '<a href="profile.php?u='.$sender_user_id.'"><img class="img-responsive" src="'.$userPicture.'"/></a>';
         $invitationHtml .= '</div>';
-        $invitationHtml .= '<div class="col-md-9">';
+        $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>';