';
//this include the social menu div
- SocialManager::show_social_menu('group_messages',$group_id);
+ SocialManager::show_social_menu('member_list',$group_id);
echo '
';
+ echo '
';
+ if (! empty($show_message)){
+ Display :: display_normal_message($show_message);
+ }
foreach($users as $user) {
switch ($user['relation_type']) {
case GROUP_USER_PERMISSION_ADMIN:
diff --git a/main/social/group_waiting_list.php b/main/social/group_waiting_list.php
index fb2126de3f..c1bc16be0d 100755
--- a/main/social/group_waiting_list.php
+++ b/main/social/group_waiting_list.php
@@ -39,11 +39,24 @@ if (empty($group_id)) {
Display :: display_header($tool_name, 'Groups');
-SocialManager::show_social_menu();
+
+$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
+$user_online_count = count($user_online_list);
+echo '
';
+echo '
|
+ | '.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).' |
+
';
+/*
+echo '';
+echo '
'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'
';
+*/
+echo '
';
+/*
echo '
';
echo get_lang('GroupWaitingList');
-echo '
';
-
+echo '
';
+*/
+
// Group information
$admins = GroupPortalManager::get_users_by_group($group_id, true, array(GROUP_USER_PERMISSION_ADMIN), 0, 1000);
$show_message = '';
@@ -79,40 +92,40 @@ if (isset($_GET['action']) && $_GET['action']=='set_moderator') {
}
}
-
-
-if (!empty($show_message)){
- Display :: display_normal_message($show_message);
-}
-
$users = GroupPortalManager::get_users_by_group($group_id, true, array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER), 0, 1000);
$new_member_list = array();
//Shows left column
-echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id());
-
-//-- Show message groups
-echo '
';
-
- // Display form
- foreach($users as $user) {
- switch ($user['relation_type']) {
- case GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER:
- $user['link'] = '
'.Display::return_icon('add_user.gif', get_lang('Accept')).'';
- $user['link'] .= '
'.Display::return_icon('add_teacher_big.gif', get_lang('Moderator')).'';
- $user['link'] .= '
'.Display::return_icon('delete.gif', get_lang('Deny')).'';
- break;
+//echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id());
+echo '
';
+ echo '
';
+ //this include the social menu div
+ SocialManager::show_social_menu('waiting_list',$group_id);
+ echo '
';
+ echo '
';
+ if (!empty($show_message)){
+ Display :: display_normal_message($show_message);
+ }
+ // Display form
+ foreach($users as $user) {
+ switch ($user['relation_type']) {
+ case GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER:
+ $user['link'] = '
'.Display::return_icon('add_user.gif', get_lang('Accept')).'';
+ $user['link'] .= '
'.Display::return_icon('add_teacher_big.gif', get_lang('Moderator')).'';
+ $user['link'] .= '
'.Display::return_icon('delete.gif', get_lang('Deny')).'';
+ break;
+ }
+ $new_member_list[] = $user;
}
- $new_member_list[] = $user;
- }
-
- if (count($new_member_list) > 0) {
- Display::display_sortable_grid('search_users', array(), $new_member_list, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, false, true,true,false,true,true));
- } else {
- Display :: display_normal_message(get_lang('ThereAreNotUsersInTheWaitingList'));
- }
+
+ if (count($new_member_list) > 0) {
+ Display::display_sortable_grid('search_users', array(), $new_member_list, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, false, true,true,false,true,true));
+ } else {
+ Display :: display_normal_message(get_lang('ThereAreNotUsersInTheWaitingList'));
+ }
+ echo '
';
+echo '
';
-echo '
'; // end layout right
Display :: display_footer();
?>
\ No newline at end of file
diff --git a/main/social/groups.php b/main/social/groups.php
index e6fd6d5d2e..8377a5bce7 100755
--- a/main/social/groups.php
+++ b/main/social/groups.php
@@ -129,7 +129,7 @@ if (isset($_POST['token']) && $_POST['token'] === $_SESSION['sec_token']) {
// getting group information
$group_id = intval($_GET['id']);
-$who_is_on_line = get_lang('UsersOnline').' '.count(WhoIsOnline(api_get_setting('time_limit_whosonline')));
+$who_is_on_line = get_lang('UsersOnline').' '.count(WhoIsOnline(api_get_setting('time_limit_whosonline'),true));
echo '
';
echo '
|
@@ -147,9 +147,13 @@ echo '';
echo '
';
//this include the social menu div
if ($group_id != 0 ) {
- SocialManager::show_social_menu('group_messages',$group_id);
+ SocialManager::show_social_menu('messages_list',$group_id);
} else {
- SocialManager::show_social_menu('groups');
+ $show_menu = 'groups';
+ if (isset($_GET['view']) && $_GET['view'] == 'mygroups') {
+ $show_menu = $_GET['view'];
+ }
+ SocialManager::show_social_menu($show_menu);
}
echo '
';
diff --git a/main/social/home.php b/main/social/home.php
index e194dec8b3..a6f3f08fee 100755
--- a/main/social/home.php
+++ b/main/social/home.php
@@ -52,7 +52,7 @@ if (api_get_setting('profile', 'picture') == 'true') {
Display :: display_header(null);
$user_info = UserManager :: get_user_info_by_id(api_get_user_id());
//$user_info = api_get_user_info(api_get_user_id());
-$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'));
+$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
$user_online_count = count($user_online_list);
echo '
';
@@ -70,9 +70,9 @@ echo '
';
echo '
';
//this include the social menu div
- SocialManager::show_social_menu();
+ SocialManager::show_social_menu('home');
echo '
';
- echo '
';
+ echo '
';
echo '
';
echo '
';
@@ -89,6 +89,8 @@ echo '
';
+
+ if (count($user_online_list) > 0) {
echo '
'.Display::return_icon('boxmygroups.jpg').'
@@ -99,6 +101,7 @@ echo '
';
echo '
';
+ }
echo '
';
@@ -160,4 +163,4 @@ echo '
';
echo '
';
echo '
';
-Display :: display_footer();
\ No newline at end of file
+Display :: display_footer();
diff --git a/main/social/invitations.php b/main/social/invitations.php
index ac2cd78132..1dc0443a23 100755
--- a/main/social/invitations.php
+++ b/main/social/invitations.php
@@ -67,7 +67,7 @@ api_block_anonymous_users();
Display :: display_header($tool_name, 'Groups');
-$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'));
+$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true);
$user_online_count = count($user_online_list);
echo '
';
echo '
|
diff --git a/main/social/profile.php b/main/social/profile.php
index 93c4ff1f4f..6a33bc1ffa 100755
--- a/main/social/profile.php
+++ b/main/social/profile.php
@@ -250,16 +250,10 @@ if (is_array($personal_course_list)) {
//show the action menu
//SocialManager::show_social_menu();
-$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'));
+$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true);
$user_online_count = count($user_online_list);
-//if ($user_id == api_get_user_id()) {
- $title = get_lang('ViewMySharedProfile');
-/*} else {
- $title = get_lang('ViewSharedProfile').' - '.api_get_person_name($user_info['firstname'], $user_info['lastname']);
-}
-*/
echo '';
-echo '
|
+echo ' |
| '.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).' |
';
/*
@@ -502,8 +496,11 @@ echo '';
$picture = GroupPortalManager::get_picture_group($result['id'], $result['picture_uri'],80);
$item_name = '
'.strtoupper($name). $icon.'
';
$item_description = '
'.get_lang('DescriptionGroup').'
'.cut($result['description'],120,true).'
';
- $result['picture_uri'] = '
';
- $item_actions = '
';
+ $result['picture_uri'] = '
';
+ $item_actions = '';
+ if (api_get_user_id() == $user_id) {
+ $item_actions = '
';
+ }
$grid_my_groups[]= array($item_name,$url_open.$result['picture_uri'].$url_close, $item_description.$item_actions);
$i++;
}
@@ -521,10 +518,12 @@ echo '
';
} else {
$count_groups = count($results).' '.get_lang('Groups');
}
- echo '
'.$count_groups.'
';
- if ($i > $max_numbers_of_group) {
- echo '
';
- }
+ echo '
'.$count_groups.'
';
+ if (api_get_user_id() == $user_id) {
+ if ($i > $max_numbers_of_group) {
+ echo '
';
+ }
+ }
Display::display_sortable_grid('shared_profile_mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
echo '
';
echo '
';
echo '
';
}
}
-
-
+
//--Productions
$production_list = UserManager::build_production_list($user_id);
// Images uploaded by course
@@ -664,8 +662,7 @@ echo '';
echo cut($user_info['competences'],$cut_size);
echo '
';
echo '
';
- }
-
+ }
if (!empty($user_info['diplomas'])) {
echo '';
echo '
'.get_lang('MyDiplomas').'
';
@@ -687,8 +684,7 @@ echo '
';
echo '
';
echo '
';
}
- echo '