Merge pull request #1086 from aragonc/1.11.x

fix css tables reports course CT#8150 for 1.11.x
ofaj
Alex Aragon Calixto 9 years ago
commit 6b0bd0eeea
  1. 16
      app/Resources/public/css/base.css
  2. 9
      main/inc/lib/sortable_table.class.php
  3. 6
      main/mySpace/course.php

@ -328,14 +328,14 @@ ul#navigation .report a {
position: relative;
width: 100%;
height:600px;
}
.impress-title{
}
.impress-title{
position: absolute;
top:40%;
left: 0%;
text-align: center;
width: 100%;
}
}
.impress-title h1{
font-size: 35px;
}
@ -2390,6 +2390,9 @@ form .formw .freeze {
margin-top: 5px;
margin-bottom: 5px;
}
.table{
font-size: 12px;
}
.table-well{
background:#ffffff;
border:1px solid #dddddd;
@ -4716,6 +4719,9 @@ div#chat-remote-video video {
#children .parent .big-icon .sequence-deleted{
font-size: 12px;
}
.form-search{
padding-bottom: 50px;
}
/* INSTALL CHAMILO */
#page-install .logo{
text-align: center;
@ -4762,6 +4768,10 @@ div#chat-remote-video video {
#page-install .page-header{
margin: 20px 0px 20px;
}
.page-header h2{
font-size: 22px;
margin-top: 25px;
}
#page-install .normal-message{
padding: 20px;
margin: 20px 0;

@ -126,7 +126,7 @@ class SortableTable extends HTML_Table
$table_id = $table_name.uniqid();
}
$this->table_id = $table_id;
parent::__construct(array('class' => 'data_table', 'id' => $table_id));
parent::__construct(array('class' => 'data_table table', 'id' => $table_id));
$this->table_name = $table_name;
$this->additional_parameters = array();
$this->param_prefix = $table_name.'_';
@ -231,7 +231,9 @@ class SortableTable extends HTML_Table
*/
public function display()
{
echo $this->return_table();
}
/**
@ -335,7 +337,8 @@ class SortableTable extends HTML_Table
$html .= '</form>';
}
}
return $html;
return '<div class="table-responsive">' . $html . '</div>';
}
/**
@ -761,7 +764,7 @@ class SortableTable extends HTML_Table
* @param string $td_attributes Additional attributes for the td-tags of the
* column
*/
public function set_header($column, $label, $sortable = true, $th_attributes = null, $td_attributes = null)
public function set_header($column, $label, $sortable = true, $th_attributes = array('class' => 'th-header'), $td_attributes = null)
{
$this->headers[$column] = array(
'label' => $label,

@ -312,10 +312,10 @@ $table = new SortableTable(
$table->set_header(0, get_lang('CourseTitle'), false);
$table->set_header(1, get_lang('NbStudents'), false);
$table->set_header(2, get_lang('TimeSpentInTheCourse').Display :: return_icon('info3.gif', get_lang('TimeOfActiveByTraining'), array('align' => 'absmiddle', 'hspace' => '3px')), false);
$table->set_header(2, get_lang('TimeSpentInTheCourse').Display :: return_icon('info.png', get_lang('TimeOfActiveByTraining'), array('align' => 'absmiddle', 'hspace' => '3px')), false);
$table->set_header(3, get_lang('ThematicAdvance'), false);
$table->set_header(4, get_lang('AvgStudentsProgress').Display :: return_icon('info3.gif', get_lang('AvgAllUsersInAllCourses'), array('align' => 'absmiddle', 'hspace' => '3px')), false);
$table->set_header(5, get_lang('AvgCourseScore').Display :: return_icon('info3.gif', get_lang('AvgAllUsersInAllCourses'), array('align' => 'absmiddle', 'hspace' => '3px')), false);
$table->set_header(4, get_lang('AvgStudentsProgress').Display :: return_icon('info.png', get_lang('AvgAllUsersInAllCourses'), array('align' => 'absmiddle', 'hspace' => '3px')), false);
$table->set_header(5, get_lang('AvgCourseScore').Display :: return_icon('info.png', get_lang('AvgAllUsersInAllCourses'), array('align' => 'absmiddle', 'hspace' => '3px')), false);
$table->set_header(6, get_lang('AvgMessages'), false);
$table->set_header(7, get_lang('AvgAssignments'), false);
$table->set_header(8, get_lang('Attendances'), false);

Loading…
Cancel
Save