Minor fixes in social profile

skala
Julio Montoya 14 years ago
parent 0d396ef3fd
commit b8196ecbe2
  1. 6
      main/css/base.css
  2. 22
      main/inc/lib/social.lib.php
  3. 15
      main/social/profile.php

@ -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;
}

@ -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 .= '<div id="div_'.$count.'">';
@ -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[] = '<li><a href="'.api_get_path(WEB_CODE_PATH).'announcements/announcements.php?cidReq='.$course['code'].'"'.Display::return_icon('announcement.png',get_lang('Announcements'),array('hspace'=>'6')).$course_info['name'].' ('.$content['count'].')</a></li>';
}
$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 '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.get_lang('ToolAnnouncement').'</span></div>';

@ -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 '<div class="rounded_div" style="width:90%">';
echo '<div><h3>'.get_lang('MyGroups').'</h3></div>';
echo '<div class="rounded_div" style="width:90%">';
$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 '<div>'.$count_groups.'</div>';
echo '<div><h3>'.get_lang('MyGroups').' ('.$count_groups.') </h3></div>';
if ($i > $max_numbers_of_group) {
if (api_get_user_id() == $user_id) {
echo '<div class="box_shared_profile_group_actions"><a href="groups.php?#tab_browse-1">'.get_lang('SeeAllMyGroups').'</a></div>';
@ -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 '<div id="social_content'.$i.'" style="background : #EFEFEF; padding:0px; ">';
echo '</div>';
echo '<div id="social_content'.$i.'" class="course_social_content" style="display:none" ></div>';
$i++;
}
}

Loading…
Cancel
Save