diff --git a/main/css/base.css b/main/css/base.css index 2b2746e5da..2e12b29aa8 100644 --- a/main/css/base.css +++ b/main/css/base.css @@ -2506,4 +2506,10 @@ div.admin_section h4 { .userportal-order-courses-link a { float:right; +} + +.course_social_content { + background : #EFEFEF; + margin:10px 21px; + padding:10px; } \ No newline at end of file diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index 524e8b296b..f4fab6b844 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -442,14 +442,16 @@ class SocialManager extends UserManager { $s_htlm_status_icon=""; if ($s_course_status==1) { - $s_htlm_status_icon=Display::return_icon('course.gif', get_lang('Course')).' '.Display::return_icon('teachers.gif', get_lang('Status').': '.get_lang('Teacher'),array('style'=>'width:11px; height:11px')); + $s_htlm_status_icon = Display::return_icon('course.gif', get_lang('Course')).' '.Display::return_icon('teachers.gif', get_lang('Status').': '.get_lang('Teacher'),array('style'=>'width:11px; height:11px')); } if ($s_course_status==2) { - $s_htlm_status_icon=Display::return_icon('course.gif', get_lang('Course')).' '.Display::return_icon('coachs.gif', get_lang('Status').': '.get_lang('GeneralCoach'),array('style'=>'width:11px; height:11px')); + $s_htlm_status_icon = Display::return_icon('course.gif', get_lang('Course')).' '.Display::return_icon('coachs.gif', get_lang('Status').': '.get_lang('GeneralCoach'),array('style'=>'width:11px; height:11px')); } if ($s_course_status==5) { - $s_htlm_status_icon=Display::return_icon('course.gif', get_lang('Course')).' '.Display::return_icon('students.gif', get_lang('Status').': '.get_lang('Student'),array('style'=>'width:11px; height:11px')); + $s_htlm_status_icon = Display::return_icon('course.gif', get_lang('Course')).' '.Display::return_icon('students.gif', get_lang('Status').': '.get_lang('Student'),array('style'=>'width:11px; height:11px')); } + + $s_htlm_status_icon = Display::return_icon('course.gif', get_lang('Course')); //display course entry $result .= '
'; @@ -732,11 +734,15 @@ class SocialManager extends UserManager { $my_announcement_by_user_id= intval($user_id); $announcements = array(); foreach ($course_list_code as $course) { - $content = AnnouncementManager::get_all_annoucement_by_user_course($course['dbName'], $my_announcement_by_user_id); - $course_info=api_get_course_info($course['code']); - if (!empty($content)) { - $announcements[] = '
  • '6')).$course_info['name'].' ('.$content['count'].')
  • '; - } + $course_info = api_get_course_info($course['code']); + if (!empty($course_info)) { + $content = AnnouncementManager::get_all_annoucement_by_user_course($course_info['dbName'], $my_announcement_by_user_id); + + if (!empty($content)) { + $url = Display::url(Display::return_icon('announcement.png',get_lang('Announcements')).$course_info['name'].' ('.$content['count'].')', api_get_path(WEB_CODE_PATH).'announcements/announcements.php?cidReq='.$course['code']); + $announcements[] = Display::tag('li', $url); + } + } } if (!empty($announcements)) { echo '
    '; diff --git a/main/social/profile.php b/main/social/profile.php index e6756e172d..f98bb64bd7 100755 --- a/main/social/profile.php +++ b/main/social/profile.php @@ -222,9 +222,7 @@ if (is_array($personal_course_list)) { foreach ($personal_course_list as $my_course) { if ($i<=10) { $list[] = SocialManager::get_logged_user_course_html($my_course,$i); - //$course_list_code[] = array('code'=>$my_course['c'],'dbName'=>$my_course['db'], 'title'=>$my_course['i']); cause double $course_list_code[] = array('code'=>$my_course['c'],'dbName'=>$my_course['db']); - } else { break; } @@ -470,15 +468,15 @@ if ($show_full_profile) { } if (count($grid_my_groups) > 0) { - echo '
    '; - echo '

    '.get_lang('MyGroups').'

    '; + echo '
    '; $count_groups = 0; if (count($results) == 1 ) { - $count_groups = count($results).' '.get_lang('Group'); + $count_groups = count($results); } else { - $count_groups = count($results).' '.get_lang('Groups'); + $count_groups = count($results); } - echo '
    '.$count_groups.'
    '; + echo '

    '.get_lang('MyGroups').' ('.$count_groups.')

    '; + if ($i > $max_numbers_of_group) { if (api_get_user_id() == $user_id) { echo ''; @@ -510,8 +508,7 @@ if ($show_full_profile) { foreach($list as $key=>$value) { if ( empty($value[2]) ) { //if out of any session echo $value[1]; - echo '
    '; - echo '
    '; + echo ''; $i++; } }