diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 8265c6d3f2..5ac5f86cb4 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -6098,6 +6098,10 @@ div#chat-remote-video video { border-bottom: 1px solid #E5E5E5; font-size: 21px; } +#session-properties td, #session-user-list td, #session-user-list th{ + text-align: left; + padding-left: 15px; +} #whoisonline .items-user{ text-align: center; /*border:1px solid #dddddd; */ diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php index d3f851a500..bfa26a39f0 100755 --- a/main/inc/lib/course.lib.php +++ b/main/inc/lib/course.lib.php @@ -4464,7 +4464,7 @@ class CourseManager $courses = Database::store_result($result, 'ASSOC'); $courses = self::process_hot_course_item($courses, $my_course_code_list); } - + return $courses; } @@ -4523,7 +4523,7 @@ class CourseManager ) { $my_course['extra_info']['description_button'] = Display::url(get_lang('Description'), api_get_path(WEB_AJAX_PATH) . 'course_home.ajax.php?a=show_course_information&code=' . $course_info['code'], - array('class' => 'btn btn-default ajax')); + array('class' => 'btn btn-default btn-sm btn-block ajax')); } $my_course['extra_info']['teachers'] = CourseManager::get_teacher_list_from_course_code_to_string($course_info['code']); diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index 5288fcb702..5c88f6be9e 100755 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -1670,13 +1670,13 @@ class Display return self::page_subheader($title, $second_title); } - public static function page_subheader($title, $second_title = null) + public static function page_subheader($title, $second_title = null, $size = 'h4') { if (!empty($second_title)) { $second_title = Security::remove_XSS($second_title); $title .= " $second_title"; } - return '

'.Security::remove_XSS($title).'

'; + return '<'.$size.'>'.Security::remove_XSS($title).''; } public static function page_subheader2($title, $second_title = null) diff --git a/main/session/resume_session.php b/main/session/resume_session.php index 4d60d35d68..7c8449f397 100644 --- a/main/session/resume_session.php +++ b/main/session/resume_session.php @@ -108,7 +108,7 @@ switch ($action) { } $sessionHeader = Display::page_header( - Display::return_icon('session.png', get_lang('Session')).' '.$sessionInfo['name'] + Display::return_icon('session.png', get_lang('Session')).' '.$sessionInfo['name'],null, 'h3' ); $url = Display::url( @@ -121,6 +121,7 @@ $generalCoach = api_get_user_info($sessionInfo['id_coach']); $sessionField = new ExtraField('session'); $extraFieldData = $sessionField->getDataAndFormattedValues($sessionId); + $multiple_url_is_on = api_get_multiple_access_url(); $url_list = []; if ($multiple_url_is_on) { @@ -133,7 +134,7 @@ $url = Display::url( ); $courseListToShow = Display::page_subheader(get_lang('CourseList').$url); -$courseListToShow .= ' +$courseListToShow .= '
@@ -268,7 +269,7 @@ $userListToShow = Display::page_subheader(get_lang('UserList').$url); $userList = SessionManager::get_users_by_session($sessionId); if (!empty($userList)) { - $table = new HTML_Table(array('class' => 'data_table')); + $table = new HTML_Table(array('class' => 'data_table','id'=>'session-user-list')); $table->setHeaderContents(0, 0, get_lang('User')); $table->setHeaderContents(0, 1, get_lang('Status')); diff --git a/main/template/default/session/resume_session.tpl b/main/template/default/session/resume_session.tpl index 69795b6a47..88a6316e1b 100644 --- a/main/template/default/session/resume_session.tpl +++ b/main/template/default/session/resume_session.tpl @@ -5,7 +5,7 @@ {{ session_header }} {{ title }} -
'.get_lang('CourseTitle').' '.get_lang('CourseCoach').'
+
{{ 'GeneralCoach' | get_lang}} : {{ general_coach.complete_name }}