diff --git a/main/admin/user_list.php b/main/admin/user_list.php index 129601fbaa..c46c41afb0 100755 --- a/main/admin/user_list.php +++ b/main/admin/user_list.php @@ -1124,7 +1124,7 @@ $table = new SortableTable( (api_is_western_name_order() xor api_sort_by_first_name()) ? 3 : 2 ); $table->set_additional_parameters($parameters); -$table->set_header(0, '', false, 'width="18px"'); +$table->set_header(0, ' ', false, 'width="18px"'); $table->set_header(1, get_lang('Photo'), false); $table->set_header(2, get_lang('OfficialCode')); @@ -1138,10 +1138,10 @@ if (api_is_western_name_order()) { $table->set_header(5, get_lang('LoginName')); $table->set_header(6, get_lang('Email')); $table->set_header(7, get_lang('Profile')); -$table->set_header(8, get_lang('Active'), true, 'width="15px"'); -$table->set_header(9, get_lang('RegistrationDate'), true, 'width="90px"'); -$table->set_header(10, get_lang('LatestLogin'), true, 'width="90px"'); -$table->set_header(11, get_lang('Action'), false, 'width="220px"'); +$table->set_header(8, get_lang('Active'), true); +$table->set_header(9, get_lang('RegistrationDate'), true); +$table->set_header(10, get_lang('LatestLogin'), true); +$table->set_header(11, get_lang('Action'), false); $table->set_column_filter(3, 'user_filter'); $table->set_column_filter(4, 'user_filter'); @@ -1149,6 +1149,7 @@ $table->set_column_filter(6, 'email_filter'); $table->set_column_filter(7, 'status_filter'); $table->set_column_filter(8, 'active_filter'); $table->set_column_filter(11, 'modify_filter'); +$table->setColAttributes(10, ['class' => 'text-nowrap']); // Hide email column if login is email, to avoid column with same data if (api_get_setting('login_is_email') === 'true') { @@ -1226,11 +1227,6 @@ if (0 == $table->get_total_number_of_items()) { ); $column++; } - $table->updateRowAttributes( - $row, - $row % 2 ? 'class="row_even"' : 'class="row_odd"', - true - ); $row++; } } diff --git a/main/exercise/TestCategory.php b/main/exercise/TestCategory.php index 217701739a..38d4f6011d 100644 --- a/main/exercise/TestCategory.php +++ b/main/exercise/TestCategory.php @@ -724,7 +724,7 @@ class TestCategory } $category_name_list = self::getListOfCategoriesNameForTest($exerciseId); - $table = new HTML_Table(['class' => 'table table-bordered', 'id' => 'category_results']); + $table = new HTML_Table(['class' => 'table table-hover table-striped table-bordered', 'id' => 'category_results']); $table->setHeaderContents(0, 0, get_lang('Categories')); $table->setHeaderContents(0, 1, get_lang('AbsoluteScore')); $table->setHeaderContents(0, 2, get_lang('RelativeScore')); diff --git a/main/exercise/question_pool.php b/main/exercise/question_pool.php index 54ce9ed3e4..4c29882207 100755 --- a/main/exercise/question_pool.php +++ b/main/exercise/question_pool.php @@ -1054,7 +1054,7 @@ echo '' echo ''; echo ''; -$table = new HTML_Table(['class' => 'table table-hover table-bordered data_table'], false); +$table = new HTML_Table(['class' => 'table table-hover table-striped table-bordered data_table'], false); $row = 0; $column = 0; foreach ($headers as $header) { diff --git a/main/gradebook/gradebook_display_summary.php b/main/gradebook/gradebook_display_summary.php index b87cbeb35a..9d00bd1245 100644 --- a/main/gradebook/gradebook_display_summary.php +++ b/main/gradebook/gradebook_display_summary.php @@ -177,7 +177,7 @@ $allowSkillRelItem = api_get_configuration_value('allow_skill_rel_items'); if (count($userList) == 0) { echo Display::return_message(get_lang('NoResultsAvailable'), 'warning'); } else { - echo '

'; + echo '

'; echo ''; diff --git a/main/inc/lib/exercise.lib.php b/main/inc/lib/exercise.lib.php index 3bc4196057..3ab63dc9fc 100644 --- a/main/inc/lib/exercise.lib.php +++ b/main/inc/lib/exercise.lib.php @@ -4957,7 +4957,7 @@ EOT; { $data = self::exerciseResultsInRanking($exerciseId, $courseId, $sessionId); - $table = new HTML_Table(['class' => 'table table-hover table-bordered']); + $table = new HTML_Table(['class' => 'table table-hover table-striped table-bordered']); $table->setHeaderContents(0, 0, get_lang('Position'), ['class' => 'text-right']); $table->setHeaderContents(0, 1, get_lang('Username')); $table->setHeaderContents(0, 2, get_lang('Score'), ['class' => 'text-right']); diff --git a/main/inc/lib/myspace.lib.php b/main/inc/lib/myspace.lib.php index 8771ff2dfa..323cfba60b 100644 --- a/main/inc/lib/myspace.lib.php +++ b/main/inc/lib/myspace.lib.php @@ -1063,7 +1063,7 @@ class MySpace $tableHtml = ''; // Printing table $total = 0; - $table = '
'; echo get_lang('Student'); echo '
'; + $table = '
'; $displayText = get_lang('Company'); $table .= ""; @@ -1190,7 +1190,7 @@ class MySpace } if ($csv == false) { $table = "
". - "
$displayText ".get_lang('CountOfSubscribedUsers')."
". + "
". "". "". "". diff --git a/main/inc/lib/sortable_table.class.php b/main/inc/lib/sortable_table.class.php index 9547a77364..2e9a87f4cd 100755 --- a/main/inc/lib/sortable_table.class.php +++ b/main/inc/lib/sortable_table.class.php @@ -142,7 +142,7 @@ class SortableTable extends HTML_Table if (empty($attributes)) { $attributes = []; - $attributes['class'] = 'table table-hover table-bordered data_table'; + $attributes['class'] = 'table table-hover table-striped table-bordered data_table'; $attributes['id'] = $table_id; } diff --git a/main/template/default/agenda/planification.tpl b/main/template/default/agenda/planification.tpl index c876420e6d..cd5fee9fef 100644 --- a/main/template/default/agenda/planification.tpl +++ b/main/template/default/agenda/planification.tpl @@ -24,7 +24,7 @@ {% if sessions|length > 0 %}
-
".get_lang('Author')."
+
diff --git a/main/template/default/agenda/student_boss_planification.tpl b/main/template/default/agenda/student_boss_planification.tpl index 6cf9094e1a..88eb19825e 100644 --- a/main/template/default/agenda/student_boss_planification.tpl +++ b/main/template/default/agenda/student_boss_planification.tpl @@ -23,7 +23,7 @@ {% if students|length > 0 %}
-
{{ 'Session'|get_lang }}
+
diff --git a/main/template/default/export/table_pdf.tpl b/main/template/default/export/table_pdf.tpl index 30a8ff4910..5be1fc29ac 100755 --- a/main/template/default/export/table_pdf.tpl +++ b/main/template/default/export/table_pdf.tpl @@ -7,7 +7,7 @@

{% endif %} - +
{% if pdf_student_info %}
diff --git a/main/tracking/courseLog.php b/main/tracking/courseLog.php index 783ac1a96e..2205c2dc64 100755 --- a/main/tracking/courseLog.php +++ b/main/tracking/courseLog.php @@ -751,7 +751,7 @@ if ($nbStudents > 0) { $groupContent = ''; echo Display::panel($html, $titleSession); -$groupTable = new HTML_Table(['class' => 'table table-hover table-bordered data_table']); +$groupTable = new HTML_Table(['class' => 'table table-hover table-striped table-bordered data_table']); $column = 0; $groupTable->setHeaderContents(0, $column++, get_lang('Name')); $groupTable->setHeaderContents(0, $column++, get_lang('TrainingTime')); diff --git a/plugin/dashboard/block_global_info/block_global_info.class.php b/plugin/dashboard/block_global_info/block_global_info.class.php index da9da65777..82472afa8b 100755 --- a/plugin/dashboard/block_global_info/block_global_info.class.php +++ b/plugin/dashboard/block_global_info/block_global_info.class.php @@ -100,7 +100,7 @@ class BlockGlobalInfo extends Block $content = '

'.get_lang('GlobalPlatformInformation').'

'; $data_table = null; if (!empty($global_data)) { - $data_table = ''; + $data_table = '
'; $i = 1; foreach ($global_data as $data) { if ($i % 2 == 0) { diff --git a/plugin/redirection/admin.php b/plugin/redirection/admin.php index 121e662f91..3e839bd741 100644 --- a/plugin/redirection/admin.php +++ b/plugin/redirection/admin.php @@ -51,12 +51,12 @@ if ($form->validate()) { $content = $form->returnForm(); $content .= '
-
+
- + '; foreach ($list as $item) { diff --git a/plugin/sepe/view/formative-actions-list.tpl b/plugin/sepe/view/formative-actions-list.tpl index 5e90a2be41..a9248c68d8 100644 --- a/plugin/sepe/view/formative-actions-list.tpl +++ b/plugin/sepe/view/formative-actions-list.tpl @@ -1,71 +1,71 @@ - - - -
-
- {% if message_info != "" %} -
- {{ message_info }} -
- {% endif %} - {% if message_error != "" %} -
- {{ message_error }} -
- {% endif %} -
-

{{ 'FormativesActionsList' | get_plugin_lang('SepePlugin') }}

-
- -
- {% if course_action_list|length > 0 %} - -
User URL
- {% for course in course_action_list %} - - - - - {% endfor %} -
{{ 'Course' | get_lang }}: {{ course.title }} -> {{ 'ActionId' | get_plugin_lang('SepePlugin') | upper }}: {{ course.action_origin }} {{ course.action_code }} - {{ 'Delete' | get_plugin_lang('SepePlugin') }} - {{ 'Unlink' | get_plugin_lang('SepePlugin') }} - {{ 'SeeOrEdit' | get_plugin_lang('SepePlugin') }} -
- {% else %} -
- {{ 'NoFormativeActionToCourse' | get_plugin_lang('SepePlugin') }} -
- {% endif %} - -
-
-

{{ 'CourseFreeOfFormativeAction' | get_plugin_lang('SepePlugin') }}

-
- -
- - - {% for course in course_free_list %} - - - - - - {% endfor %} -
{{ 'Course' | get_lang }}: {{ course.title }} - - - {{ 'AssignAction' | get_plugin_lang('SepePlugin') }} - {{ 'CreateAction' | get_plugin_lang('SepePlugin') }} -
-
- - + + + +
+
+ {% if message_info != "" %} +
+ {{ message_info }} +
+ {% endif %} + {% if message_error != "" %} +
+ {{ message_error }} +
+ {% endif %} +
+

{{ 'FormativesActionsList' | get_plugin_lang('SepePlugin') }}

+
+ +
+ {% if course_action_list|length > 0 %} + + + {% for course in course_action_list %} + + + + + {% endfor %} +
{{ 'Course' | get_lang }}: {{ course.title }} -> {{ 'ActionId' | get_plugin_lang('SepePlugin') | upper }}: {{ course.action_origin }} {{ course.action_code }} + {{ 'Delete' | get_plugin_lang('SepePlugin') }} + {{ 'Unlink' | get_plugin_lang('SepePlugin') }} + {{ 'SeeOrEdit' | get_plugin_lang('SepePlugin') }} +
+ {% else %} +
+ {{ 'NoFormativeActionToCourse' | get_plugin_lang('SepePlugin') }} +
+ {% endif %} +
+
+
+

{{ 'CourseFreeOfFormativeAction' | get_plugin_lang('SepePlugin') }}

+
+ +
+ + + {% for course in course_free_list %} + + + + + + {% endfor %} +
{{ 'Course' | get_lang }}: {{ course.title }} + + + {{ 'AssignAction' | get_plugin_lang('SepePlugin') }} + {{ 'CreateAction' | get_plugin_lang('SepePlugin') }} +
+
+
+