fix tables session data BT#7683

1.10.x
aragonc 9 years ago
parent f16b55b8ee
commit 77a903e541
  1. 4
      app/Resources/public/css/base.css
  2. 4
      main/inc/lib/course.lib.php
  3. 4
      main/inc/lib/display.lib.php
  4. 7
      main/session/resume_session.php
  5. 2
      main/template/default/session/resume_session.tpl

@ -6098,6 +6098,10 @@ div#chat-remote-video video {
border-bottom: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5;
font-size: 21px; font-size: 21px;
} }
#session-properties td, #session-user-list td, #session-user-list th{
text-align: left;
padding-left: 15px;
}
#whoisonline .items-user{ #whoisonline .items-user{
text-align: center; text-align: center;
/*border:1px solid #dddddd; */ /*border:1px solid #dddddd; */

@ -4464,7 +4464,7 @@ class CourseManager
$courses = Database::store_result($result, 'ASSOC'); $courses = Database::store_result($result, 'ASSOC');
$courses = self::process_hot_course_item($courses, $my_course_code_list); $courses = self::process_hot_course_item($courses, $my_course_code_list);
} }
return $courses; return $courses;
} }
@ -4523,7 +4523,7 @@ class CourseManager
) { ) {
$my_course['extra_info']['description_button'] = Display::url(get_lang('Description'), $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'], 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']); $my_course['extra_info']['teachers'] = CourseManager::get_teacher_list_from_course_code_to_string($course_info['code']);

@ -1670,13 +1670,13 @@ class Display
return self::page_subheader($title, $second_title); 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)) { if (!empty($second_title)) {
$second_title = Security::remove_XSS($second_title); $second_title = Security::remove_XSS($second_title);
$title .= "<small> $second_title<small>"; $title .= "<small> $second_title<small>";
} }
return '<h3>'.Security::remove_XSS($title).'</h3>'; return '<'.$size.'>'.Security::remove_XSS($title).'</'.$size.'>';
} }
public static function page_subheader2($title, $second_title = null) public static function page_subheader2($title, $second_title = null)

@ -108,7 +108,7 @@ switch ($action) {
} }
$sessionHeader = Display::page_header( $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( $url = Display::url(
@ -121,6 +121,7 @@ $generalCoach = api_get_user_info($sessionInfo['id_coach']);
$sessionField = new ExtraField('session'); $sessionField = new ExtraField('session');
$extraFieldData = $sessionField->getDataAndFormattedValues($sessionId); $extraFieldData = $sessionField->getDataAndFormattedValues($sessionId);
$multiple_url_is_on = api_get_multiple_access_url(); $multiple_url_is_on = api_get_multiple_access_url();
$url_list = []; $url_list = [];
if ($multiple_url_is_on) { if ($multiple_url_is_on) {
@ -133,7 +134,7 @@ $url = Display::url(
); );
$courseListToShow = Display::page_subheader(get_lang('CourseList').$url); $courseListToShow = Display::page_subheader(get_lang('CourseList').$url);
$courseListToShow .= '<table class="data_table"> $courseListToShow .= '<table id="session-list-course" class="data_table">
<tr> <tr>
<th width="35%">'.get_lang('CourseTitle').'</th> <th width="35%">'.get_lang('CourseTitle').'</th>
<th width="30%">'.get_lang('CourseCoach').'</th> <th width="30%">'.get_lang('CourseCoach').'</th>
@ -268,7 +269,7 @@ $userListToShow = Display::page_subheader(get_lang('UserList').$url);
$userList = SessionManager::get_users_by_session($sessionId); $userList = SessionManager::get_users_by_session($sessionId);
if (!empty($userList)) { 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, 0, get_lang('User'));
$table->setHeaderContents(0, 1, get_lang('Status')); $table->setHeaderContents(0, 1, get_lang('Status'));

@ -5,7 +5,7 @@
{{ session_header }} {{ session_header }}
{{ title }} {{ title }}
<table class="data_table"> <table id="session-properties" class="data_table">
<tr> <tr>
<td>{{ 'GeneralCoach' | get_lang}} :</td> <td>{{ 'GeneralCoach' | get_lang}} :</td>
<td>{{ general_coach.complete_name }}</td> <td>{{ general_coach.complete_name }}</td>

Loading…
Cancel
Save