Browse Source

Merge pull request #1080 from aragonc/1.10.x

fix css tables reports course CT#8150
Alex Aragon Calixto 9 years ago
parent
commit
632c63e573

+ 10 - 3
app/Resources/public/css/base.css

@@ -325,14 +325,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;
 }
@@ -2385,6 +2385,9 @@ form .formw .freeze {
   margin-top: 5px;
   margin-bottom: 5px;
 }
+.table{
+    font-size: 12px;
+}
 .table-well{
   background:#ffffff;
   border:1px solid #dddddd;
@@ -4757,6 +4760,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;

+ 4 - 2
main/inc/lib/sortable_table.class.php

@@ -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' => 'table table-bordered', '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 '<div class="table-responsive">';
         echo $this->return_table();
+        echo '</div>';
     }
 
     /**
@@ -761,7 +763,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,

+ 3 - 3
main/mySpace/course.php

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