';
- $notifications = isset($params['notifications']) ? $params['notifications'] : null;
- $params['right_actions'] = isset($params['right_actions']) ? $params['right_actions'] : null;
- $html .= '
';
+ $html .= '
';
+ $html .= '
';
+ if (!empty($params['subtitle'])) {
+ $html .= '
' . $params['subtitle'] . '
';
+ }
if (isset($params['show_description'], $params['description']) && $params['show_description'] == 1) {
$html .= '
' . $params['description'] . '
';
}
- if (!empty($params['subtitle'])) {
- $html .= '
' . $params['subtitle'] . '
';
- }
$html .= $items_session;
$html .= '
';
$html .= '
';
@@ -3499,6 +3509,12 @@ class CourseManager
return '
' . $main_content . $sub_content . $sub_sub_content . '
';
}
+
+ public static function session_item_parent($main_content, $sub_content, $sub_sub_content = null)
+ {
+ return '
' . $main_content . $sub_content . $sub_sub_content . '
';
+ }
+
/**
* Display special courses (and only these) as several HTML divs of class userportal-course-item
*
@@ -3988,9 +4004,13 @@ class CourseManager
'blackboard_blue.png',
api_htmlentities($course_info['name']),
array(),
- ICON_SIZE_MEDIUM
+ ICON_SIZE_LARGE
);
-
+ // Display the "what's new" icons
+ $notifications = '';
+ if ($course_visibility != COURSE_VISIBILITY_CLOSED && $course_visibility != COURSE_VISIBILITY_HIDDEN) {
+ $notifications .= Display:: show_notification($course_info);
+ }
if ($session_accessible) {
if ($course_visibility != COURSE_VISIBILITY_CLOSED ||
$user_in_course_status == COURSEMANAGER
@@ -4009,13 +4029,13 @@ class CourseManager
if ($user_in_course_status == COURSEMANAGER || $sessionCourseAvailable) {
$session_url = api_get_path(WEB_COURSE_PATH) . $course_info['path'] . '/?id_session=' . $course_info['id_session'];
- $session_title = '
'. $params['icon'] .''. $course_info['name'] . '';
+ $session_title = '
';
} else {
$session_title = $course_info['name'];
}
} else {
$session_url = api_get_path(WEB_COURSE_PATH) . $course_info['path'] . '/';
- $session_title = '
' . $course_info['name'] . '';
+ $session_title = '
';
}
} else {
$session_title = $course_info['name'] . ' ' . Display::tag('span', get_lang('CourseClosed'),
@@ -4059,6 +4079,7 @@ class CourseManager
if (api_get_setting('display_teacher_in_courselist') == 'true') {
$teacher_list = null;
if (!$nosession) {
+
$teacher_list = CourseManager::get_teacher_list_from_course_code_to_string(
$course_info['code'],
self::USER_SEPARATOR,
@@ -4070,12 +4091,12 @@ class CourseManager
self::USER_SEPARATOR,
true
);
-
+ $icon_coachs = Display::return_icon('teacher.png','',null,ICON_SIZE_TINY);
if ($course_info['status'] == COURSEMANAGER || ($course_info['status'] == STUDENT && empty($course_info['id_session'])) || empty($course_info['status'])) {
$params['teachers'] = $teacher_list;
}
if (($course_info['status'] == STUDENT && !empty($course_info['id_session'])) || ($is_coach && $course_info['status'] != COURSEMANAGER)) {
- $params['coaches'] = $course_coachs;
+ $params['coaches'] = $icon_coachs.$course_coachs;
}
} else {
$params['teachers'] = $teacher_list;
@@ -4085,11 +4106,6 @@ class CourseManager
$session_title .= isset($course['special_course']) ? ' ' . Display::return_icon('klipper.png',
get_lang('CourseAutoRegister')) : '';
- // Display the "what's new" icons
- if ($course_visibility != COURSE_VISIBILITY_CLOSED && $course_visibility != COURSE_VISIBILITY_HIDDEN) {
- $session_title .= Display:: show_notification($course_info);
- }
-
$params['title'] = $session_title;
$params['extra'] = '';
diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php
index 189326b126..40b08772f0 100755
--- a/main/inc/lib/userportal.lib.php
+++ b/main/inc/lib/userportal.lib.php
@@ -1142,7 +1142,7 @@ class IndexManager
'window_list.png',
$session_box['title'],
array('id' => 'session_img_' . $session_id),
- ICON_SIZE_BIG
+ ICON_SIZE_MEDIUM
);
$extra_info = !empty($session_box['coach']) ? $session_box['coach'] : null;
$extra_info .= !empty($session_box['coach']) ? ' - '.$session_box['dates'] : $session_box['dates'];
@@ -1180,7 +1180,7 @@ class IndexManager
$params['description'] = $session_box['description'];
$params['show_description'] = $session_box['show_description'];
- $items_courses_session = '
'.$html_courses_session.'
';
+ $items_courses_session = '
'.$html_courses_session.'
';
/* Icon session no category */
$parentInfo = CourseManager::session_list_html($params,$items_courses_session,true);
@@ -1269,7 +1269,7 @@ class IndexManager
}
$params = array();
-
+ //Category
if ($count > 0) {
$session_box = Display:: get_session_title_box(
$session_id
@@ -1278,7 +1278,7 @@ class IndexManager
'window_list.png',
$session_box['title'],
array('id' => 'session_img_' . $session_id),
- ICON_SIZE_BIG
+ ICON_SIZE_MEDIUM
);
if (api_is_drh()) {
@@ -1299,19 +1299,21 @@ class IndexManager
$params['subtitle'] = (!empty($session_box['coach']) ? $session_box['coach'] . ' | ' : '') . $session_box['dates'];
if (api_is_platform_admin()) {
- $params['right_actions'] = '
' .
+ $params['right_actions'] = '';
}
/* Icon Session in category */
- $parentInfo = CourseManager::course_item_html(
- $params,
- true
- );
+ $parentInfo = '';
+ $parentInfo .= '
'.$params['title'].$params['right_actions'].'
';
+ $parentInfo .= '
';
+ $parentInfo .= $html_courses_session;
+ $parentInfo .= '
';
+ $parentInfo .= '
';
@@ -1354,7 +1356,7 @@ class IndexManager
$params['subtitle'] = get_lang('Until').' '.$session_category_end_date;
}
}
- $sessions_with_category .= CourseManager::course_item_parent(
+ $sessions_with_category .= CourseManager::session_item_parent(
CourseManager::course_item_html($params, true),
$html_sessions
);