diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css index dcff7e9b6b..08e7a74455 100644 --- a/main/css/blue_lagoon/default.css +++ b/main/css/blue_lagoon/default.css @@ -149,7 +149,7 @@ input.link_alike:hover { .coursestatusicons { border: 0px solid #000; float: left; - padding-right: 5px; + padding-right: 8px; width: auto; } /* user_portal course list */ @@ -2653,8 +2653,6 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus { background-image:url(images/shadow.gif); } - - .independent_course_item a { font-size:120%; } @@ -2662,3 +2660,8 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus { .session_course_item a { font-size:120%; } + + +#maincontent .courseslist li { + margin-bottom:8px; +} \ No newline at end of file diff --git a/main/social/groups.php b/main/social/groups.php index 312225e471..1827bd29ca 100644 --- a/main/social/groups.php +++ b/main/social/groups.php @@ -20,7 +20,7 @@ echo ''; $group_id = intval($_GET['id']); -if ($group_id != 0 ) { +if ($group_id != 0 ) { $group_info = GroupPortalManager::get_group_data($group_id); $picture = GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],160,'medium_'); $tags = GroupPortalManager::get_group_tags($group_id,true); @@ -73,30 +73,35 @@ if ($group_id != 0 ) { echo '
'; - if (in_array(api_get_user_id(), $users)) { + + + + if (is_array($users[api_get_user_id()]) && count($users[api_get_user_id()]) > 0) { //im a member - if (isset($users[api_get_user_id()]) && $users[api_get_user_id()]['relation_info']!='') { - $my_group_role = $users[api_get_get_user_id()]['relation_info']; + + if ($users[api_get_user_id()]['relation_type']!='') { + + $my_group_role = $users[api_get_user_id()]['relation_type']; // just a reader if ($my_group_role == GROUP_USER_PERMISSION_READER) { - echo 'Im just a reader'; - echo 'Invite others'; - echo 'Leave group'; + echo 'Leave group/'; + echo 'Invite others/'; //the main admin } elseif ($my_group_role == GROUP_USER_PERMISSION_ADMIN) { - echo 'Imm the admin'; - echo 'Edit group'; + echo 'Im the admin/'; + echo 'Edit group/'; echo 'Invite others'; } } else { //im not a member - echo 'I should register'; + echo 'Join group'; } } else { //im not a member - echo 'I should register'; + echo 'Join group'; } echo '
'; + } else { echo '

'.get_lang('Newest').'

';