diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css index 9d31c90843..92f11a7c25 100755 --- a/main/css/blue_lagoon/default.css +++ b/main/css/blue_lagoon/default.css @@ -2325,7 +2325,8 @@ div.image-social-content center.friend { #social-content-right { height:auto; float:rigth; - overflow:hidden; + overflow:hidden; + width:800px; } #social-content-left { float:left; @@ -2333,7 +2334,7 @@ div.image-social-content center.friend { margin-right:16px; min-height:300px; width:160px; - overflow:hidden; + overflow:hidden; } .social-content-description { background:#ECE9D8; @@ -2451,7 +2452,7 @@ div.image-social-content center.friend { font-family:Verdana, Geneva, sans-serif; color:#000; font-weight:bold; - font-size:13px; + font-size:12px; vertical-align:bottom; } .social-menu-title-right { diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index 08cc0c5bf1..90a8df8eb1 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -666,11 +666,11 @@ class SocialManager extends UserManager { if (in_array($show,$show_messages)) { - echo ''; } @@ -684,10 +684,10 @@ class SocialManager extends UserManager {
  • '.Display::return_icon('group.gif',get_lang('Groups'),array('hspace'=>'6')).''.get_lang('Groups').'
    • '; if (in_array($show,$show_groups)) { - echo ''; } echo '
  • '.Display::return_icon('search.gif',get_lang('Search'),array('hspace'=>'6')).''.get_lang('Search').'
    • diff --git a/main/messages/inbox.php b/main/messages/inbox.php index 8b8779d640..48b296e31f 100755 --- a/main/messages/inbox.php +++ b/main/messages/inbox.php @@ -138,7 +138,7 @@ $social_parameter = ''; if ($_GET['f']=='social' || api_get_setting('allow_social_tool') == 'true') { $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true); $user_online_count = count($user_online_list); - echo '
    '; + echo '
    '; echo '
    		  '.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'
    '; @@ -147,11 +147,6 @@ if ($_GET['f']=='social' || api_get_setting('allow_social_tool') == 'true') { echo ''; */ echo '
    '; - /* - echo '
    '; - echo get_lang('Messages'); - echo '
    '; - */ $social_parameter = '?f=social'; } else { //comes from normal profile diff --git a/main/messages/new_message.php b/main/messages/new_message.php index 033c29a5a7..338084518b 100755 --- a/main/messages/new_message.php +++ b/main/messages/new_message.php @@ -279,7 +279,7 @@ if ($group_id != 0) { $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true); $user_online_count = count($user_online_list); - echo '
    '; + echo ''; - /* - echo '
    '; - echo get_lang('Messages'); - echo '
    '; - */ } else { echo '
    '; if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true') { diff --git a/main/messages/outbox.php b/main/messages/outbox.php index 053654d600..50481d2a36 100755 --- a/main/messages/outbox.php +++ b/main/messages/outbox.php @@ -82,7 +82,7 @@ if ($_GET['f']=='social') { $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true); $user_online_count = count($user_online_list); - echo '
    '; + echo ''; - /* - echo '
    '; - echo get_lang('Messages'); - echo '
    '; - */ } else { diff --git a/main/messages/view_message.php b/main/messages/view_message.php index 32bc031fa2..8f03a4f4a9 100755 --- a/main/messages/view_message.php +++ b/main/messages/view_message.php @@ -34,7 +34,7 @@ Display::display_header(''); if ($_GET['f']=='social') { $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true); $user_online_count = count($user_online_list); - echo '
    '; + echo ''; - /* - echo '
    '; - echo get_lang('Messages'); - echo '
    '; - */ $social_parameter = '?f=social'; } else { if (api_get_setting('extended_profile') == 'true') { diff --git a/main/social/friends.php b/main/social/friends.php index 783f7bc2bd..e272ec6ce4 100755 --- a/main/social/friends.php +++ b/main/social/friends.php @@ -87,10 +87,9 @@ $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Friends')); Display :: display_header($tool_name, 'Groups'); - $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true); $user_online_count = count($user_online_list); -echo '
    '; +echo ''; -/* -echo '
    '; -echo get_lang('MyFriends'); -echo '
    '; -*/ + echo '
    '; echo '
    '; diff --git a/main/social/group_add.php b/main/social/group_add.php index 0660f89fd4..8e8a1530cc 100755 --- a/main/social/group_add.php +++ b/main/social/group_add.php @@ -102,7 +102,7 @@ Display :: display_header($tool_name, 'Groups'); $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true); $user_online_count = count($user_online_list); -echo '
    '; +echo ''; -/* -echo '
    '; -echo get_lang('Groups'); -echo '
    '; -*/ echo '
    '; echo '
    '; //show the action menu diff --git a/main/social/group_edit.php b/main/social/group_edit.php index 24502dbd96..35ade04566 100755 --- a/main/social/group_edit.php +++ b/main/social/group_edit.php @@ -127,7 +127,7 @@ Display::display_header($tool_name); $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true); $user_online_count = count($user_online_list); -echo '
    '; +echo ''; - -/* -echo '
    '; -echo get_lang('Groups'); -echo '
    '; -*/ - // Group picture $image_path = GroupPortalManager::get_group_picture_path_by_id($group_id,'web'); $image_dir = $image_path['dir']; diff --git a/main/social/group_invitation.php b/main/social/group_invitation.php index 7853ef1a95..815d54ec95 100755 --- a/main/social/group_invitation.php +++ b/main/social/group_invitation.php @@ -214,7 +214,7 @@ $users=$sessions=array(); Display :: display_header($tool_name, 'Groups'); $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true); $user_online_count = count($user_online_list); -echo '
    '; +echo ''; -/* -echo '
    '; -echo get_lang('Invitations'); -echo '
    '; -*/ - if($_POST['form_sent']) { $form_sent = $_POST['form_sent']; $firstLetterUser = $_POST['firstLetterUser']; diff --git a/main/social/group_members.php b/main/social/group_members.php index 4b2215ce51..db268735de 100755 --- a/main/social/group_members.php +++ b/main/social/group_members.php @@ -43,7 +43,7 @@ if (empty($group_id)) { Display :: display_header($tool_name, 'Groups'); $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true); $user_online_count = count($user_online_list); -echo '
    '; +echo ''; -/* -echo '
    '; -echo get_lang('GroupMembers'); -echo '
    '; -*/ - $show_message = ''; - //if i'm a moderator if (isset($_GET['action']) && $_GET['action']=='add') { // we add a user only if is a open group diff --git a/main/social/group_waiting_list.php b/main/social/group_waiting_list.php index 35fc71769e..a1866bfa52 100755 --- a/main/social/group_waiting_list.php +++ b/main/social/group_waiting_list.php @@ -43,7 +43,7 @@ Display :: display_header($tool_name, 'Groups'); $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true); $user_online_count = count($user_online_list); -echo '
    '; +echo ''; -/* -echo '
    '; -echo get_lang('GroupWaitingList'); -echo '
    '; -*/ - + // Group information $admins = GroupPortalManager::get_users_by_group($group_id, true, array(GROUP_USER_PERMISSION_ADMIN), 0, 1000); $show_message = ''; diff --git a/main/social/groups.php b/main/social/groups.php index 5cfc8ee3cb..7a2bfe48e3 100755 --- a/main/social/groups.php +++ b/main/social/groups.php @@ -147,7 +147,7 @@ $group_id = intval($_GET['id']); $relation_group_title = ''; $who_is_on_line = get_lang('UsersOnline').' '.count(WhoIsOnline(api_get_setting('time_limit_whosonline'),true)); -echo '
    '; +echo '