diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css index c8e4aa7944..f347ab4ba8 100755 --- a/main/css/blue_lagoon/default.css +++ b/main/css/blue_lagoon/default.css @@ -2329,7 +2329,6 @@ div.image-social-content center.friend { height:auto; float:rigth; overflow:hidden; - width:800px; } #social-content-left { float:left; @@ -2573,12 +2572,12 @@ div.image-social-content center.friend { .social-groups-text1 { font-family:Verdana, Geneva, sans-serif; font-size:12px; - color:#686868; + color:#669; } .social-groups-text2 { font-family:Verdana, Geneva, sans-serif; font-size:12px; - color:#666699; + color:#686868; font-weight:bold; } .social-groups-text3 { diff --git a/main/social/groups.php b/main/social/groups.php index 7a2bfe48e3..c402922e5d 100755 --- a/main/social/groups.php +++ b/main/social/groups.php @@ -271,7 +271,7 @@ if ($group_id != 0 ) { $url_open = ''; $url_close = ''; - $name = strtoupper(cut($result['name'],25,true)); + $name = api_strtoupper(cut($result['name'],25,true)); if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) { $name .= Display::return_icon('admin_star.png', get_lang('Admin'), array('style'=>'vertical-align:middle')); } elseif ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) { @@ -288,7 +288,7 @@ if ($group_id != 0 ) { $result['picture_uri'] = ''; $grid_item_1 = Display::return_icon('boxmygroups.jpg'); $item_1 = '
'.$url_open.$result['picture_uri'].'

'.$name.'
('.$count_users_group.')

'.$url_close.Display::return_icon('linegroups.jpg').'
'; - $item_2 = '
'.strtoupper(get_lang('DescriptionGroup')).'
'; + $item_2 = '
'.get_lang('GroupDescription').'
'; $item_3 = '
'.cut($result['description'],100,true).'
'; $item_4 = '
'.$url_open.get_lang('SeeMore').$url_close.'
'; $grid_item_2 = $item_1.$item_2.$item_3.$item_4; @@ -310,12 +310,12 @@ if ($group_id != 0 ) { $count_users_group = $count_users_group.' '.get_lang('Members'); } - $name = strtoupper(cut($result['name'],30,true)); + $name = api_strtoupper(cut($result['name'],30,true)); $picture = GroupPortalManager::get_picture_group($result['id'], $result['picture_uri'],80); $result['picture_uri'] = ''; $grid_item_1 = Display::return_icon('boxmygroups.jpg'); $item_1 = '
'.$url_open.$result['picture_uri'].'

'.$name.'
('.$count_users_group.')

'.$url_close.Display::return_icon('linegroups.jpg').'
'; - $item_2 = '
'.strtoupper(get_lang('DescriptionGroup')).'
'; + $item_2 = '
'.get_lang('GroupDescription').'
'; $item_3 = '
'.cut($result['description'],100,true).'
'; $item_4 = '
'.$url_open.get_lang('SeeMore').$url_close.'
'; $grid_item_2 = $item_1.$item_2.$item_3.$item_4; @@ -337,12 +337,12 @@ if ($group_id != 0 ) { } $count_users_group = $result['count']; - $name = strtoupper(cut($result['name'],30,true)); + $name = api_strtoupper(cut($result['name'],30,true)); $picture = GroupPortalManager::get_picture_group($result['id'], $result['picture_uri'],80); $result['picture_uri'] = ''; $grid_item_1 = Display::return_icon('boxmygroups.jpg'); $item_1 = '
'.$url_open.$result['picture_uri'].'

'.$name.'
('.$count_users_group.')

'.$url_close.Display::return_icon('linegroups.jpg').'
'; - $item_2 = '
'.strtoupper(get_lang('DescriptionGroup')).'
'; + $item_2 = '
'.get_lang('GroupDescription').'
'; $item_3 = '
'.cut($result['description'],100,true).'
'; $item_4 = '
'.$url_open.get_lang('SeeMore').$url_close.'
'; $grid_item_2 = $item_1.$item_2.$item_3.$item_4; @@ -356,33 +356,33 @@ if ($group_id != 0 ) { if (isset($_GET['view']) && in_array($_GET['view'],$allowed_views)) { $view_group = $_GET['view']; switch ($view_group) { - case 'mygroups' : echo '
'.strtoupper(get_lang('MyGroups')).'
'; + case 'mygroups' : echo '
'.api_strtoupper(get_lang('MyGroups')).'
'; if (count($grid_my_groups) > 0) { Display::display_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false)); } break; case 'newest' : if (count($grid_newest_groups) > 0) { - echo '
'.strtoupper(get_lang('Newest')).'
'; + echo '
'.api_strtoupper(get_lang('Newest')).'
'; Display::display_sortable_grid('newest', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false)); } break; default : if (count($grid_pop_groups) > 0) { - echo '
'.strtoupper(get_lang('Popular')).'
'; + echo '
'.api_strtoupper(get_lang('Popular')).'
'; Display::display_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true)); } break; } } else { - echo '
'.strtoupper(get_lang('MyGroups')).'
'; + echo '
'.api_strtoupper(get_lang('MyGroups')).'
'; if (count($grid_my_groups) > 0) { Display::display_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false)); } if (count($grid_newest_groups) > 0) { - echo '
'.strtoupper(get_lang('Newest')).'
'; + echo '
'.api_strtoupper(get_lang('Newest')).'
'; Display::display_sortable_grid('newest', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false)); } if (count($grid_pop_groups) > 0) { - echo '
'.strtoupper(get_lang('Popular')).'
'; + echo '
'.api_strtoupper(get_lang('Popular')).'
'; Display::display_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true)); } } @@ -393,6 +393,4 @@ if ($group_id != 0 ) { echo ''; echo ''; -Display :: display_footer(); -?> - +Display :: display_footer(); \ No newline at end of file