diff --git a/admin/filters.php b/admin/filters.php index 3ee94bcec2e..7f9cc73837d 100644 --- a/admin/filters.php +++ b/admin/filters.php @@ -121,7 +121,7 @@ $table = new html_table(); $table->head = [get_string('filter'), get_string('isactive', 'filters'), get_string('order'), get_string('applyto', 'filters'), get_string('settings'), get_string('uninstallplugin', 'core_admin')]; $table->colclasses = array ('leftalign', 'leftalign', 'centeralign', 'leftalign', 'leftalign', 'leftalign'); -$table->attributes['class'] = 'admintable generaltable'; +$table->attributes['class'] = 'admintable table generaltable'; $table->id = 'filterssetting'; $table->data = []; diff --git a/admin/localplugins.php b/admin/localplugins.php index 1d6e8f4dca6..358900f7521 100644 --- a/admin/localplugins.php +++ b/admin/localplugins.php @@ -43,7 +43,7 @@ $table->define_columns(array('name', 'version', 'uninstall')); $table->define_headers(array(get_string('plugin'), get_string('version'), get_string('uninstallplugin', 'core_admin'))); $table->define_baseurl($PAGE->url); $table->set_attribute('id', 'localplugins'); -$table->set_attribute('class', 'admintable generaltable'); +$table->set_attribute('class', 'admintable table generaltable'); $table->setup(); $plugins = array(); diff --git a/admin/mnet/index.php b/admin/mnet/index.php index 360e092f676..4a5e6f3dbde 100644 --- a/admin/mnet/index.php +++ b/admin/mnet/index.php @@ -98,7 +98,7 @@ echo $OUTPUT->header(); ?>
- +
@@ -119,7 +119,7 @@
- +
diff --git a/admin/mnet/trustedhosts.html b/admin/mnet/trustedhosts.html index e48a3d3b542..4165ca3027b 100644 --- a/admin/mnet/trustedhosts.html +++ b/admin/mnet/trustedhosts.html @@ -2,7 +2,7 @@ echo $OUTPUT->header(); ?>
-
+
@@ -21,7 +21,7 @@ echo $OUTPUT->header();
- +
diff --git a/admin/plagiarism.php b/admin/plagiarism.php index fcb381846a6..7df18fa34cd 100644 --- a/admin/plagiarism.php +++ b/admin/plagiarism.php @@ -54,7 +54,7 @@ $table = new html_table(); $table->head = array($txt->name, $txt->version, $txt->uninstall, $txt->settings); $table->colclasses = array('mdl-left', 'mdl-align', 'mdl-align', 'mdl-align'); $table->data = array(); -$table->attributes['class'] = 'manageplagiarismtable generaltable'; +$table->attributes['class'] = 'manageplagiarismtable table generaltable'; // Iterate through auth plugins and add to the display table. $authcount = count($plagiarismplugins); diff --git a/admin/qbehaviours.php b/admin/qbehaviours.php index d047669b922..5d37fe891f6 100644 --- a/admin/qbehaviours.php +++ b/admin/qbehaviours.php @@ -150,7 +150,7 @@ $table->define_headers(array(get_string('behaviour', 'question'), get_string('nu get_string('version'), get_string('requires', 'admin'), get_string('availableq', 'question'), get_string('uninstallplugin', 'core_admin'))); $table->set_attribute('id', 'qbehaviours'); -$table->set_attribute('class', 'generaltable admintable'); +$table->set_attribute('class', 'table generaltable admintable'); $table->setup(); // Add a row for each question type. diff --git a/admin/qtypes.php b/admin/qtypes.php index b4b366361f3..57f8674ccaf 100644 --- a/admin/qtypes.php +++ b/admin/qtypes.php @@ -154,7 +154,7 @@ $table->define_headers(array(get_string('questiontype', 'question'), get_string( get_string('version'), get_string('requires', 'admin'), get_string('availableq', 'question'), get_string('settings'), get_string('uninstallplugin', 'core_admin'))); $table->set_attribute('id', 'qtypes'); -$table->set_attribute('class', 'admintable generaltable'); +$table->set_attribute('class', 'admintable table generaltable'); $table->setup(); // Add a row for each question type. diff --git a/admin/reports.php b/admin/reports.php index c3d648c9caf..2292425addf 100644 --- a/admin/reports.php +++ b/admin/reports.php @@ -46,7 +46,7 @@ $table->define_headers(array(get_string('plugin'), get_string('logstoressupporte $struninstall)); $table->define_baseurl($PAGE->url); $table->set_attribute('id', 'reportplugins'); -$table->set_attribute('class', 'admintable generaltable'); +$table->set_attribute('class', 'admintable table generaltable'); $table->setup(); $plugins = array(); diff --git a/admin/repository.php b/admin/repository.php index 5b950594b74..28085699722 100644 --- a/admin/repository.php +++ b/admin/repository.php @@ -263,7 +263,7 @@ if (($action == 'edit') || ($action == 'new')) { $table->colclasses = array('leftalign', 'centeralign', 'centeralign', 'centeralign', 'centeralign', 'centeralign'); $table->id = 'repositoriessetting'; $table->data = array(); - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; // Get list of used plug-ins $repositorytypes = repository::get_types(); diff --git a/admin/roles/admins.php b/admin/roles/admins.php index b4855e0a20b..f715fa54996 100644 --- a/admin/roles/admins.php +++ b/admin/roles/admins.php @@ -179,7 +179,7 @@ echo $OUTPUT->header();
-
+

diff --git a/admin/roles/assign.php b/admin/roles/assign.php index 42b5e8e5d7c..492e4440d82 100644 --- a/admin/roles/assign.php +++ b/admin/roles/assign.php @@ -228,7 +228,7 @@ if ($roleid) {

- +

@@ -322,7 +322,7 @@ if ($roleid) { $table->id = 'assignrole'; $table->head = array(get_string('role'), get_string('description'), get_string('userswiththisrole', 'core_role')); $table->colclasses = array('leftalign role', 'leftalign', 'centeralign userrole'); - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; if ($showroleholders) { $table->headspan = array(1, 1, 2); $table->colclasses[] = 'leftalign roleholder'; diff --git a/admin/roles/manage.php b/admin/roles/manage.php index dfe043aa902..8b125a1007b 100644 --- a/admin/roles/manage.php +++ b/admin/roles/manage.php @@ -153,7 +153,7 @@ require('managetabs.php'); $table = new html_table(); $table->colclasses = array('leftalign', 'leftalign', 'leftalign', 'leftalign'); $table->id = 'roles'; -$table->attributes['class'] = 'admintable generaltable'; +$table->attributes['class'] = 'admintable table generaltable'; $table->head = array( get_string('role') . ' ' . $OUTPUT->help_icon('roles', 'core_role'), get_string('description'), diff --git a/admin/templates/setting_emoticons.mustache b/admin/templates/setting_emoticons.mustache index 255dcb965ba..87052323fdf 100644 --- a/admin/templates/setting_emoticons.mustache +++ b/admin/templates/setting_emoticons.mustache @@ -36,7 +36,7 @@ Setting emoticons. }}
- +
diff --git a/admin/templates/setting_manage_plugins.mustache b/admin/templates/setting_manage_plugins.mustache index ac7ab8fb967..fc4c6bc6d1b 100644 --- a/admin/templates/setting_manage_plugins.mustache +++ b/admin/templates/setting_manage_plugins.mustache @@ -49,7 +49,7 @@ ] } }} -
{{#str}}emoticontext, admin{{/str}}
+
diff --git a/admin/thirdpartylibs.php b/admin/thirdpartylibs.php index 0259d177012..42bac417633 100644 --- a/admin/thirdpartylibs.php +++ b/admin/thirdpartylibs.php @@ -47,7 +47,7 @@ $table->head = array( get_string('thirdpartylibrarylocation', 'core_admin'), get_string('license')); $table->align = array('left', 'left', 'left', 'left'); $table->id = 'thirdpartylibs'; -$table->attributes['class'] = 'admintable generaltable'; +$table->attributes['class'] = 'admintable table generaltable'; $table->data = array(); foreach ($files as $component => $xmlpath) { diff --git a/admin/tool/admin_presets/templates/local/tables/actual_value_settings_table.mustache b/admin/tool/admin_presets/templates/local/tables/actual_value_settings_table.mustache index 40c5bb57a5a..2992d79a716 100644 --- a/admin/tool/admin_presets/templates/local/tables/actual_value_settings_table.mustache +++ b/admin/tool/admin_presets/templates/local/tables/actual_value_settings_table.mustache @@ -32,7 +32,7 @@ } }} -
{{#str}}name, moodle{{/str}}
+
diff --git a/admin/tool/admin_presets/templates/local/tables/old_and_new_value_settings_table.mustache b/admin/tool/admin_presets/templates/local/tables/old_and_new_value_settings_table.mustache index 1709cbfafd3..3114b4bbf94 100644 --- a/admin/tool/admin_presets/templates/local/tables/old_and_new_value_settings_table.mustache +++ b/admin/tool/admin_presets/templates/local/tables/old_and_new_value_settings_table.mustache @@ -36,7 +36,7 @@ } }} -
{{{caption}}}
+
diff --git a/admin/tool/admin_presets/templates/preset_applications_list.mustache b/admin/tool/admin_presets/templates/preset_applications_list.mustache index 31dc9fea93a..c21ef0bae63 100644 --- a/admin/tool/admin_presets/templates/preset_applications_list.mustache +++ b/admin/tool/admin_presets/templates/preset_applications_list.mustache @@ -42,7 +42,7 @@ {{/noapplications}} {{#noapplications}} -
{{{caption}}}
+
diff --git a/admin/tool/admin_presets/templates/presets_list.mustache b/admin/tool/admin_presets/templates/presets_list.mustache index c582e06d8f2..a4ecf8961a3 100644 --- a/admin/tool/admin_presets/templates/presets_list.mustache +++ b/admin/tool/admin_presets/templates/presets_list.mustache @@ -37,7 +37,7 @@ {{/nopresets}} {{^nopresets}} -
{{#str}}presetapplicationslisttable, tool_admin_presets{{/str}}
+
diff --git a/admin/tool/analytics/templates/invalid_analysables.mustache b/admin/tool/analytics/templates/invalid_analysables.mustache index 4312d30f2c1..22b9db0460b 100644 --- a/admin/tool/analytics/templates/invalid_analysables.mustache +++ b/admin/tool/analytics/templates/invalid_analysables.mustache @@ -58,7 +58,7 @@ {{#prev}}{{> core/single_button}}{{/prev}}{{#next}}{{> core/single_button}}{{/next}} -
{{#str}}presetslisttable, tool_admin_presets{{/str}}
+
diff --git a/admin/tool/analytics/templates/models_list.mustache b/admin/tool/analytics/templates/models_list.mustache index 19e150ff3fc..fb6d712bce8 100644 --- a/admin/tool/analytics/templates/models_list.mustache +++ b/admin/tool/analytics/templates/models_list.mustache @@ -152,7 +152,7 @@ {{>core/action_menu}} {{/newmodelmenu}} -
{{#str}}invalidanalysablestable, tool_analytics{{/str}}
+
diff --git a/admin/tool/analytics/templates/restorable_models.mustache b/admin/tool/analytics/templates/restorable_models.mustache index fe19e2d2ca3..879d7ae063b 100644 --- a/admin/tool/analytics/templates/restorable_models.mustache +++ b/admin/tool/analytics/templates/restorable_models.mustache @@ -116,7 +116,7 @@ {{#hasdata}}

{{#str}} restoredefaultinfo, tool_analytics {{/str}}

-
{{#str}}analyticmodels, tool_analytics{{/str}}
+
diff --git a/admin/tool/brickfield/templates/errors.mustache b/admin/tool/brickfield/templates/errors.mustache index 3db208a426c..ba137b19040 100644 --- a/admin/tool/brickfield/templates/errors.mustache +++ b/admin/tool/brickfield/templates/errors.mustache @@ -49,7 +49,7 @@

{{{pagetitle}}}

{{{pagenavigation}}} -
+
diff --git a/admin/tool/capability/index.php b/admin/tool/capability/index.php index 98238343e42..a35b344e7d4 100644 --- a/admin/tool/capability/index.php +++ b/admin/tool/capability/index.php @@ -140,7 +140,7 @@ function print_report_tree($contextid, $contexts, $allroles) { // If there are any role overrides here, print them. if (!empty($contexts[$contextid]->rolecapabilities)) { $rowcounter = 0; - echo '
{{tableheading1}}
'; + echo '
'; foreach ($allroles as $role) { if (isset($contexts[$contextid]->rolecapabilities[$role->id])) { $permission = $contexts[$contextid]->rolecapabilities[$role->id]; diff --git a/admin/tool/dataprivacy/templates/my_data_requests.mustache b/admin/tool/dataprivacy/templates/my_data_requests.mustache index fc8eaf5be8d..0d1e5f35ef2 100644 --- a/admin/tool/dataprivacy/templates/my_data_requests.mustache +++ b/admin/tool/dataprivacy/templates/my_data_requests.mustache @@ -118,7 +118,7 @@ {{#str}}newrequest, tool_dataprivacy{{/str}} -
+
diff --git a/admin/tool/filetypes/styles.css b/admin/tool/filetypes/styles.css index c8375ee7703..7f30c90ee5d 100644 --- a/admin/tool/filetypes/styles.css +++ b/admin/tool/filetypes/styles.css @@ -3,23 +3,23 @@ */ /* Fix bad default table wrap (caused by the long mimetype field). */ -.path-admin-tool-filetypes .generaltable .c0, -.path-admin-tool-filetypes .generaltable .c1, -.path-admin-tool-filetypes .generaltable .c2, -.path-admin-tool-filetypes .generaltable th { +.path-admin-tool-filetypes .table .c0, +.path-admin-tool-filetypes .table .c1, +.path-admin-tool-filetypes .table .c2, +.path-admin-tool-filetypes .table th { white-space: nowrap; } /* Formatting for deleted lines. */ -.path-admin-tool-filetypes .generaltable .deleted .c0 img { +.path-admin-tool-filetypes .table .deleted .c0 img { opacity: 0.2; } -.path-admin-tool-filetypes .generaltable .deleted .c0 span { +.path-admin-tool-filetypes .table .deleted .c0 span { text-decoration: line-through; } /* Custom types show bold */ -.path-admin-tool-filetypes .generaltable .nonstandard { +.path-admin-tool-filetypes .table .nonstandard { font-weight: bold; } diff --git a/admin/tool/licensemanager/classes/output/table.php b/admin/tool/licensemanager/classes/output/table.php index e5ce3a190c4..51b7e66d9f2 100644 --- a/admin/tool/licensemanager/classes/output/table.php +++ b/admin/tool/licensemanager/classes/output/table.php @@ -80,7 +80,7 @@ class table implements \renderable { 'text-center', ]; $table->id = 'manage-licenses'; - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; $table->data = []; $rownumber = 0; diff --git a/admin/tool/log/classes/setting_managestores.php b/admin/tool/log/classes/setting_managestores.php index 0a43199f0c0..b897eb8c0bf 100644 --- a/admin/tool/log/classes/setting_managestores.php +++ b/admin/tool/log/classes/setting_managestores.php @@ -137,7 +137,7 @@ class tool_log_setting_managestores extends admin_setting { $table->colclasses = array('leftalign', 'centeralign', 'centeralign', 'centeralign', 'centeralign', 'centeralign', 'centeralign'); $table->id = 'logstoreplugins'; - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; $table->data = array(); // Iterate through store plugins and add to the display table. diff --git a/admin/tool/lp/styles.css b/admin/tool/lp/styles.css index d4228396fad..774db05212a 100644 --- a/admin/tool/lp/styles.css +++ b/admin/tool/lp/styles.css @@ -124,7 +124,7 @@ width: 100%; } -.path-admin-tool-lp [data-region] .generaltable.fullwidth { +.path-admin-tool-lp [data-region] .table.fullwidth { clear: both; } diff --git a/admin/tool/lp/templates/course_competencies_page.mustache b/admin/tool/lp/templates/course_competencies_page.mustache index d467c8cb9f7..658ecba1c4b 100644 --- a/admin/tool/lp/templates/course_competencies_page.mustache +++ b/admin/tool/lp/templates/course_competencies_page.mustache @@ -83,7 +83,7 @@ {{> tool_lp/course_competency_statistics }} {{/statistics}}
-
{{#str}}requesttype, tool_dataprivacy{{/str}}
+
{{#competencies}} diff --git a/admin/tool/lp/templates/manage_competency_frameworks_page.mustache b/admin/tool/lp/templates/manage_competency_frameworks_page.mustache index c31019a6900..bf9c84442e1 100644 --- a/admin/tool/lp/templates/manage_competency_frameworks_page.mustache +++ b/admin/tool/lp/templates/manage_competency_frameworks_page.mustache @@ -56,7 +56,7 @@ {{{.}}} {{/navigation}} -
+
diff --git a/admin/tool/lp/templates/manage_templates_page.mustache b/admin/tool/lp/templates/manage_templates_page.mustache index c572b7f129d..5774dd4a870 100644 --- a/admin/tool/lp/templates/manage_templates_page.mustache +++ b/admin/tool/lp/templates/manage_templates_page.mustache @@ -54,7 +54,7 @@ {{{.}}} {{/navigation}} -
{{#str}}listcompetencyframeworkscaption, tool_lp{{/str}}
+
diff --git a/admin/tool/lp/templates/plan_page.mustache b/admin/tool/lp/templates/plan_page.mustache index 1f4a35f3eab..42b2ceb5d57 100644 --- a/admin/tool/lp/templates/plan_page.mustache +++ b/admin/tool/lp/templates/plan_page.mustache @@ -112,7 +112,7 @@ {{/plan.commentarea}}

{{#str}}learningplancompetencies, tool_lp{{/str}}

-
{{#str}}listtemplatescaption, tool_lp{{/str}}
+
diff --git a/admin/tool/lp/templates/plans_page.mustache b/admin/tool/lp/templates/plans_page.mustache index 17e0d4bad2f..ac3cbc26d9a 100644 --- a/admin/tool/lp/templates/plans_page.mustache +++ b/admin/tool/lp/templates/plans_page.mustache @@ -39,7 +39,7 @@ {{{.}}} {{/navigation}} -
{{#str}}shortname, tool_lp{{/str}}
+
diff --git a/admin/tool/lp/templates/user_evidence_list_page.mustache b/admin/tool/lp/templates/user_evidence_list_page.mustache index a1b61af5762..09e65be6f55 100644 --- a/admin/tool/lp/templates/user_evidence_list_page.mustache +++ b/admin/tool/lp/templates/user_evidence_list_page.mustache @@ -38,7 +38,7 @@ {{{.}}} {{/navigation}} -
{{#str}}listplanscaption, tool_lp{{/str}}
+
diff --git a/admin/tool/lp/templates/user_evidence_page.mustache b/admin/tool/lp/templates/user_evidence_page.mustache index bbdcf222a10..0f4589cccba 100644 --- a/admin/tool/lp/templates/user_evidence_page.mustache +++ b/admin/tool/lp/templates/user_evidence_page.mustache @@ -64,7 +64,7 @@

{{#str}}linkedcompetencies, tool_lp{{/str}}

-
{{#str}}listofevidence, tool_lp{{/str}}
+
diff --git a/admin/tool/messageinbound/renderer.php b/admin/tool/messageinbound/renderer.php index 892c4a9dfcc..9bf949e66f6 100644 --- a/admin/tool/messageinbound/renderer.php +++ b/admin/tool/messageinbound/renderer.php @@ -56,7 +56,7 @@ class tool_messageinbound_renderer extends plugin_renderer_base { $enabled, $edit, ); - $table->attributes['class'] = 'admintable generaltable messageinboundhandlers'; + $table->attributes['class'] = 'admintable table generaltable messageinboundhandlers'; $yes = get_string('yes'); $no = get_string('no'); diff --git a/admin/tool/mobile/templates/subscription.mustache b/admin/tool/mobile/templates/subscription.mustache index 0759b3dbfcf..31fdb1a4413 100644 --- a/admin/tool/mobile/templates/subscription.mustache +++ b/admin/tool/mobile/templates/subscription.mustache @@ -191,7 +191,7 @@
{{# str }} notificationscurrentactivedevices, tool_mobile {{/ str }}
{{currentactivedevices}}
-
{{#str}}shortname, tool_lp{{/str}}
+
diff --git a/admin/tool/monitor/classes/output/managerules/renderable.php b/admin/tool/monitor/classes/output/managerules/renderable.php index d0338f02db5..72a7e6e8ca5 100644 --- a/admin/tool/monitor/classes/output/managerules/renderable.php +++ b/admin/tool/monitor/classes/output/managerules/renderable.php @@ -65,7 +65,7 @@ class renderable extends \table_sql implements \renderable { parent::__construct($uniqueid); $this->set_attribute('id', 'toolmonitorrules_table'); - $this->set_attribute('class', 'toolmonitor managerules generaltable generalbox'); + $this->set_attribute('class', 'toolmonitor managerules table generaltable'); $this->define_columns(array('name', 'description', 'course', 'plugin', 'eventname', 'filters', 'manage')); $this->define_headers(array( get_string('rulename', 'tool_monitor'), diff --git a/admin/tool/monitor/classes/output/managesubs/rules.php b/admin/tool/monitor/classes/output/managesubs/rules.php index 0e519ec0591..85c13b8e467 100644 --- a/admin/tool/monitor/classes/output/managesubs/rules.php +++ b/admin/tool/monitor/classes/output/managesubs/rules.php @@ -64,7 +64,7 @@ class rules extends \table_sql implements \renderable { public function __construct($uniqueid, \moodle_url $url, $courseid = 0, $perpage = 100) { parent::__construct($uniqueid); - $this->set_attribute('class', 'toolmonitor subscriberules generaltable generalbox'); + $this->set_attribute('class', 'toolmonitor subscriberules table generaltable'); $this->define_columns(array('name', 'description', 'course', 'plugin', 'eventname', 'filters', 'select')); $this->define_headers(array( get_string('rulename', 'tool_monitor'), diff --git a/admin/tool/monitor/classes/output/managesubs/subs.php b/admin/tool/monitor/classes/output/managesubs/subs.php index de8eebec409..e5a1e941410 100644 --- a/admin/tool/monitor/classes/output/managesubs/subs.php +++ b/admin/tool/monitor/classes/output/managesubs/subs.php @@ -59,7 +59,7 @@ class subs extends \table_sql implements \renderable { public function __construct($uniqueid, \moodle_url $url, $courseid = 0, $perpage = 100) { parent::__construct($uniqueid); - $this->set_attribute('class', 'toolmonitor subscriptions generaltable generalbox'); + $this->set_attribute('class', 'toolmonitor subscriptions table generaltable'); $this->define_columns(array('name', 'description', 'course', 'plugin', 'instance', 'eventname', 'filters', 'unsubscribe')); $this->define_headers(array( diff --git a/admin/tool/oauth2/classes/output/renderer.php b/admin/tool/oauth2/classes/output/renderer.php index cb79978ab10..f42598b8db6 100644 --- a/admin/tool/oauth2/classes/output/renderer.php +++ b/admin/tool/oauth2/classes/output/renderer.php @@ -60,7 +60,7 @@ class renderer extends plugin_renderer_base { get_string('systemauthstatus', 'tool_oauth2') . ' ' . $this->help_icon('systemaccountconnected', 'tool_oauth2'), get_string('edit'), ]; - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; $data = []; $index = 0; @@ -230,7 +230,7 @@ class renderer extends plugin_renderer_base { get_string('url'), get_string('edit'), ]; - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; $data = []; $index = 0; @@ -289,7 +289,7 @@ class renderer extends plugin_renderer_base { get_string('userfieldinternalfield', 'tool_oauth2'), get_string('edit'), ]; - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; $data = []; $index = 0; diff --git a/admin/tool/policy/templates/acceptances.mustache b/admin/tool/policy/templates/acceptances.mustache index fd5e4cd50f0..3183bfcc7ce 100644 --- a/admin/tool/policy/templates/acceptances.mustache +++ b/admin/tool/policy/templates/acceptances.mustache @@ -79,7 +79,7 @@
{{#str}} contactdpo, tool_policy {{/str}}
{{/canrevoke}} -
{{#str}}year, form{{/str}}
+
diff --git a/admin/tool/policy/templates/page_managedocs_list.mustache b/admin/tool/policy/templates/page_managedocs_list.mustache index be20386ce1d..09d1b7f366f 100644 --- a/admin/tool/policy/templates/page_managedocs_list.mustache +++ b/admin/tool/policy/templates/page_managedocs_list.mustache @@ -81,7 +81,7 @@ {{/canaddnew}} -
{{#str}} policydocname, tool_policy {{/str}}
+
diff --git a/admin/tool/task/renderer.php b/admin/tool/task/renderer.php index 6b7886cfed1..1fcbb1e59e2 100644 --- a/admin/tool/task/renderer.php +++ b/admin/tool/task/renderer.php @@ -58,7 +58,7 @@ class tool_task_renderer extends plugin_renderer_base { get_string('nextruntime', 'tool_task'), ]; - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; $table->colclasses = []; // For each task entry (row) show action buttons/logs link depending on the user permissions. @@ -259,7 +259,7 @@ class tool_task_renderer extends plugin_renderer_base { get_string('actions','tool_task'), ]; - $table->attributes['class'] = 'generaltable'; + $table->attributes['class'] = 'table generaltable'; $table->colclasses = []; // For each task entry (row) show action buttons/logs link depending on the user permissions. @@ -384,7 +384,7 @@ class tool_task_renderer extends plugin_renderer_base { get_string('default', 'tool_task'), ]; - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; $table->colclasses = []; if (!$showloglink) { diff --git a/admin/tool/uploadcourse/classes/tracker.php b/admin/tool/uploadcourse/classes/tracker.php index 860c84cc5d8..ad4b82e38b2 100644 --- a/admin/tool/uploadcourse/classes/tracker.php +++ b/admin/tool/uploadcourse/classes/tracker.php @@ -205,8 +205,8 @@ class tool_uploadcourse_tracker { $this->buffer->output(implode("\t", $columns)); } else if ($this->outputmode == self::OUTPUT_HTML) { $ci = 0; - echo html_writer::start_tag('table', array('class' => 'generaltable boxaligncenter flexible-wrap', - 'summary' => get_string('uploadcoursesresult', 'tool_uploadcourse'))); + echo html_writer::start_tag('table', ['class' => 'table generaltable', + 'summary' => get_string('uploadcoursesresult', 'tool_uploadcourse')]); echo html_writer::start_tag('tr', array('class' => 'heading r' . $this->rownb)); echo html_writer::tag('th', get_string('csvline', 'tool_uploadcourse'), array('class' => 'c' . $ci++, 'scope' => 'col')); diff --git a/admin/tool/uploaduser/classes/preview.php b/admin/tool/uploaduser/classes/preview.php index 53bc8936947..83daeaea1f8 100644 --- a/admin/tool/uploaduser/classes/preview.php +++ b/admin/tool/uploaduser/classes/preview.php @@ -64,7 +64,7 @@ class preview extends \html_table { $this->previewrows = $previewrows; $this->id = "uupreview"; - $this->attributes['class'] = 'generaltable'; + $this->attributes['class'] = 'table generaltable'; $this->tablealign = 'center'; $this->summary = get_string('uploaduserspreview', 'tool_uploaduser'); $this->head = array(); diff --git a/admin/tool/uploaduser/locallib.php b/admin/tool/uploaduser/locallib.php index d44071e5921..56ea010d6e8 100644 --- a/admin/tool/uploaduser/locallib.php +++ b/admin/tool/uploaduser/locallib.php @@ -94,7 +94,7 @@ class uu_progress_tracker { */ public function start() { $ci = 0; - echo '
{{#str}} policydocname, tool_policy {{/str}}
'; + echo '
'; echo ''; foreach ($this->headers as $key => $header) { echo ''; diff --git a/admin/tool/usertours/classes/local/table/step_list.php b/admin/tool/usertours/classes/local/table/step_list.php index 87937d7b0e1..ca4a6bd2acd 100644 --- a/admin/tool/usertours/classes/local/table/step_list.php +++ b/admin/tool/usertours/classes/local/table/step_list.php @@ -73,7 +73,7 @@ class step_list extends \flexible_table { get_string('actions', 'tool_usertours'), ]); - $this->set_attribute('class', 'admintable generaltable steptable'); + $this->set_attribute('class', 'admintable table generaltable steptable'); $this->setup(); } diff --git a/admin/tool/usertours/classes/local/table/tour_list.php b/admin/tool/usertours/classes/local/table/tour_list.php index dd5298cd8d1..c2175251e91 100644 --- a/admin/tool/usertours/classes/local/table/tour_list.php +++ b/admin/tool/usertours/classes/local/table/tour_list.php @@ -67,7 +67,7 @@ class tour_list extends \flexible_table { get_string('actions', 'tool_usertours'), ]); - $this->set_attribute('class', 'admintable generaltable'); + $this->set_attribute('class', 'admintable table generaltable'); $this->setup(); $this->tourcount = helper::count_tours(); diff --git a/admin/tool/xmldb/actions/XMLDBCheckAction.class.php b/admin/tool/xmldb/actions/XMLDBCheckAction.class.php index 5ffc70e3f7f..2ce05f4456e 100644 --- a/admin/tool/xmldb/actions/XMLDBCheckAction.class.php +++ b/admin/tool/xmldb/actions/XMLDBCheckAction.class.php @@ -90,7 +90,7 @@ abstract class XMLDBCheckAction extends XMLDBAction { // If not confirmed, show confirmation box if (!$confirmed) { - $o = '
'.$header.'
'; + $o = '
'; $o.= '
'; $o.= '

' . $this->str[$this->introstr] . '

'; $o.= '
'; diff --git a/admin/tool/xmldb/actions/check_bigints/check_bigints.class.php b/admin/tool/xmldb/actions/check_bigints/check_bigints.class.php index 1118906f065..011d923f4e5 100644 --- a/admin/tool/xmldb/actions/check_bigints/check_bigints.class.php +++ b/admin/tool/xmldb/actions/check_bigints/check_bigints.class.php @@ -99,7 +99,7 @@ class check_bigints extends XMLDBCheckAction { $dbman = $DB->get_manager(); $s = ''; - $r = ''; + $r = '
'; $r.= '
'; $r.= '

' . $this->str['searchresults'] . '

'; $r.= '

' . $this->str['wrongints'] . ': ' . count($wrong_fields) . '

'; diff --git a/admin/tool/xmldb/actions/check_defaults/check_defaults.class.php b/admin/tool/xmldb/actions/check_defaults/check_defaults.class.php index ea21a1278a6..c09a7679051 100644 --- a/admin/tool/xmldb/actions/check_defaults/check_defaults.class.php +++ b/admin/tool/xmldb/actions/check_defaults/check_defaults.class.php @@ -147,7 +147,7 @@ class check_defaults extends XMLDBCheckAction { $dbman = $DB->get_manager(); $s = ''; - $r = ''; + $r = '
'; $r .= '
'; $r .= '

' . $this->str['searchresults'] . '

'; $r .= '

' . $this->str['wrongdefaults'] . ': ' . count($wrongfields) . '

'; diff --git a/admin/tool/xmldb/actions/check_foreign_keys/check_foreign_keys.class.php b/admin/tool/xmldb/actions/check_foreign_keys/check_foreign_keys.class.php index 128b5029167..2a92afcd982 100644 --- a/admin/tool/xmldb/actions/check_foreign_keys/check_foreign_keys.class.php +++ b/admin/tool/xmldb/actions/check_foreign_keys/check_foreign_keys.class.php @@ -159,7 +159,7 @@ class check_foreign_keys extends XMLDBCheckAction { } protected function display_results(array $violatedkeys) { - $r = ''; + $r = '
'; $r.= '
'; $r.= '

' . $this->str['searchresults'] . '

'; $r.= '

' . $this->str['violatedforeignkeys'] . ': ' . count($violatedkeys) . '

'; diff --git a/admin/tool/xmldb/actions/check_indexes/check_indexes.class.php b/admin/tool/xmldb/actions/check_indexes/check_indexes.class.php index b7c175ca229..bbbc47e9bd5 100644 --- a/admin/tool/xmldb/actions/check_indexes/check_indexes.class.php +++ b/admin/tool/xmldb/actions/check_indexes/check_indexes.class.php @@ -154,7 +154,7 @@ class check_indexes extends XMLDBCheckAction { } $s = ''; - $r = ''; + $r = '
'; $r.= '
'; $r.= '

' . $this->str['searchresults'] . '

'; $r .= '

' . $this->str['missingindexes'] . ': ' . count($missingindexes) . '

'; diff --git a/admin/tool/xmldb/actions/delete_field/delete_field.class.php b/admin/tool/xmldb/actions/delete_field/delete_field.class.php index 66096f4764f..3cb6d7d51db 100644 --- a/admin/tool/xmldb/actions/delete_field/delete_field.class.php +++ b/admin/tool/xmldb/actions/delete_field/delete_field.class.php @@ -73,7 +73,7 @@ class delete_field extends XMLDBAction { // If not confirmed, show confirmation box if (!$confirmed) { - $o = ''; + $o = '
'; $o.= '
'; $o.= '

' . $this->str['confirmdeletefield'] . '

' . $fieldparam . '

'; $o.= '
'; diff --git a/admin/tool/xmldb/actions/delete_index/delete_index.class.php b/admin/tool/xmldb/actions/delete_index/delete_index.class.php index ad6f801c78f..53152b4bd23 100644 --- a/admin/tool/xmldb/actions/delete_index/delete_index.class.php +++ b/admin/tool/xmldb/actions/delete_index/delete_index.class.php @@ -73,7 +73,7 @@ class delete_index extends XMLDBAction { // If not confirmed, show confirmation box if (!$confirmed) { - $o = ''; + $o = '
'; $o.= '
'; $o.= '

' . $this->str['confirmdeleteindex'] . '

' . $indexparam . '

'; $o.= '
'; diff --git a/admin/tool/xmldb/actions/delete_key/delete_key.class.php b/admin/tool/xmldb/actions/delete_key/delete_key.class.php index ea55010b295..a0b4fb3fcf9 100644 --- a/admin/tool/xmldb/actions/delete_key/delete_key.class.php +++ b/admin/tool/xmldb/actions/delete_key/delete_key.class.php @@ -73,7 +73,7 @@ class delete_key extends XMLDBAction { // If not confirmed, show confirmation box if (!$confirmed) { - $o = ''; + $o = '
'; $o.= '
'; $o.= '

' . $this->str['confirmdeletekey'] . '

' . $keyparam . '

'; $o.= '
'; diff --git a/admin/tool/xmldb/actions/delete_table/delete_table.class.php b/admin/tool/xmldb/actions/delete_table/delete_table.class.php index e577b968c70..eac0d0a5bb1 100644 --- a/admin/tool/xmldb/actions/delete_table/delete_table.class.php +++ b/admin/tool/xmldb/actions/delete_table/delete_table.class.php @@ -72,7 +72,7 @@ class delete_table extends XMLDBAction { // If not confirmed, show confirmation box if (!$confirmed) { - $o = ''; + $o = '
'; $o.= '
'; $o.= '

' . $this->str['confirmdeletetable'] . '

' . $tableparam . '

'; $o.= '
'; diff --git a/admin/tool/xmldb/actions/delete_xml_file/delete_xml_file.class.php b/admin/tool/xmldb/actions/delete_xml_file/delete_xml_file.class.php index 05cdd79f2b9..51218456d86 100644 --- a/admin/tool/xmldb/actions/delete_xml_file/delete_xml_file.class.php +++ b/admin/tool/xmldb/actions/delete_xml_file/delete_xml_file.class.php @@ -71,7 +71,7 @@ class delete_xml_file extends XMLDBAction { // If not confirmed, show confirmation box if (!$confirmed) { - $o = ''; + $o = '
'; $o.= '
'; $o.= '

' . $this->str['confirmdeletexmlfile'] . '

' . $dirpath . '/install.php

'; $o.= '
'; diff --git a/admin/tool/xmldb/actions/generate_documentation/xmldb.xsl b/admin/tool/xmldb/actions/generate_documentation/xmldb.xsl index 97403f6bad8..26d07fda040 100644 --- a/admin/tool/xmldb/actions/generate_documentation/xmldb.xsl +++ b/admin/tool/xmldb/actions/generate_documentation/xmldb.xsl @@ -21,7 +21,7 @@ - +
@@ -60,7 +60,7 @@

Keys

-
Field Type
+
@@ -99,7 +99,7 @@

Indexes

-
Name Type
+
diff --git a/admin/tool/xmldb/actions/main_view/main_view.class.php b/admin/tool/xmldb/actions/main_view/main_view.class.php index f22ca08106e..d8578473f77 100644 --- a/admin/tool/xmldb/actions/main_view/main_view.class.php +++ b/admin/tool/xmldb/actions/main_view/main_view.class.php @@ -119,7 +119,7 @@ class main_view extends XMLDBAction { // Display list of DB directories if everything is ok if ($result && !empty($XMLDB->dbdirs)) { $o .= '
Name Type
'; + ' class="table table-striped table-sm admintable generaltable">'; $row = 0; foreach ($XMLDB->dbdirs as $key => $dbdir) { // Detect if this is the lastused dir diff --git a/admin/tool/xmldb/actions/revert_changes/revert_changes.class.php b/admin/tool/xmldb/actions/revert_changes/revert_changes.class.php index 1649d368db2..1f15afa41c9 100644 --- a/admin/tool/xmldb/actions/revert_changes/revert_changes.class.php +++ b/admin/tool/xmldb/actions/revert_changes/revert_changes.class.php @@ -71,7 +71,7 @@ class revert_changes extends XMLDBAction { // If not confirmed, show confirmation box if (!$confirmed) { - $o = '
'; + $o = '
'; $o.= '
'; $o.= '

' . $this->str['confirmrevertchanges'] . '

' . $dirpath . '

'; $o.= '
'; diff --git a/auth/oauth2/classes/output/renderer.php b/auth/oauth2/classes/output/renderer.php index 07a0428afe6..edede9cc927 100644 --- a/auth/oauth2/classes/output/renderer.php +++ b/auth/oauth2/classes/output/renderer.php @@ -55,7 +55,7 @@ class renderer extends plugin_renderer_base { get_string('info', 'auth_oauth2'), get_string('edit'), ]; - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; $data = []; $index = 0; diff --git a/backup/util/ui/renderer.php b/backup/util/ui/renderer.php index cd2c6bd9ed6..2f69eb828f0 100644 --- a/backup/util/ui/renderer.php +++ b/backup/util/ui/renderer.php @@ -202,7 +202,7 @@ class core_backup_renderer extends plugin_renderer_base { $table->head = array(get_string('module', 'backup'), get_string('title', 'backup'), get_string('userinfo', 'backup')); $table->colclasses = array('modulename', 'moduletitle', 'userinfoincluded'); $table->align = array('left', 'left', 'center'); - $table->attributes = array('class' => 'activitytable generaltable'); + $table->attributes = ['class' => 'activitytable table generaltable']; $table->data = array(); } $name = get_string('pluginname', $activity->modulename); @@ -690,7 +690,7 @@ class core_backup_renderer extends plugin_renderer_base { } $table = new html_table(); - $table->attributes['class'] = 'backup-files-table generaltable'; + $table->attributes['class'] = 'backup-files-table table generaltable'; $table->head = $tablehead; $table->width = '100%'; $table->data = []; @@ -1051,7 +1051,7 @@ class core_backup_renderer extends plugin_renderer_base { $tablehead = array(get_string('course'), get_string('time'), get_string('status', 'backup')); $table = new html_table(); - $table->attributes['class'] = 'backup-files-table generaltable'; + $table->attributes['class'] = 'backup-files-table table generaltable'; $table->head = $tablehead; $tabledata = array(); @@ -1092,7 +1092,7 @@ class core_backup_renderer extends plugin_renderer_base { ); $table = new html_table(); - $table->attributes['class'] = 'backup-files-table generaltable'; + $table->attributes['class'] = 'backup-files-table table generaltable'; $table->head = $tablehead; $tabledata = array(); diff --git a/badges/renderer.php b/badges/renderer.php index 873518a4386..dcb63972333 100644 --- a/badges/renderer.php +++ b/badges/renderer.php @@ -766,7 +766,7 @@ class core_badges_renderer extends plugin_renderer_base { $paging = new paging_bar($related->totalcount, $related->page, $related->perpage, $this->page->url, 'page'); $htmlpagingbar = $this->render($paging); $table = new html_table(); - $table->attributes['class'] = 'generaltable boxaligncenter boxwidthwide'; + $table->attributes['class'] = 'table generaltable'; $table->head = array( get_string('name'), get_string('version', 'badges'), @@ -825,7 +825,7 @@ class core_badges_renderer extends plugin_renderer_base { $paging = new paging_bar($alignments->totalcount, $alignments->page, $alignments->perpage, $this->page->url, 'page'); $htmlpagingbar = $this->render($paging); $table = new html_table(); - $table->attributes['class'] = 'generaltable boxaligncenter boxwidthwide'; + $table->attributes['class'] = 'table generaltable'; $table->head = array('Name', 'URL', ''); foreach ($alignments->alignments as $item) { diff --git a/badges/templates/external_backpacks_page.mustache b/badges/templates/external_backpacks_page.mustache index cf560a17d6b..f6a8380fc07 100644 --- a/badges/templates/external_backpacks_page.mustache +++ b/badges/templates/external_backpacks_page.mustache @@ -41,7 +41,7 @@ - +
diff --git a/blocks/accessreview/block_accessreview.php b/blocks/accessreview/block_accessreview.php index ff552b5d65b..7f81e0f182d 100644 --- a/blocks/accessreview/block_accessreview.php +++ b/blocks/accessreview/block_accessreview.php @@ -113,7 +113,7 @@ class block_accessreview extends block_base { return $this->content; } $table->data = $tabledata; - $table->attributes['class'] = 'generaltable table-sm block_accessreview_table'; + $table->attributes['class'] = 'generaltable table table-sm block_accessreview_table'; $this->content->text .= html_writer::table($table, true); // Check for compatible course formats for highlighting. diff --git a/blocks/lp/templates/competencies_to_review_page.mustache b/blocks/lp/templates/competencies_to_review_page.mustache index 9038d47bffc..349dac6b255 100644 --- a/blocks/lp/templates/competencies_to_review_page.mustache +++ b/blocks/lp/templates/competencies_to_review_page.mustache @@ -28,7 +28,7 @@ }}
-
{{#str}}listbackpacks, core_badges{{/str}}
+
diff --git a/blocks/lp/templates/plans_to_review_page.mustache b/blocks/lp/templates/plans_to_review_page.mustache index 124dcd35b89..ee7344b2678 100644 --- a/blocks/lp/templates/plans_to_review_page.mustache +++ b/blocks/lp/templates/plans_to_review_page.mustache @@ -28,7 +28,7 @@ }}
-
{{#str}}shortname, tool_lp{{/str}}
+
diff --git a/blocks/rss_client/managefeeds.php b/blocks/rss_client/managefeeds.php index a7307714f05..ba66c22c57c 100644 --- a/blocks/rss_client/managefeeds.php +++ b/blocks/rss_client/managefeeds.php @@ -103,7 +103,7 @@ $table->define_baseurl($baseurl); $table->set_attribute('cellspacing', '0'); $table->set_attribute('id', 'rssfeeds'); -$table->set_attribute('class', 'generaltable generalbox'); +$table->set_attribute('class', 'table generaltable'); $table->column_class('feed', 'feed'); $table->column_class('actions', 'actions'); diff --git a/blog/external_blogs.php b/blog/external_blogs.php index 3da0c615268..0c43eb16be4 100644 --- a/blog/external_blogs.php +++ b/blog/external_blogs.php @@ -93,7 +93,7 @@ echo $OUTPUT->box_start('generalbox boxaligncenter'); if (!empty($blogs)) { $table = new html_table(); $table->cellpadding = 4; - $table->attributes['class'] = 'generaltable boxaligncenter'; + $table->attributes['class'] = 'table generaltable'; $table->head = array(get_string('name'), get_string('url', 'blog'), get_string('timefetched', 'blog'), diff --git a/cache/classes/output/renderer.php b/cache/classes/output/renderer.php index c0284f4aa2a..239db3d86f4 100644 --- a/cache/classes/output/renderer.php +++ b/cache/classes/output/renderer.php @@ -451,7 +451,7 @@ class renderer extends \plugin_renderer_base { 'right', 'right', ]; $summarytable->data = []; - $summarytable->attributes['class'] = 'generaltable w-auto'; + $summarytable->attributes['class'] = 'table generaltable w-auto'; $storetotals = []; // We will highlight all cells that are more than 2% of total size, so work that out first. diff --git a/cohort/assign.php b/cohort/assign.php index 511aac5e4b3..9f4c61761bc 100644 --- a/cohort/assign.php +++ b/cohort/assign.php @@ -107,7 +107,7 @@ if (optional_param('remove', false, PARAM_BOOL) && confirm_sesskey()) { -
{{#str}}planname, tool_lp{{/str}}
+

diff --git a/comment/locallib.php b/comment/locallib.php index 3fa53f0cea9..8da1249f5c1 100644 --- a/comment/locallib.php +++ b/comment/locallib.php @@ -179,7 +179,7 @@ class comment_manager { get_string('action') ); $table->colclasses = array ('leftalign', 'leftalign', 'leftalign', 'leftalign'); - $table->attributes = array('class'=>'admintable generaltable'); + $table->attributes = ['class' => 'admintable table generaltable']; $table->id = 'commentstable'; $table->data = array(); diff --git a/communication/classes/admin/manage_communication_providers_page.php b/communication/classes/admin/manage_communication_providers_page.php index d84c4defae5..1c61f606e45 100644 --- a/communication/classes/admin/manage_communication_providers_page.php +++ b/communication/classes/admin/manage_communication_providers_page.php @@ -68,7 +68,7 @@ class manage_communication_providers_page extends admin_setting { get_string('uninstallplugin', 'core_admin'), ]; $table->align = ['left', 'center', 'center', 'center']; - $table->attributes['class'] = 'managecommunicationtable generaltable admintable'; + $table->attributes['class'] = 'managecommunicationtable table generaltable admintable'; $table->data = []; foreach ($plugins as $plugin) { diff --git a/course/pending.php b/course/pending.php index a9b374503c1..f529fff27eb 100644 --- a/course/pending.php +++ b/course/pending.php @@ -121,7 +121,7 @@ if (empty($pending)) { /// Build a table of all the requests. $table = new html_table(); - $table->attributes['class'] = 'pendingcourserequests generaltable'; + $table->attributes['class'] = 'pendingcourserequests table generaltable'; $table->align = array('center', 'center', 'center', 'center', 'center', 'center'); $table->head = array(get_string('requestedby'), get_string('shortnamecourse'), get_string('fullnamecourse'), get_string('summary'), get_string('category'), get_string('requestreason'), get_string('action')); diff --git a/customfield/templates/list.mustache b/customfield/templates/list.mustache index 6e2965832d8..2bfd55e85d9 100644 --- a/customfield/templates/list.mustache +++ b/customfield/templates/list.mustache @@ -91,7 +91,7 @@
- +
diff --git a/enrol/lti/templates/local/ltiadvantage/deployments.mustache b/enrol/lti/templates/local/ltiadvantage/deployments.mustache index 10d6f098781..e5089aeb94f 100644 --- a/enrol/lti/templates/local/ltiadvantage/deployments.mustache +++ b/enrol/lti/templates/local/ltiadvantage/deployments.mustache @@ -52,7 +52,7 @@ {{{deployments_info}}} {{#has_deployments}} -
{{#str}} customfield, core_customfield {{/str}}
+
diff --git a/enrol/lti/templates/local/ltiadvantage/platform_details.mustache b/enrol/lti/templates/local/ltiadvantage/platform_details.mustache index 4dfef6cef05..835a2bd1ce3 100644 --- a/enrol/lti/templates/local/ltiadvantage/platform_details.mustache +++ b/enrol/lti/templates/local/ltiadvantage/platform_details.mustache @@ -53,7 +53,7 @@
{{{platform_details_info}}}
-
{{#str}}name, core{{/str}}
+
{{#platform_details}} diff --git a/enrol/lti/templates/local/ltiadvantage/registered_platforms.mustache b/enrol/lti/templates/local/ltiadvantage/registered_platforms.mustache index 5662e0019a2..6902df20a00 100644 --- a/enrol/lti/templates/local/ltiadvantage/registered_platforms.mustache +++ b/enrol/lti/templates/local/ltiadvantage/registered_platforms.mustache @@ -50,7 +50,7 @@ }}
{{#hasregs}} -
+
diff --git a/enrol/lti/templates/local/ltiadvantage/tool_details.mustache b/enrol/lti/templates/local/ltiadvantage/tool_details.mustache index f11b73bdd7a..a1f072db211 100644 --- a/enrol/lti/templates/local/ltiadvantage/tool_details.mustache +++ b/enrol/lti/templates/local/ltiadvantage/tool_details.mustache @@ -59,7 +59,7 @@ {{{dynamic_registration_info}}} {{#dynamic_registration_url}} -
{{#str}}name, core{{/str}}
+
@@ -89,7 +89,7 @@ {{manual_registration_info}}
-
+
diff --git a/enrol/manual/manage.php b/enrol/manual/manage.php index 30168fd50ff..4a5c63d1fa1 100644 --- a/enrol/manual/manage.php +++ b/enrol/manual/manage.php @@ -179,7 +179,7 @@ $removeenabled = $canunenrol ? '' : 'disabled="disabled"';
-
{{#str}}name, core{{/str}}
+

diff --git a/filter/manage.php b/filter/manage.php index b4a940bd18f..bb732f73c80 100644 --- a/filter/manage.php +++ b/filter/manage.php @@ -163,7 +163,7 @@ if (empty($availablefilters)) { $table->colclasses[] = 'leftalign'; } $table->id = 'frontpagefiltersettings'; - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; $table->data = []; // Iterate through filters adding to display table. diff --git a/grade/edit/scale/index.php b/grade/edit/scale/index.php index 6a21e7dab7e..ef51d55a8aa 100644 --- a/grade/edit/scale/index.php +++ b/grade/edit/scale/index.php @@ -137,7 +137,7 @@ if ($courseid and $scales = grade_scale::fetch_all_local($courseid)) { $table->head = array($strscale, $strused, $stredit); $table->size = array('70%', '20%', '10%'); $table->align = array('left', 'center', 'center'); - $table->attributes['class'] = 'scaletable localscales generaltable'; + $table->attributes['class'] = 'scaletable localscales table generaltable'; $table->data = $data; } @@ -163,7 +163,7 @@ if ($scales = grade_scale::fetch_all_global()) { $data[] = $line; } $table2->head = array($strscale, $strused, $stredit); - $table->attributes['class'] = 'scaletable globalscales generaltable'; + $table->attributes['class'] = 'scaletable globalscales table generaltable'; $table2->size = array('70%', '20%', '10%'); $table2->align = array('left', 'center', 'center'); $table2->data = $data; diff --git a/grade/edit/tree/lib.php b/grade/edit/tree/lib.php index a009da34673..06fd9ef2159 100644 --- a/grade/edit/tree/lib.php +++ b/grade/edit/tree/lib.php @@ -71,7 +71,7 @@ class grade_edit_tree { $this->table = new html_table(); $this->table->id = "grade_edit_tree_table"; - $this->table->attributes['class'] = 'generaltable simple setup-grades'; + $this->table->attributes['class'] = 'table generaltable simple setup-grades'; if ($this->moving) { $this->table->attributes['class'] .= ' moving'; } diff --git a/grade/report/history/classes/output/tablelog.php b/grade/report/history/classes/output/tablelog.php index 7060d8b015a..bdd97ecfff8 100644 --- a/grade/report/history/classes/output/tablelog.php +++ b/grade/report/history/classes/output/tablelog.php @@ -98,7 +98,7 @@ class tablelog extends \table_sql implements \renderable { global $CFG; parent::__construct($uniqueid); - $this->set_attribute('class', 'gradereport_history generaltable generalbox'); + $this->set_attribute('class', 'gradereport_history table generaltable'); // Set protected properties. $this->context = $context; diff --git a/grade/report/outcomes/index.php b/grade/report/outcomes/index.php index 6c10cd3a0a3..f2ae168c270 100644 --- a/grade/report/outcomes/index.php +++ b/grade/report/outcomes/index.php @@ -110,7 +110,7 @@ if ($taskindicator->has_task_record()) { exit; } -$html = '' . "\n"; +$html = '
' . "\n"; $html .= ''; $html .= ''; $html .= ''; diff --git a/grade/report/overview/lib.php b/grade/report/overview/lib.php index 9b5dd767f4f..f306de6efba 100644 --- a/grade/report/overview/lib.php +++ b/grade/report/overview/lib.php @@ -170,7 +170,7 @@ class grade_report_overview extends grade_report { $this->table->set_attribute('cellspacing', '0'); $this->table->set_attribute('id', 'overview-grade'); - $this->table->set_attribute('class', 'boxaligncenter generaltable'); + $this->table->set_attribute('class', 'table generaltable'); $this->table->setup(); } diff --git a/grade/report/singleview/styles.css b/grade/report/singleview/styles.css index 7623fd2e516..cd2422d5fb6 100644 --- a/grade/report/singleview/styles.css +++ b/grade/report/singleview/styles.css @@ -93,8 +93,8 @@ width: 100%; } -.path-grade-report-singleview .reporttable .generaltable th, -.path-grade-report-singleview .reporttable .generaltable td { +.path-grade-report-singleview .reporttable .table th, +.path-grade-report-singleview .reporttable .table td { text-align: left; vertical-align: middle; border: none; diff --git a/grade/report/user/classes/report/user.php b/grade/report/user/classes/report/user.php index 495c7a627f2..a8786f21ca7 100644 --- a/grade/report/user/classes/report/user.php +++ b/grade/report/user/classes/report/user.php @@ -1074,7 +1074,7 @@ class user extends grade_report { $table = new \html_table(); $table->attributes = [ 'summary' => s(get_string('tablesummary', 'gradereport_user')), - 'class' => 'generaltable boxaligncenter user-grade', + 'class' => 'table generaltable user-grade', ]; // Set the table headings. diff --git a/group/assign.php b/group/assign.php index d3c37c7cc09..604e0c84f62 100644 --- a/group/assign.php +++ b/group/assign.php @@ -147,7 +147,7 @@ echo $OUTPUT->header();
-
' . get_string('outcomeshortname', 'grades') . '' . get_string('courseavg', 'grades') . '' . get_string('sitewide', 'grades') . '
+
diff --git a/group/members.php b/group/members.php index 1d854e7fb04..649fcdb4689 100644 --- a/group/members.php +++ b/group/members.php @@ -117,7 +117,7 @@ if (!empty($group->description)) {
- +

diff --git a/h5p/templates/h5plibraries.mustache b/h5p/templates/h5plibraries.mustache index 1583d92f09e..ef2525c0912 100644 --- a/h5p/templates/h5plibraries.mustache +++ b/h5p/templates/h5plibraries.mustache @@ -70,7 +70,7 @@

- +
@@ -117,7 +117,7 @@
-
{{#str}}enable, core{{/str}}
+
diff --git a/lib/adminlib.php b/lib/adminlib.php index 6f92c68a615..85dd2c4fabc 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -6790,7 +6790,7 @@ class admin_setting_manageenrols extends admin_setting { $table->head = array(get_string('name'), $strusage, $strversion, $strenable, $strup.'/'.$strdown, $strsettings, $strtest, $struninstall); $table->colclasses = array('leftalign', 'centeralign', 'centeralign', 'centeralign', 'centeralign', 'centeralign', 'centeralign', 'centeralign'); $table->id = 'courseenrolmentplugins'; - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; $table->data = array(); // Iterate through enrol plugins and add to the display table. @@ -7341,7 +7341,7 @@ class admin_setting_manageauths extends admin_setting { $table->head = array($txt->name, $txt->users, $txt->enable, $txt->updown, $txt->settings, $txt->testsettings, $txt->uninstall); $table->colclasses = array('leftalign', 'centeralign', 'centeralign', 'centeralign', 'centeralign', 'centeralign', 'centeralign'); $table->data = array(); - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; $table->id = 'manageauthtable'; //add always enabled plugins first @@ -7540,7 +7540,7 @@ class admin_setting_manageantiviruses extends admin_setting { $table->head = array($txt->name, $txt->enable, $txt->updown, $txt->settings, $struninstall); $table->colclasses = array('leftalign', 'centeralign', 'centeralign', 'centeralign', 'centeralign'); $table->id = 'antivirusmanagement'; - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; $table->data = array(); // Iterate through auth plugins and add to the display table. @@ -7701,7 +7701,7 @@ class admin_setting_manageformats extends admin_setting { $table = new html_table(); $table->head = array($txt->name, $txt->enable, $txt->updown, $txt->uninstall, $txt->settings); $table->align = array('left', 'center', 'center', 'center', 'center'); - $table->attributes['class'] = 'manageformattable generaltable admintable'; + $table->attributes['class'] = 'manageformattable table generaltable admintable'; $table->data = array(); $cnt = 0; @@ -7850,7 +7850,7 @@ class admin_setting_managecustomfields extends admin_setting { $table = new html_table(); $table->head = array($txt->name, $txt->enable, $txt->uninstall, $txt->settings); $table->align = array('left', 'center', 'center', 'center'); - $table->attributes['class'] = 'managecustomfieldtable generaltable admintable'; + $table->attributes['class'] = 'managecustomfieldtable table generaltable admintable'; $table->data = array(); $spacer = $OUTPUT->pix_icon('spacer', '', 'moodle', array('class' => 'iconsmall')); @@ -7972,7 +7972,7 @@ class admin_setting_managedataformats extends admin_setting { $table = new html_table(); $table->head = array($txt->name, $txt->enable, $txt->updown, $txt->uninstall, $txt->settings); $table->align = array('left', 'center', 'center', 'center', 'center'); - $table->attributes['class'] = 'manageformattable generaltable admintable'; + $table->attributes['class'] = 'manageformattable table generaltable admintable'; $table->data = array(); $cnt = 0; @@ -8449,7 +8449,7 @@ class admin_setting_managemediaplayers extends admin_setting { $table->colclasses = array('leftalign', 'leftalign', 'centeralign', 'centeralign', 'centeralign', 'centeralign', 'centeralign'); $table->id = 'mediaplayerplugins'; - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; $table->data = array(); // Iterate through media plugins and add to the display table. @@ -8627,7 +8627,7 @@ class admin_setting_managecontentbankcontenttypes extends admin_setting { $table = new html_table(); $table->head = array($txt->name, $txt->enable, $txt->order, $txt->settings, $txt->uninstall); $table->align = array('left', 'center', 'center', 'center', 'center'); - $table->attributes['class'] = 'managecontentbanktable generaltable admintable'; + $table->attributes['class'] = 'managecontentbanktable table generaltable admintable'; $table->data = array(); $spacer = $OUTPUT->pix_icon('spacer', '', 'moodle', array('class' => 'iconsmall')); @@ -9910,7 +9910,7 @@ class admin_setting_manageexternalservices extends admin_setting { $table->head = array($strservice, $strplugin, $strfunctions, $strusers, $stredit); $table->colclasses = array('leftalign service', 'leftalign plugin', 'centeralign functions', 'centeralign users', 'centeralign '); $table->id = 'builtinservices'; - $table->attributes['class'] = 'admintable externalservices generaltable'; + $table->attributes['class'] = 'admintable externalservices table generaltable'; $table->data = array(); // iterate through auth plugins and add to the display table @@ -9950,7 +9950,7 @@ class admin_setting_manageexternalservices extends admin_setting { $table->head = array($strservice, $strdelete, $strfunctions, $strusers, $stredit); $table->colclasses = array('leftalign service', 'leftalign plugin', 'centeralign functions', 'centeralign users', 'centeralign '); $table->id = 'customservices'; - $table->attributes['class'] = 'admintable externalservices generaltable'; + $table->attributes['class'] = 'admintable externalservices table generaltable'; $table->data = array(); // iterate through auth plugins and add to the display table @@ -10055,7 +10055,7 @@ class admin_setting_webservicesoverview extends admin_setting { get_string('description')); $table->colclasses = array('leftalign step', 'leftalign status', 'leftalign description'); $table->id = 'onesystemcontrol'; - $table->attributes['class'] = 'admintable wsoverview generaltable'; + $table->attributes['class'] = 'admintable wsoverview table generaltable'; $table->data = array(); $return .= $brtag . get_string('onesystemcontrollingdescription', 'webservice') @@ -10179,7 +10179,7 @@ class admin_setting_webservicesoverview extends admin_setting { get_string('description')); $table->colclasses = array('leftalign step', 'leftalign status', 'leftalign description'); $table->id = 'userasclients'; - $table->attributes['class'] = 'admintable wsoverview generaltable'; + $table->attributes['class'] = 'admintable wsoverview table generaltable'; $table->data = array(); $return .= $brtag . get_string('userasclientsdescription', 'webservice') . @@ -10370,7 +10370,7 @@ class admin_setting_managewebserviceprotocols extends admin_setting { $table->head = array($strprotocol, $strversion, $strenable, $strsettings); $table->colclasses = array('leftalign', 'centeralign', 'centeralign', 'centeralign', 'centeralign'); $table->id = 'webserviceprotocols'; - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; $table->data = array(); // iterate through auth plugins and add to the display table @@ -11222,7 +11222,7 @@ class admin_setting_searchsetupinfo extends admin_setting { $table->head = array(get_string('step', 'search'), get_string('status')); $table->colclasses = array('leftalign step', 'leftalign status'); $table->id = 'searchsetup'; - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; $table->data = array(); $return .= $brtag . get_string('searchsetupdescription', 'search') . $brtag . $brtag; diff --git a/lib/amd/build/chart_output_htmltable.min.js b/lib/amd/build/chart_output_htmltable.min.js index d05618eacd4..8ee8d4ab6ea 100644 --- a/lib/amd/build/chart_output_htmltable.min.js +++ b/lib/amd/build/chart_output_htmltable.min.js @@ -5,6 +5,6 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @module core/chart_output_htmltable */ -define("core/chart_output_htmltable",["jquery","core/chart_output_base"],(function($,Base){function Output(){Base.prototype.constructor.apply(this,arguments),this._build()}return Output.prototype=Object.create(Base.prototype),Output.prototype._build=function(){this._node.empty(),this._node.append(this._makeTable())},Output.prototype._makeTable=function(){var node,value,tbl=$("
{{#str}}description, core{{/str}}
"),c=this._chart,labels=c.getLabels(),hasLabel=labels.length>0,series=c.getSeries(),rowCount=series[0].getCount();tbl.addClass("chart-output-htmltable generaltable"),null!==c.getTitle()&&tbl.append($(""),hasLabel&&node.append($("
").text(c.getTitle())),node=$("
")),series.forEach((function(serie){node.append($("").text(serie.getLabel()).attr("scope","col"))})),tbl.append(node);for(var rowId=0;rowId"),labels.length>0&&node.append($("").text(labels[rowId]).attr("scope","row"));for(var serieId=0;serieId").text(value));tbl.append(node)}return tbl},Output.prototype.update=function(){this._build()},Output})); +define("core/chart_output_htmltable",["jquery","core/chart_output_base"],(function($,Base){function Output(){Base.prototype.constructor.apply(this,arguments),this._build()}return Output.prototype=Object.create(Base.prototype),Output.prototype._build=function(){this._node.empty(),this._node.append(this._makeTable())},Output.prototype._makeTable=function(){var node,value,tbl=$(""),c=this._chart,labels=c.getLabels(),hasLabel=labels.length>0,series=c.getSeries(),rowCount=series[0].getCount();tbl.addClass("chart-output-htmltable generaltable table"),null!==c.getTitle()&&tbl.append($(""),hasLabel&&node.append($("
").text(c.getTitle())),node=$("
")),series.forEach((function(serie){node.append($("").text(serie.getLabel()).attr("scope","col"))})),tbl.append(node);for(var rowId=0;rowId"),labels.length>0&&node.append($("").text(labels[rowId]).attr("scope","row"));for(var serieId=0;serieId").text(value));tbl.append(node)}return tbl},Output.prototype.update=function(){this._build()},Output})); //# sourceMappingURL=chart_output_htmltable.min.js.map \ No newline at end of file diff --git a/lib/amd/build/chart_output_htmltable.min.js.map b/lib/amd/build/chart_output_htmltable.min.js.map index 1e91963b151..ef83d57f8dc 100644 --- a/lib/amd/build/chart_output_htmltable.min.js.map +++ b/lib/amd/build/chart_output_htmltable.min.js.map @@ -1 +1 @@ -{"version":3,"file":"chart_output_htmltable.min.js","sources":["../src/chart_output_htmltable.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle. If not, see .\n\n/**\n * Chart output for HTML table.\n *\n * @copyright 2016 Frédéric Massart - FMCorz.net\n * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n * @module core/chart_output_htmltable\n */\ndefine([\n 'jquery',\n 'core/chart_output_base',\n], function($, Base) {\n\n /**\n * Render a chart as an HTML table.\n *\n * @class\n * @extends {module:core/chart_output_base}\n */\n function Output() {\n Base.prototype.constructor.apply(this, arguments);\n this._build();\n }\n Output.prototype = Object.create(Base.prototype);\n\n /**\n * Attach the table to the document.\n *\n * @protected\n */\n Output.prototype._build = function() {\n this._node.empty();\n this._node.append(this._makeTable());\n };\n\n /**\n * Builds the table node.\n *\n * @protected\n * @return {Jquery}\n */\n Output.prototype._makeTable = function() {\n var tbl = $(''),\n c = this._chart,\n node,\n value,\n labels = c.getLabels(),\n hasLabel = labels.length > 0,\n series = c.getSeries(),\n seriesLabels,\n rowCount = series[0].getCount();\n\n // Identify the table.\n tbl.addClass('chart-output-htmltable generaltable');\n\n // Set the caption.\n if (c.getTitle() !== null) {\n tbl.append($('');\n if (hasLabel) {\n node.append($('');\n if (labels.length > 0) {\n node.append(\n $('
').text(c.getTitle()));\n }\n\n // Write the column headers.\n node = $('
'));\n }\n series.forEach(function(serie) {\n node.append(\n $('')\n .text(serie.getLabel())\n .attr('scope', 'col')\n );\n });\n tbl.append(node);\n\n // Write rows.\n for (var rowId = 0; rowId < rowCount; rowId++) {\n node = $('
')\n .text(labels[rowId])\n .attr('scope', 'row')\n );\n }\n for (var serieId = 0; serieId < series.length; serieId++) {\n value = series[serieId].getValues()[rowId];\n seriesLabels = series[serieId].getLabels();\n if (seriesLabels !== null) {\n value = series[serieId].getLabels()[rowId];\n }\n node.append($('').text(value));\n }\n tbl.append(node);\n }\n\n return tbl;\n };\n\n /** @override */\n Output.prototype.update = function() {\n this._build();\n };\n\n return Output;\n\n});\n"],"names":["define","$","Base","Output","prototype","constructor","apply","this","arguments","_build","Object","create","_node","empty","append","_makeTable","node","value","tbl","c","_chart","labels","getLabels","hasLabel","length","series","getSeries","rowCount","getCount","addClass","getTitle","text","forEach","serie","getLabel","attr","rowId","serieId","getValues","update"],"mappings":";;;;;;;AAsBAA,qCAAO,CACH,SACA,2BACD,SAASC,EAAGC,eAQFC,SACLD,KAAKE,UAAUC,YAAYC,MAAMC,KAAMC,gBAClCC,gBAETN,OAAOC,UAAYM,OAAOC,OAAOT,KAAKE,WAOtCD,OAAOC,UAAUK,OAAS,gBACjBG,MAAMC,aACND,MAAME,OAAOP,KAAKQ,eAS3BZ,OAAOC,UAAUW,WAAa,eAGtBC,KACAC,MAHAC,IAAMjB,EAAE,WACRkB,EAAIZ,KAAKa,OAGTC,OAASF,EAAEG,YACXC,SAAWF,OAAOG,OAAS,EAC3BC,OAASN,EAAEO,YAEXC,SAAWF,OAAO,GAAGG,WAGzBV,IAAIW,SAAS,uCAGQ,OAAjBV,EAAEW,YACFZ,IAAIJ,OAAOb,EAAE,aAAa8B,KAAKZ,EAAEW,aAIrCd,KAAOf,EAAE,QACLsB,UACAP,KAAKF,OAAOb,EAAE,SAElBwB,OAAOO,SAAQ,SAASC,OACpBjB,KAAKF,OACDb,EAAE,QACD8B,KAAKE,MAAMC,YACXC,KAAK,QAAS,WAGvBjB,IAAIJ,OAAOE,UAGN,IAAIoB,MAAQ,EAAGA,MAAQT,SAAUS,QAAS,CAC3CpB,KAAOf,EAAE,QACLoB,OAAOG,OAAS,GAChBR,KAAKF,OACDb,EAAE,QACD8B,KAAKV,OAAOe,QACZD,KAAK,QAAS,YAGlB,IAAIE,QAAU,EAAGA,QAAUZ,OAAOD,OAAQa,UAC3CpB,MAAQQ,OAAOY,SAASC,YAAYF,OAEf,OADNX,OAAOY,SAASf,cAE3BL,MAAQQ,OAAOY,SAASf,YAAYc,QAExCpB,KAAKF,OAAOb,EAAE,QAAQ8B,KAAKd,QAE/BC,IAAIJ,OAAOE,aAGRE,KAIXf,OAAOC,UAAUmC,OAAS,gBACjB9B,UAGFN"} \ No newline at end of file +{"version":3,"file":"chart_output_htmltable.min.js","sources":["../src/chart_output_htmltable.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle. If not, see .\n\n/**\n * Chart output for HTML table.\n *\n * @copyright 2016 Frédéric Massart - FMCorz.net\n * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n * @module core/chart_output_htmltable\n */\ndefine([\n 'jquery',\n 'core/chart_output_base',\n], function($, Base) {\n\n /**\n * Render a chart as an HTML table.\n *\n * @class\n * @extends {module:core/chart_output_base}\n */\n function Output() {\n Base.prototype.constructor.apply(this, arguments);\n this._build();\n }\n Output.prototype = Object.create(Base.prototype);\n\n /**\n * Attach the table to the document.\n *\n * @protected\n */\n Output.prototype._build = function() {\n this._node.empty();\n this._node.append(this._makeTable());\n };\n\n /**\n * Builds the table node.\n *\n * @protected\n * @return {Jquery}\n */\n Output.prototype._makeTable = function() {\n var tbl = $(''),\n c = this._chart,\n node,\n value,\n labels = c.getLabels(),\n hasLabel = labels.length > 0,\n series = c.getSeries(),\n seriesLabels,\n rowCount = series[0].getCount();\n\n // Identify the table.\n tbl.addClass('chart-output-htmltable generaltable table');\n\n // Set the caption.\n if (c.getTitle() !== null) {\n tbl.append($('');\n if (hasLabel) {\n node.append($('');\n if (labels.length > 0) {\n node.append(\n $('
').text(c.getTitle()));\n }\n\n // Write the column headers.\n node = $('
'));\n }\n series.forEach(function(serie) {\n node.append(\n $('')\n .text(serie.getLabel())\n .attr('scope', 'col')\n );\n });\n tbl.append(node);\n\n // Write rows.\n for (var rowId = 0; rowId < rowCount; rowId++) {\n node = $('
')\n .text(labels[rowId])\n .attr('scope', 'row')\n );\n }\n for (var serieId = 0; serieId < series.length; serieId++) {\n value = series[serieId].getValues()[rowId];\n seriesLabels = series[serieId].getLabels();\n if (seriesLabels !== null) {\n value = series[serieId].getLabels()[rowId];\n }\n node.append($('').text(value));\n }\n tbl.append(node);\n }\n\n return tbl;\n };\n\n /** @override */\n Output.prototype.update = function() {\n this._build();\n };\n\n return Output;\n\n});\n"],"names":["define","$","Base","Output","prototype","constructor","apply","this","arguments","_build","Object","create","_node","empty","append","_makeTable","node","value","tbl","c","_chart","labels","getLabels","hasLabel","length","series","getSeries","rowCount","getCount","addClass","getTitle","text","forEach","serie","getLabel","attr","rowId","serieId","getValues","update"],"mappings":";;;;;;;AAsBAA,qCAAO,CACH,SACA,2BACD,SAASC,EAAGC,eAQFC,SACLD,KAAKE,UAAUC,YAAYC,MAAMC,KAAMC,gBAClCC,gBAETN,OAAOC,UAAYM,OAAOC,OAAOT,KAAKE,WAOtCD,OAAOC,UAAUK,OAAS,gBACjBG,MAAMC,aACND,MAAME,OAAOP,KAAKQ,eAS3BZ,OAAOC,UAAUW,WAAa,eAGtBC,KACAC,MAHAC,IAAMjB,EAAE,WACRkB,EAAIZ,KAAKa,OAGTC,OAASF,EAAEG,YACXC,SAAWF,OAAOG,OAAS,EAC3BC,OAASN,EAAEO,YAEXC,SAAWF,OAAO,GAAGG,WAGzBV,IAAIW,SAAS,6CAGQ,OAAjBV,EAAEW,YACFZ,IAAIJ,OAAOb,EAAE,aAAa8B,KAAKZ,EAAEW,aAIrCd,KAAOf,EAAE,QACLsB,UACAP,KAAKF,OAAOb,EAAE,SAElBwB,OAAOO,SAAQ,SAASC,OACpBjB,KAAKF,OACDb,EAAE,QACD8B,KAAKE,MAAMC,YACXC,KAAK,QAAS,WAGvBjB,IAAIJ,OAAOE,UAGN,IAAIoB,MAAQ,EAAGA,MAAQT,SAAUS,QAAS,CAC3CpB,KAAOf,EAAE,QACLoB,OAAOG,OAAS,GAChBR,KAAKF,OACDb,EAAE,QACD8B,KAAKV,OAAOe,QACZD,KAAK,QAAS,YAGlB,IAAIE,QAAU,EAAGA,QAAUZ,OAAOD,OAAQa,UAC3CpB,MAAQQ,OAAOY,SAASC,YAAYF,OAEf,OADNX,OAAOY,SAASf,cAE3BL,MAAQQ,OAAOY,SAASf,YAAYc,QAExCpB,KAAKF,OAAOb,EAAE,QAAQ8B,KAAKd,QAE/BC,IAAIJ,OAAOE,aAGRE,KAIXf,OAAOC,UAAUmC,OAAS,gBACjB9B,UAGFN"} \ No newline at end of file diff --git a/lib/amd/src/chart_output_htmltable.js b/lib/amd/src/chart_output_htmltable.js index eb082e4252a..1f9efa91eb7 100644 --- a/lib/amd/src/chart_output_htmltable.js +++ b/lib/amd/src/chart_output_htmltable.js @@ -65,7 +65,7 @@ define([ rowCount = series[0].getCount(); // Identify the table. - tbl.addClass('chart-output-htmltable generaltable'); + tbl.addClass('chart-output-htmltable generaltable table'); // Set the caption. if (c.getTitle() !== null) { diff --git a/lib/classes/check/environment/publicpaths.php b/lib/classes/check/environment/publicpaths.php index fc726012dfd..0082b4c2498 100644 --- a/lib/classes/check/environment/publicpaths.php +++ b/lib/classes/check/environment/publicpaths.php @@ -194,7 +194,7 @@ class publicpaths extends check { get_string('category'), get_string('details'), ]; - $table->attributes['class'] = 'flexible generaltable generalbox table-sm'; + $table->attributes['class'] = 'flexible generaltable table table-sm'; $table->data = []; // Used to track duplicated errors. diff --git a/lib/classes/check/table.php b/lib/classes/check/table.php index dfa3742caba..d105830bf64 100644 --- a/lib/classes/check/table.php +++ b/lib/classes/check/table.php @@ -104,7 +104,7 @@ class table implements \renderable { 'leftalign action', ]; $table->id = $this->type . 'reporttable'; - $table->attributes = ['class' => 'admintable ' . $this->type . 'report generaltable']; + $table->attributes = ['class' => 'admintable ' . $this->type . 'report table generaltable']; foreach ($this->checks as $check) { $ref = $check->get_ref(); diff --git a/lib/editor/tiny/plugins/premium/classes/local/admin_setting_tiny_premium_plugins.php b/lib/editor/tiny/plugins/premium/classes/local/admin_setting_tiny_premium_plugins.php index 0a1c78af700..18a32e51ee7 100644 --- a/lib/editor/tiny/plugins/premium/classes/local/admin_setting_tiny_premium_plugins.php +++ b/lib/editor/tiny/plugins/premium/classes/local/admin_setting_tiny_premium_plugins.php @@ -97,7 +97,7 @@ class admin_setting_tiny_premium_plugins extends \admin_setting { // Set up table. $table = new \html_table(); $table->id = 'managetinypremiumpluginstable'; - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; $table->head = [ get_string('name'), get_string('enable'), diff --git a/lib/portfolio/exporter.php b/lib/portfolio/exporter.php index eb12a3d63e1..7c8e188a3af 100644 --- a/lib/portfolio/exporter.php +++ b/lib/portfolio/exporter.php @@ -415,7 +415,7 @@ class portfolio_exporter { } $mainsummary = array_merge($mainsummary, $csummary, $isummary); $table = new html_table(); - $table->attributes['class'] = 'generaltable exportsummary'; + $table->attributes['class'] = 'table generaltable exportsummary'; $table->data = array(); foreach ($mainsummary as $string => $value) { $table->data[] = array($string, $value); diff --git a/lib/table/classes/sql_table.php b/lib/table/classes/sql_table.php index 815e81aef1f..f7f3b4ebf82 100644 --- a/lib/table/classes/sql_table.php +++ b/lib/table/classes/sql_table.php @@ -62,7 +62,7 @@ class sql_table extends flexible_table { public function __construct($uniqueid) { parent::__construct($uniqueid); // Set some sensible defaults. - $this->set_attribute('class', 'generaltable generalbox'); + $this->set_attribute('class', 'table generaltable'); } /** diff --git a/message/output/airnotifier/checkconfiguration.php b/message/output/airnotifier/checkconfiguration.php index 4aa8d34d991..7bb030907a0 100644 --- a/message/output/airnotifier/checkconfiguration.php +++ b/message/output/airnotifier/checkconfiguration.php @@ -87,7 +87,7 @@ $table->colclasses = [ 'leftalign summary', ]; $table->id = 'message_airnotifier_checkconfiguration'; -$table->attributes = ['class' => 'admintable generaltable']; +$table->attributes = ['class' => 'admintable table generaltable']; $table->data = []; $senddisabled = false; diff --git a/message/renderer.php b/message/renderer.php index 4e8c9fd4b33..e1088b30fd1 100644 --- a/message/renderer.php +++ b/message/renderer.php @@ -75,7 +75,7 @@ class core_message_renderer extends plugin_renderer_base { public function manage_messageoutputs($processors) { // Display the current workflows $table = new html_table(); - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable table generaltable'; $table->data = array(); $table->head = array( get_string('name'), diff --git a/mod/assign/adminlib.php b/mod/assign/adminlib.php index c78030fa01e..9320e79d51d 100644 --- a/mod/assign/adminlib.php +++ b/mod/assign/adminlib.php @@ -182,7 +182,7 @@ class assign_plugin_manager { get_string('version'), get_string('hideshow', 'assign'), get_string('order'), get_string('settings'), get_string('uninstallplugin', 'core_admin'))); $table->set_attribute('id', $this->subtype . 'plugins'); - $table->set_attribute('class', 'admintable generaltable'); + $table->set_attribute('class', 'admintable table generaltable'); $table->setup(); $plugins = $this->get_sorted_plugins_list(); diff --git a/mod/assign/styles.css b/mod/assign/styles.css index 56f9ff71916..1471dab729a 100644 --- a/mod/assign/styles.css +++ b/mod/assign/styles.css @@ -14,16 +14,16 @@ margin-bottom: 1.5em; } -.path-mod-assign div.submissionstatus .generaltable, -.path-mod-assign div.submissionlinks .generaltable, -.path-mod-assign div.feedback .generaltable, -.path-mod-assign div.submissionsummarytable .generaltable, +.path-mod-assign div.submissionstatus .table, +.path-mod-assign div.submissionlinks .table, +.path-mod-assign div.feedback .table, +.path-mod-assign div.submissionsummarytable .table, .path-mod-assign div.attempthistory table, -.path-mod-assign div.gradingsummary .generaltable { +.path-mod-assign div.gradingsummary .table { width: 100%; } -.path-mod-assign table.generaltable table td { +.path-mod-assign table.table table td { border: 0 none; } @@ -628,13 +628,13 @@ margin-right: 5px; } -.path-mod-assign [data-region="grade-panel"] .submissionsummarytable table.generaltable td { +.path-mod-assign [data-region="grade-panel"] .submissionsummarytable table.table td { padding: 8px 0; background-color: transparent; } -.path-mod-assign [data-region="grade-panel"] .submissionsummarytable .generaltable tbody > tr:nth-child(2n+1) > td, -.path-mod-assign [data-region="grade-panel"] .submissionsummarytable .generaltable tbody tr:hover > td { +.path-mod-assign [data-region="grade-panel"] .submissionsummarytable .table tbody > tr:nth-child(2n+1) > td, +.path-mod-assign [data-region="grade-panel"] .submissionsummarytable .table tbody tr:hover > td { background-color: transparent; } @@ -1214,7 +1214,7 @@ /** End of base fixes **/ /** Fix to YUI tree (which is a table) when displayed within grading table. **/ -.path-mod-assign table.generaltable table td.ygtvcell { +.path-mod-assign table.table table td.ygtvcell { border: 0; padding: 0; } diff --git a/mod/bigbluebuttonbn/classes/local/plugins/admin_plugin_manager.php b/mod/bigbluebuttonbn/classes/local/plugins/admin_plugin_manager.php index 94bfc5eda06..3d0fc06419c 100644 --- a/mod/bigbluebuttonbn/classes/local/plugins/admin_plugin_manager.php +++ b/mod/bigbluebuttonbn/classes/local/plugins/admin_plugin_manager.php @@ -107,7 +107,7 @@ class admin_plugin_manager { get_string('uninstallplugin', 'core_admin') ]); $table->set_attribute('id', extension::BBB_EXTENSION_PLUGIN_NAME . 'plugins'); - $table->set_attribute('class', 'admintable generaltable'); + $table->set_attribute('class', 'admintable table generaltable'); $table->setup(); $plugins = $this->get_sorted_plugins_list(); diff --git a/mod/bigbluebuttonbn/templates/participant_form.mustache b/mod/bigbluebuttonbn/templates/participant_form.mustache index f376cca1afb..72a85f997a0 100644 --- a/mod/bigbluebuttonbn/templates/participant_form.mustache +++ b/mod/bigbluebuttonbn/templates/participant_form.mustache @@ -43,7 +43,7 @@ {{#disabled}}disabled{{/disabled}} {{#attributes}} {{name}}={{#quote}}{{value}}{{/quote}} {{/attributes}}>{{label}} {{/action}} - +
diff --git a/mod/book/index.php b/mod/book/index.php index 6fc2867c5b1..315269be639 100644 --- a/mod/book/index.php +++ b/mod/book/index.php @@ -58,7 +58,7 @@ if (!$books = get_all_instances_in_course('book', $course)) { $usesections = course_format_uses_sections($course->format); $table = new html_table(); -$table->attributes['class'] = 'generaltable mod_index'; +$table->attributes['class'] = 'table generaltable mod_index'; if ($usesections) { $strsectionname = course_get_format($course)->get_generic_section_name(); diff --git a/mod/data/styles.css b/mod/data/styles.css index f787f9d3aa4..0663582c4eb 100644 --- a/mod/data/styles.css +++ b/mod/data/styles.css @@ -202,6 +202,6 @@ color: var(--bs-primary); } -#page-mod-data-preset .generaltable { +#page-mod-data-preset .table { margin-bottom: 10rem; } diff --git a/mod/data/templates/presets.mustache b/mod/data/templates/presets.mustache index 5d5c6e51ab3..1aaa7fffab6 100644 --- a/mod/data/templates/presets.mustache +++ b/mod/data/templates/presets.mustache @@ -61,7 +61,7 @@
- +
diff --git a/mod/feedback/show_nonrespondents.php b/mod/feedback/show_nonrespondents.php index 5bc66868387..86adb33dc65 100644 --- a/mod/feedback/show_nonrespondents.php +++ b/mod/feedback/show_nonrespondents.php @@ -198,7 +198,7 @@ $table->define_baseurl($baseurl); $table->sortable(true, 'lastname', SORT_DESC); $table->set_attribute('cellspacing', '0'); $table->set_attribute('id', 'showentrytable'); -$table->set_attribute('class', 'generaltable generalbox'); +$table->set_attribute('class', 'table generaltable'); $table->set_control_variables(array( TABLE_VAR_SORT => 'ssort', TABLE_VAR_IFIRST => 'sifirst', diff --git a/mod/folder/index.php b/mod/folder/index.php index f5e567fedf3..d039e609902 100644 --- a/mod/folder/index.php +++ b/mod/folder/index.php @@ -63,7 +63,7 @@ if (!$folders = get_all_instances_in_course('folder', $course)) { $usesections = course_format_uses_sections($course->format); $table = new html_table(); -$table->attributes['class'] = 'generaltable mod_index'; +$table->attributes['class'] = 'table generaltable mod_index'; if ($usesections) { $strsectionname = course_get_format($course)->get_generic_section_name(); diff --git a/mod/h5pactivity/classes/local/report/participants.php b/mod/h5pactivity/classes/local/report/participants.php index 3ecadfe7b05..0c009f7b14f 100644 --- a/mod/h5pactivity/classes/local/report/participants.php +++ b/mod/h5pactivity/classes/local/report/participants.php @@ -77,7 +77,7 @@ class participants extends table_sql implements report { ]; $this->define_columns($columns); $this->define_headers($headers); - $this->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide'); + $this->set_attribute('class', 'table generaltable'); $this->sortable(true); $this->no_sorting('score'); $this->no_sorting('timemodified'); diff --git a/mod/h5pactivity/index.php b/mod/h5pactivity/index.php index b332cd2fd3f..03c3833e0b6 100644 --- a/mod/h5pactivity/index.php +++ b/mod/h5pactivity/index.php @@ -54,7 +54,7 @@ if (empty($h5pactivities)) { } $table = new html_table(); -$table->attributes['class'] = 'generaltable mod_index'; +$table->attributes['class'] = 'table generaltable mod_index'; $align = ['center', 'left']; if ($course->format == 'weeks' || $course->format == 'topics') { diff --git a/mod/imscp/index.php b/mod/imscp/index.php index 2c78249cf28..2ce2bc582df 100644 --- a/mod/imscp/index.php +++ b/mod/imscp/index.php @@ -58,7 +58,7 @@ if (!$imscps = get_all_instances_in_course('imscp', $course)) { $usesections = course_format_uses_sections($course->format); $table = new html_table(); -$table->attributes['class'] = 'generaltable mod_index'; +$table->attributes['class'] = 'table generaltable mod_index'; if ($usesections) { $strsectionname = course_get_format($course)->get_generic_section_name(); diff --git a/mod/lesson/essay.php b/mod/lesson/essay.php index d9b48c50d95..15cd7ca3ce2 100644 --- a/mod/lesson/essay.php +++ b/mod/lesson/essay.php @@ -384,7 +384,7 @@ switch ($mode) { $table = new html_table(); $table->head = array(get_string('name'), get_string('essays', 'lesson'), get_string('status'), get_string('email', 'lesson')); - $table->attributes['class'] = 'standardtable generaltable'; + $table->attributes['class'] = 'table generaltable'; $table->align = array('left', 'left', 'left'); $table->wrap = array('nowrap', 'nowrap', ''); diff --git a/mod/lesson/report.php b/mod/lesson/report.php index e9cd4477f37..dcbfac4007c 100644 --- a/mod/lesson/report.php +++ b/mod/lesson/report.php @@ -233,7 +233,7 @@ if ($action === 'delete') { get_string('highscore', 'lesson'), get_string('lowscore', 'lesson'), get_string('hightime', 'lesson'), get_string('lowtime', 'lesson')); $stattable->align = array('center', 'center', 'center', 'center', 'center', 'center'); - $stattable->attributes['class'] = 'standardtable generaltable'; + $stattable->attributes['class'] = 'table generaltable'; $stattable->data[] = array($data->avescore, $data->avetime, $data->highscore, $data->lowscore, $data->hightime, $data->lowtime); } else { @@ -243,7 +243,7 @@ if ($action === 'delete') { $stattable->head = array(get_string('averagetime', 'lesson'), get_string('hightime', 'lesson'), get_string('lowtime', 'lesson')); $stattable->align = array('center', 'center', 'center'); - $stattable->attributes['class'] = 'standardtable generaltable'; + $stattable->attributes['class'] = 'table generaltable'; $stattable->data[] = array($data->avetime, $data->hightime, $data->lowtime); } diff --git a/mod/lti/index.php b/mod/lti/index.php index f3582f41966..f7fd2d6da2b 100644 --- a/mod/lti/index.php +++ b/mod/lti/index.php @@ -84,7 +84,7 @@ $strname = get_string("name"); $usesections = course_format_uses_sections($course->format); $table = new html_table(); -$table->attributes['class'] = 'generaltable mod_index'; +$table->attributes['class'] = 'table generaltable mod_index'; if ($usesections) { $strsectionname = course_get_format($course)->get_generic_section_name(); diff --git a/mod/lti/styles.css b/mod/lti/styles.css index 971ce1ad599..f7c701a056a 100644 --- a/mod/lti/styles.css +++ b/mod/lti/styles.css @@ -451,12 +451,12 @@ } /* The following removes the striping that lives in table_sql, which we can't change from within reportbuilder */ -#page-mod-lti-coursetools table.generaltable tbody tr:nth-of-type(2n+1), +#page-mod-lti-coursetools table.table tbody tr:nth-of-type(2n+1), #page-mod-lti-coursetools table.table-striped tbody tr:nth-of-type(2n+1) { background: inherit; } -#page-mod-lti-coursetools table.generaltable tbody tr:hover, +#page-mod-lti-coursetools table.table tbody tr:hover, #page-mod-lti-coursetools table.table-striped tbody tr:hover { background: #fff; } diff --git a/mod/page/index.php b/mod/page/index.php index 108aa86f8f2..3ee5b8aaca3 100644 --- a/mod/page/index.php +++ b/mod/page/index.php @@ -57,7 +57,7 @@ if (!$pages = get_all_instances_in_course('page', $course)) { $usesections = course_format_uses_sections($course->format); $table = new html_table(); -$table->attributes['class'] = 'generaltable mod_index'; +$table->attributes['class'] = 'table generaltable mod_index'; if ($usesections) { $strsectionname = course_get_format($course)->get_generic_section_name(); diff --git a/mod/quiz/accessrule/seb/classes/local/table/template_list.php b/mod/quiz/accessrule/seb/classes/local/table/template_list.php index 5833234c970..f841a0f7e33 100644 --- a/mod/quiz/accessrule/seb/classes/local/table/template_list.php +++ b/mod/quiz/accessrule/seb/classes/local/table/template_list.php @@ -58,7 +58,7 @@ class template_list extends \flexible_table { parent::__construct('quizaccess_seb' . $id); $this->define_baseurl($PAGE->url); - $this->set_attribute('class', 'generaltable admintable'); + $this->set_attribute('class', 'table generaltable admintable'); // Column definition. $this->define_columns([ diff --git a/mod/quiz/classes/output/renderer.php b/mod/quiz/classes/output/renderer.php index 584246c26d5..7502b9b177a 100644 --- a/mod/quiz/classes/output/renderer.php +++ b/mod/quiz/classes/output/renderer.php @@ -756,7 +756,7 @@ class renderer extends plugin_renderer_base { public function summary_table($attemptobj, $displayoptions) { // Prepare the summary table header. $table = new html_table(); - $table->attributes['class'] = 'generaltable quizsummaryofattempt boxaligncenter'; + $table->attributes['class'] = 'table generaltable quizsummaryofattempt'; $table->head = [get_string('question', 'quiz'), get_string('status', 'quiz')]; $table->align = ['left', 'left']; $table->size = ['', '']; @@ -1141,7 +1141,7 @@ class renderer extends plugin_renderer_base { // Prepare table header. $table = new html_table(); - $table->attributes['class'] = 'generaltable quizattemptsummary'; + $table->attributes['class'] = 'table generaltable quizattemptsummary'; $table->caption = get_string('summaryofattempts', 'quiz'); $table->captionhide = true; $table->head = []; diff --git a/mod/quiz/report/grading/renderer.php b/mod/quiz/report/grading/renderer.php index c98648c0583..a86993b60b0 100644 --- a/mod/quiz/report/grading/renderer.php +++ b/mod/quiz/report/grading/renderer.php @@ -84,7 +84,7 @@ class quiz_grading_renderer extends plugin_renderer_base { $output = ''; $table = new html_table(); - $table->class = 'generaltable'; + $table->class = 'table generaltable'; $table->id = 'questionstograde'; $table->head = $header; $table->data = $data; diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php index fb944f54805..30e668d7c33 100644 --- a/mod/quiz/report/overview/report.php +++ b/mod/quiz/report/overview/report.php @@ -161,7 +161,7 @@ class quiz_overview_report extends attempts_report { } $this->set_up_table_columns($table, $columns, $headers, $this->get_base_url(), $options, false); - $table->set_attribute('class', 'generaltable generalbox grades'); + $table->set_attribute('class', 'table generaltable generalbox grades'); $table->out($options->pagesize, true); diff --git a/mod/quiz/report/statistics/report.php b/mod/quiz/report/statistics/report.php index 1a7928b1b59..aecd30ed67f 100644 --- a/mod/quiz/report/statistics/report.php +++ b/mod/quiz/report/statistics/report.php @@ -303,7 +303,7 @@ class quiz_statistics_report extends report_base { $questioninfotable = new html_table(); $questioninfotable->align = ['center', 'center']; $questioninfotable->width = '60%'; - $questioninfotable->attributes['class'] = 'generaltable titlesleft'; + $questioninfotable->attributes['class'] = 'table generaltable titlesleft'; $questioninfotable->data = []; $questioninfotable->data[] = [get_string('modulename', 'quiz'), $quiz->name]; @@ -325,7 +325,7 @@ class quiz_statistics_report extends report_base { $questionstatstable = new html_table(); $questionstatstable->align = ['center', 'center']; $questionstatstable->width = '60%'; - $questionstatstable->attributes['class'] = 'generaltable titlesleft'; + $questionstatstable->attributes['class'] = 'table generaltable titlesleft'; unset($datumfromtable['number']); unset($datumfromtable['icon']); @@ -498,7 +498,7 @@ class quiz_statistics_report extends report_base { $quizinfotable = new html_table(); $quizinfotable->align = ['center', 'center']; $quizinfotable->width = '60%'; - $quizinfotable->attributes['class'] = 'generaltable titlesleft'; + $quizinfotable->attributes['class'] = 'table generaltable titlesleft'; $quizinfotable->data = []; foreach ($quizinfo as $heading => $value) { diff --git a/mod/quiz/report/statistics/statistics_question_table.php b/mod/quiz/report/statistics/statistics_question_table.php index 99bbe470a45..90c2ce023ee 100644 --- a/mod/quiz/report/statistics/statistics_question_table.php +++ b/mod/quiz/report/statistics/statistics_question_table.php @@ -70,7 +70,7 @@ class quiz_statistics_question_table extends flexible_table { $this->define_baseurl($reporturl->out()); $this->collapsible(false); - $this->set_attribute('class', 'generaltable generalbox boxaligncenter quizresponseanalysis'); + $this->set_attribute('class', 'table generaltable generalbox quizresponseanalysis'); // Define the table columns. $columns = []; diff --git a/mod/quiz/report/statistics/statistics_table.php b/mod/quiz/report/statistics/statistics_table.php index 31a8f6cfacb..66d85b49aa3 100644 --- a/mod/quiz/report/statistics/statistics_table.php +++ b/mod/quiz/report/statistics/statistics_table.php @@ -129,7 +129,7 @@ class quiz_statistics_table extends flexible_table { $this->collapsible(true); $this->set_attribute('id', 'questionstatistics'); - $this->set_attribute('class', 'generaltable generalbox boxaligncenter'); + $this->set_attribute('class', 'table generaltable generalbox'); parent::setup(); } diff --git a/mod/quiz/templates/attempt_summary_information.mustache b/mod/quiz/templates/attempt_summary_information.mustache index af6ddc0b7fb..1f3a84157bf 100644 --- a/mod/quiz/templates/attempt_summary_information.mustache +++ b/mod/quiz/templates/attempt_summary_information.mustache @@ -33,7 +33,7 @@ } }} {{#hasitems}} - +
{{#items}} diff --git a/mod/quiz/templates/edit_grading_page.mustache b/mod/quiz/templates/edit_grading_page.mustache index 275fdc106df..b548f96da5f 100644 --- a/mod/quiz/templates/edit_grading_page.mustache +++ b/mod/quiz/templates/edit_grading_page.mustache @@ -88,7 +88,7 @@ {{/hasgradeitems}} {{#hasgradeitems}} -
+
@@ -147,7 +147,7 @@ {{/hasslots}} {{#hasslots}} -
+
diff --git a/mod/resource/index.php b/mod/resource/index.php index e176a103a5e..cc2f28e0d42 100644 --- a/mod/resource/index.php +++ b/mod/resource/index.php @@ -63,7 +63,7 @@ if (!$resources = get_all_instances_in_course('resource', $course)) { $usesections = course_format_uses_sections($course->format); $table = new html_table(); -$table->attributes['class'] = 'generaltable mod_index'; +$table->attributes['class'] = 'table generaltable mod_index'; if ($usesections) { $table->head = array ($strsectionname, $strname, $strintro); diff --git a/mod/scorm/report/basic/classes/report.php b/mod/scorm/report/basic/classes/report.php index 1289a19ee8f..0af5950e039 100644 --- a/mod/scorm/report/basic/classes/report.php +++ b/mod/scorm/report/basic/classes/report.php @@ -187,7 +187,7 @@ class report extends \mod_scorm\report { $table->set_attribute('cellspacing', '0'); $table->set_attribute('id', 'attempts'); - $table->set_attribute('class', 'generaltable generalbox'); + $table->set_attribute('class', 'table generaltable'); // Start working -- this is necessary as soon as the niceties are over. $table->setup(); diff --git a/mod/scorm/report/interactions/classes/report.php b/mod/scorm/report/interactions/classes/report.php index 21402a2e658..53810f4a9d3 100644 --- a/mod/scorm/report/interactions/classes/report.php +++ b/mod/scorm/report/interactions/classes/report.php @@ -262,7 +262,7 @@ class report extends \mod_scorm\report { $table->set_attribute('cellspacing', '0'); $table->set_attribute('id', 'attempts'); - $table->set_attribute('class', 'generaltable generalbox'); + $table->set_attribute('class', 'table generaltable'); // Start working -- this is necessary as soon as the niceties are over. $table->setup(); diff --git a/mod/scorm/report/objectives/classes/report.php b/mod/scorm/report/objectives/classes/report.php index 15f58626932..1bdb4cc7772 100644 --- a/mod/scorm/report/objectives/classes/report.php +++ b/mod/scorm/report/objectives/classes/report.php @@ -252,7 +252,7 @@ class report extends \mod_scorm\report { $table->set_attribute('cellspacing', '0'); $table->set_attribute('id', 'attempts'); - $table->set_attribute('class', 'generaltable generalbox'); + $table->set_attribute('class', 'table generaltable'); // Start working -- this is necessary as soon as the niceties are over. $table->setup(); diff --git a/mod/scorm/report/userreportinteractions.php b/mod/scorm/report/userreportinteractions.php index a00820a6ec5..94d47327b78 100644 --- a/mod/scorm/report/userreportinteractions.php +++ b/mod/scorm/report/userreportinteractions.php @@ -122,7 +122,7 @@ $table->define_columns(array('id', 'studentanswer', 'correctanswer', 'result', ' $table->define_headers(array(get_string('trackid', 'scorm'), get_string('response', 'scorm'), get_string('rightanswer', 'scorm'), get_string('result', 'scorm'), get_string('calculatedweight', 'scorm'))); -$table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide'); +$table->set_attribute('class', 'table generaltable'); $table->show_download_buttons_at(array(TABLE_P_BOTTOM)); $table->setup(); diff --git a/mod/scorm/report/userreporttracks.php b/mod/scorm/report/userreporttracks.php index 1382ce49ab2..81cb6ca9f2d 100644 --- a/mod/scorm/report/userreporttracks.php +++ b/mod/scorm/report/userreporttracks.php @@ -113,7 +113,7 @@ if (!$table->is_downloading($download, $exportfilename)) { $table->define_baseurl($PAGE->url); $table->define_columns(array('element', 'value')); $table->define_headers(array(get_string('element', 'scorm'), get_string('value', 'scorm'))); -$table->set_attribute('class', 'generaltable generalbox boxaligncenter scormtrackreport'); +$table->set_attribute('class', 'table generaltable scormtrackreport'); $table->show_download_buttons_at(array(TABLE_P_BOTTOM)); $table->setup(); diff --git a/mod/subsection/index.php b/mod/subsection/index.php index 04910b166d2..101307afeef 100644 --- a/mod/subsection/index.php +++ b/mod/subsection/index.php @@ -53,7 +53,7 @@ if (empty($subsections)) { } $table = new html_table(); -$table->attributes['class'] = 'generaltable mod_index'; +$table->attributes['class'] = 'table generaltable mod_index'; if ($course->format == 'weeks') { $table->head = [get_string('week'), get_string('name')]; diff --git a/mod/url/index.php b/mod/url/index.php index e44411e55e2..86d524fd143 100644 --- a/mod/url/index.php +++ b/mod/url/index.php @@ -62,7 +62,7 @@ if (!$urls = get_all_instances_in_course('url', $course)) { $usesections = course_format_uses_sections($course->format); $table = new html_table(); -$table->attributes['class'] = 'generaltable mod_index'; +$table->attributes['class'] = 'table generaltable mod_index'; if ($usesections) { $strsectionname = course_get_format($course)->get_generic_section_name(); diff --git a/question/classes/admin/manage_qbank_plugins_page.php b/question/classes/admin/manage_qbank_plugins_page.php index 81f073ad5c9..8d63df12d14 100644 --- a/question/classes/admin/manage_qbank_plugins_page.php +++ b/question/classes/admin/manage_qbank_plugins_page.php @@ -85,7 +85,7 @@ class manage_qbank_plugins_page extends \admin_setting { $table = new \html_table(); $table->head = [$txt->name, $txt->enable, $txt->settings, $txt->uninstall]; $table->align = ['left', 'center', 'center', 'center', 'center']; - $table->attributes['class'] = 'manageqbanktable generaltable admintable'; + $table->attributes['class'] = 'manageqbanktable table generaltable admintable'; $table->data = []; $totalenabled = 0; diff --git a/question/classes/local/bank/view.php b/question/classes/local/bank/view.php index f23c680351b..41707011ebf 100644 --- a/question/classes/local/bank/view.php +++ b/question/classes/local/bank/view.php @@ -1328,7 +1328,7 @@ class view { // Start of the table. echo \html_writer::start_tag('table', [ 'id' => 'categoryquestions', - 'class' => 'question-bank-table generaltable', + 'class' => 'question-bank-table table generaltable', 'data-defaultsort' => json_encode($this->sort), ]); diff --git a/report/backups/index.php b/report/backups/index.php index ffd2145f80e..2bd74b9eaca 100644 --- a/report/backups/index.php +++ b/report/backups/index.php @@ -122,7 +122,7 @@ $table->head = array( get_string("backupnext") ); $table->headspan = array(1, 3, 1, 1); -$table->attributes = array('class' => 'generaltable backup-report'); +$table->attributes = ['class' => 'table generaltable backup-report']; $table->data = array(); $select = ', ' . context_helper::get_preload_record_columns_sql('ctx'); diff --git a/report/classes/output/coursestructure.php b/report/classes/output/coursestructure.php index 36a4f08b485..cc010392436 100644 --- a/report/classes/output/coursestructure.php +++ b/report/classes/output/coursestructure.php @@ -49,7 +49,7 @@ class coursestructure implements \renderable, \templatable { $headers = $this->export_headers($output); return [ - 'class' => 'generaltable boxaligncenter', + 'class' => 'table generaltable', 'headers' => $headers, 'headerscount' => count($headers), 'activities' => $this->export_activities($output), diff --git a/report/completion/user.php b/report/completion/user.php index 520a11077e7..dc5f93b72b6 100644 --- a/report/completion/user.php +++ b/report/completion/user.php @@ -155,7 +155,7 @@ foreach ($courses as $type => $infos) { if (!empty($infos)) { echo '

'.get_string($type, 'report_completion').'

'; - echo '
'; + echo '
'; echo ''; echo ''; echo ''; diff --git a/report/insights/templates/insight_details.mustache b/report/insights/templates/insight_details.mustache index ecd91d5d350..5a743aa6a0c 100644 --- a/report/insights/templates/insight_details.mustache +++ b/report/insights/templates/insight_details.mustache @@ -94,7 +94,7 @@ {{> report_insights/bulk_actions }} -
'.get_string('course').''.get_string('requiredcriteria', 'completion').'
+
{{#showpredictionheading}}
{{#str}}prediction, report_insights{{/str}}: @@ -118,7 +118,7 @@
- +
@@ -133,7 +133,7 @@ {{/timerange}}
{{#str}}predictiondetails, report_insights{{/str}}
- +
{{#calculations}} diff --git a/report/insights/templates/insights_list.mustache b/report/insights/templates/insights_list.mustache index f55c7e209fa..a5a0d70f756 100644 --- a/report/insights/templates/insights_list.mustache +++ b/report/insights/templates/insights_list.mustache @@ -123,7 +123,7 @@ {{#predictions}} -
{{#str}}indicators, report_insights{{/str}}
+
{{#showpredictionheading}}
{{#str}}prediction, report_insights{{/str}}: diff --git a/report/log/classes/table_log.php b/report/log/classes/table_log.php index 67fb5c05805..9cbeacd6172 100644 --- a/report/log/classes/table_log.php +++ b/report/log/classes/table_log.php @@ -67,7 +67,7 @@ class report_log_table_log extends table_sql { public function __construct($uniqueid, $filterparams = null) { parent::__construct($uniqueid); - $this->set_attribute('class', 'reportlog generaltable generalbox table-sm'); + $this->set_attribute('class', 'reportlog generaltable table table-sm'); $this->filterparams = $filterparams; // Add course column if logs are displayed for site. $cols = array(); diff --git a/report/loglive/classes/table_log.php b/report/loglive/classes/table_log.php index f9ed1a0fb70..a5687faae51 100644 --- a/report/loglive/classes/table_log.php +++ b/report/loglive/classes/table_log.php @@ -67,7 +67,7 @@ class report_loglive_table_log extends table_sql { public function __construct($uniqueid, $filterparams = null) { parent::__construct($uniqueid); - $this->set_attribute('class', 'reportloglive generaltable table-sm'); + $this->set_attribute('class', 'reportloglive generaltable table table-sm'); $this->set_attribute('aria-live', 'polite'); $this->filterparams = $filterparams; // Add course column if logs are displayed for site. diff --git a/report/participation/index.php b/report/participation/index.php index e63ac40fa4e..168ecc07244 100644 --- a/report/participation/index.php +++ b/report/participation/index.php @@ -167,7 +167,7 @@ if (!empty($instanceid) && !empty($roleid)) { } $table->define_baseurl($baseurl); - $table->set_attribute('class', 'generaltable generalbox reporttable'); + $table->set_attribute('class', 'table generaltable reporttable'); $table->sortable(true,'lastname','ASC'); $table->no_sorting('select'); diff --git a/report/progress/index.php b/report/progress/index.php index a92f8d1a401..640d589a2f3 100644 --- a/report/progress/index.php +++ b/report/progress/index.php @@ -288,7 +288,8 @@ if (!$csv) { } print '
'; - print ''; + print '
'; + print ''; // User heading / sort option print '
'; diff --git a/search/templates/index_requests.mustache b/search/templates/index_requests.mustache index fa1ef85140d..cc3274d41bf 100644 --- a/search/templates/index_requests.mustache +++ b/search/templates/index_requests.mustache @@ -58,7 +58,7 @@

{{#str}} queueheading, search, {{total}} {{/str}}

- +
diff --git a/tag/classes/areas_table.php b/tag/classes/areas_table.php index 63484c580f8..484ea384299 100644 --- a/tag/classes/areas_table.php +++ b/tag/classes/areas_table.php @@ -42,7 +42,7 @@ class core_tag_areas_table extends html_table { global $OUTPUT; parent::__construct(); - $this->attributes['class'] = 'generaltable tag-areas-table'; + $this->attributes['class'] = 'table generaltable tag-areas-table'; $this->head = array( get_string('tagareaname', 'core_tag'), diff --git a/tag/classes/collections_table.php b/tag/classes/collections_table.php index 5e6d23e30a6..508f95351c5 100644 --- a/tag/classes/collections_table.php +++ b/tag/classes/collections_table.php @@ -41,7 +41,7 @@ class core_tag_collections_table extends html_table { global $OUTPUT; parent::__construct(); - $this->attributes['class'] = 'generaltable tag-collections-table'; + $this->attributes['class'] = 'table generaltable tag-collections-table'; $this->head = array( get_string('name'), diff --git a/tag/classes/manage_table.php b/tag/classes/manage_table.php index ce636c7510a..55d833b69a5 100644 --- a/tag/classes/manage_table.php +++ b/tag/classes/manage_table.php @@ -93,7 +93,7 @@ class core_tag_manage_table extends table_sql { $this->set_attribute('cellspacing', '0'); $this->set_attribute('id', 'tag-management-list'); - $this->set_attribute('class', 'admintable generaltable tag-management-table'); + $this->set_attribute('class', 'admintable table generaltable tag-management-table'); $totalcount = "SELECT COUNT(tg.id) FROM {tag} tg diff --git a/theme/boost/scss/moodle/admin.scss b/theme/boost/scss/moodle/admin.scss index ee00a8feeff..ddc8e97cf1c 100644 --- a/theme/boost/scss/moodle/admin.scss +++ b/theme/boost/scss/moodle/admin.scss @@ -266,7 +266,7 @@ padding: .15em .5em; } -#trustedhosts .generaltable { +#trustedhosts .table { margin-left: auto; margin-right: auto; width: 500px; diff --git a/theme/boost/scss/moodle/grade.scss b/theme/boost/scss/moodle/grade.scss index 569c3043c19..03e517dc538 100644 --- a/theme/boost/scss/moodle/grade.scss +++ b/theme/boost/scss/moodle/grade.scss @@ -392,7 +392,7 @@ padding-left: 24px; } - &.generaltable { + &.table { tr { &.spacer { @@ -654,7 +654,7 @@ .path-grade-report-user .user-grade { border: none; - &.generaltable { + &.table { .levelodd { background-color: $table-accent-bg; } diff --git a/theme/boost/scss/moodle/modules.scss b/theme/boost/scss/moodle/modules.scss index 93a41be2469..865f8013228 100644 --- a/theme/boost/scss/moodle/modules.scss +++ b/theme/boost/scss/moodle/modules.scss @@ -1028,7 +1028,7 @@ div#dock { align-self: flex-start; } } -.path-mod-lesson .generaltable td { +.path-mod-lesson .table td { vertical-align: middle; label { margin-bottom: 0; diff --git a/theme/boost/scss/moodle/reports.scss b/theme/boost/scss/moodle/reports.scss index 534aac438dd..a97d8741738 100644 --- a/theme/boost/scss/moodle/reports.scss +++ b/theme/boost/scss/moodle/reports.scss @@ -17,7 +17,7 @@ #page-report-outline-index .font-lg { font-size: $font-size-base * 1.1; } -#page-report-outline-index .generaltable tbody { +#page-report-outline-index .table tbody { tr { background-color: $white; } diff --git a/theme/boost/scss/moodle/tables.scss b/theme/boost/scss/moodle/tables.scss index e8627f08dcc..69e70043113 100644 --- a/theme/boost/scss/moodle/tables.scss +++ b/theme/boost/scss/moodle/tables.scss @@ -1,65 +1,19 @@ +/** + * File tables.scss. + * Contains styles for tables. + */ + .generaltable { - width: 100%; - margin-bottom: $spacer; - color: $table-color; - background-color: $table-bg; // Reset for nesting within parents with `background-color`. - - $table-cell-padding: .75rem !default; - $table-cell-padding-sm: .3rem !default; - + border-top: $table-border-width solid $table-border-color; th, td { - padding: $table-cell-padding; - vertical-align: top; + padding: .75rem; border-top: $table-border-width solid $table-border-color; } - - thead th, - thead td { - vertical-align: bottom; - border-bottom: calc(2 * #{$table-border-width}) solid $table-border-color; - } - - tbody + tbody { - border-top: calc(2 * #{$table-border-width}) solid $table-border-color; - } - - &.table-sm { - th, - td { - padding: $table-cell-padding-sm; - } - } - tbody tr { - &:hover { - &.dimmed_text { - a:not(.menu-action) { - color: $table-hover-color; - } - } - td.sticky-column { - background-color: $table-hover-bg; - } - } - } - // Allow table cells to inherit text color and background color from table rows. - tbody { - td, - th { - color: inherit; - background-color: inherit; - } - } } table { - caption { - font-size: 24px; - font-weight: bold; - line-height: 42px; - text-align: left; - caption-side: top; - } + caption-side: top; .sticky-column { position: sticky; left: 0; @@ -67,6 +21,7 @@ table { } } +// Fix loading icon position in dynamic tables. .table-dynamic > .loading-icon { position: absolute; left: calc(50% - 1.5rem); @@ -78,7 +33,36 @@ table { } } +/** + * Custom styles for Bootstrap table classes. + */ + +.table { + border-top: $table-border-width solid $table-border-color; + // Allow table cells to inherit text color and background color from table rows. + tbody { + td, + th { + color: inherit; + background-color: inherit; + } + } + // Fix hover styling for table rows. + tbody tr:hover { + &.dimmed_text, + &.text-muted { + a:not(.menu-action) { + color: $table-hover-color; + } + } + td.sticky-column { + background-color: $table-hover-bg; + } + } +} + .table-responsive { + @include thin-scrolls($gray-100); // Fix dropdown menu position inside responsive tables. .dropdown { position: static !important; /* stylelint-disable-line declaration-no-important */ diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 1b70790e7b2..8fc3ea8f1f9 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -29206,7 +29206,7 @@ img.icon { padding: 0.15em 0.5em; } -#trustedhosts .generaltable { +#trustedhosts .table { margin-left: auto; margin-right: auto; width: 500px; @@ -36105,17 +36105,17 @@ div#dock { align-self: flex-start; } -.path-mod-lesson .generaltable td { +.path-mod-lesson .table td { vertical-align: middle; } -.path-mod-lesson .generaltable td label { +.path-mod-lesson .table td label { margin-bottom: 0; } -.path-mod-lesson .generaltable td .highlight { +.path-mod-lesson .table td .highlight { display: inline-block; margin-left: 0.25rem; } -.path-mod-lesson .generaltable td input[type=checkbox] { +.path-mod-lesson .table td input[type=checkbox] { display: block; } @@ -36801,19 +36801,19 @@ img.userpicture { font-size: 1.03125rem; } -#page-report-outline-index .generaltable tbody tr { +#page-report-outline-index .table tbody tr { background-color: #fff; } -#page-report-outline-index .generaltable tbody tr.section { +#page-report-outline-index .table tbody tr.section { padding-left: 2rem; } -#page-report-outline-index .generaltable tbody tr.section h3, #page-report-outline-index .generaltable tbody tr.section .h3 { +#page-report-outline-index .table tbody tr.section h3, #page-report-outline-index .table tbody tr.section .h3 { font-size: 1.171875rem; } -#page-report-outline-index .generaltable tbody tr.section h4, #page-report-outline-index .generaltable tbody tr.section .h4 { +#page-report-outline-index .table tbody tr.section h4, #page-report-outline-index .table tbody tr.section .h4 { font-size: 1.03125rem; } -#page-report-outline-index .generaltable tbody td.delegated { +#page-report-outline-index .table tbody td.delegated { padding-left: 3.5rem; } @@ -37053,47 +37053,20 @@ img.userpicture { background: #222; } +/** + * File tables.scss. + * Contains styles for tables. + */ .generaltable { - width: 100%; - margin-bottom: 1rem; - color: var(--bs-emphasis-color); - background-color: var(--bs-body-bg); + border-top: var(--bs-border-width) solid var(--bs-border-color); } .generaltable th, .generaltable td { padding: 0.75rem; - vertical-align: top; border-top: var(--bs-border-width) solid var(--bs-border-color); } -.generaltable thead th, -.generaltable thead td { - vertical-align: bottom; - border-bottom: calc(2 * var(--bs-border-width)) solid var(--bs-border-color); -} -.generaltable tbody + tbody { - border-top: calc(2 * var(--bs-border-width)) solid var(--bs-border-color); -} -.generaltable.table-sm th, -.generaltable.table-sm td { - padding: 0.3rem; -} -.generaltable tbody tr:hover.dimmed_text a:not(.menu-action) { - color: var(--bs-emphasis-color); -} -.generaltable tbody tr:hover td.sticky-column { - background-color: rgba(var(--bs-emphasis-color-rgb), 0.075); -} -.generaltable tbody td, -.generaltable tbody th { - color: inherit; - background-color: inherit; -} -table caption { - font-size: 24px; - font-weight: bold; - line-height: 42px; - text-align: left; +table { caption-side: top; } table .sticky-column { @@ -37113,6 +37086,42 @@ table .sticky-column { font-size: 3rem; } +/** + * Custom styles for Bootstrap table classes. + */ +.table { + border-top: var(--bs-border-width) solid var(--bs-border-color); +} +.table tbody td, +.table tbody th { + color: inherit; + background-color: inherit; +} +.table tbody tr:hover.dimmed_text a:not(.menu-action), .table tbody tr:hover.text-muted a:not(.menu-action) { + color: var(--bs-emphasis-color); +} +.table tbody tr:hover td.sticky-column { + background-color: rgba(var(--bs-emphasis-color-rgb), 0.075); +} + +.table-responsive { + scrollbar-width: thin; + scrollbar-color: #6a737b #f8f9fa; +} +.table-responsive::-webkit-scrollbar { + width: 12px; +} +.table-responsive::-webkit-scrollbar-track { + background: #f8f9fa; +} +.table-responsive::-webkit-scrollbar-thumb { + background-color: #6a737b; + border-radius: 20px; + border: 3px solid #f8f9fa; +} +.table-responsive::-webkit-scrollbar-thumb:hover { + background-color: #495057; +} .table-responsive .dropdown { position: static !important; /* stylelint-disable-line declaration-no-important */ } @@ -37760,110 +37769,110 @@ p.arrow_button { font-weight: normal; padding-left: 24px; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.spacer { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.spacer { height: 0.5rem; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr[data-hidden=true] { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr[data-hidden=true] { display: none; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr th { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr th { vertical-align: bottom; border: none; text-align: left; background-color: #f8f9fa; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr th.rowspan { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr th.rowspan { padding: 0; width: 24px; min-width: 24px; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td { min-width: 4.5em; background-color: #f8f9fa; border: none; vertical-align: middle; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-name .small { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td.column-name .small { font-size: 70%; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-name .itemselect { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td.column-name .itemselect { margin-right: 15px; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-weight { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td.column-weight { min-width: 15em; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-weight .weightoverride { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td.column-weight .weightoverride { margin-right: 5px; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-actions .dropdown-toggle::after { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td.column-actions .dropdown-toggle::after { display: none; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.movehere { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td.movehere { padding: 0; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.movehere a.movehere { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td.movehere a.movehere { display: block; width: 100%; margin: 5px 0 5px 0; padding: 3px 0 3px 0; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.movehere a.movehere hr { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td.movehere a.movehere hr { border-top: 2px dashed #8f959e; margin: 0; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.movehere a.movehere:hover hr { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td.movehere a.movehere:hover hr { border-top: 2px dashed #0f6cbf; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.category td { background-color: #fff; border-top: 1px solid #dee2e6; border-bottom: 1px solid #dee2e6; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td:first-child { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.category td:first-child { border-left: 1px solid #dee2e6; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td:last-child { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.category td:last-child { border-right: 1px solid #dee2e6; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.category td.column-name { font-weight: bold; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name div { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.category td.column-name div { display: flex; min-height: 30px; align-items: center; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name div a.toggle-category { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.category td.column-name div a.toggle-category { height: 24px; width: 24px; font-size: 12px; line-height: 24px; margin-right: 3px; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name div a.toggle-category[aria-expanded=true] .expanded, .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name div a.toggle-category[aria-expanded=false] .collapsed { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.category td.column-name div a.toggle-category[aria-expanded=true] .expanded, .path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.category td.column-name div a.toggle-category[aria-expanded=false] .collapsed { display: none; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name div a.toggle-category i { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.category td.column-name div a.toggle-category i { font-size: 12px; width: 12px; height: 12px; color: #1d2125; margin: 0; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.item td { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.item td { background-color: #fff; border-top: 3px solid #f8f9fa; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.item.categoryitem td, .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.item.courseitem td { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.item.categoryitem td, .path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.item.courseitem td { min-width: 4.5em; background-color: #f8f9fa; border: none; vertical-align: middle; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.item.categoryitem td.column-name, .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.item.courseitem td.column-name { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.item.categoryitem td.column-name, .path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.item.courseitem td.column-name { padding-left: 0; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.item.categoryitem td:not(.column-actions), .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.item.courseitem td:not(.column-actions) { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.item.categoryitem td:not(.column-actions), .path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.item.courseitem td:not(.column-actions) { font-weight: bold; } .path-grade-edit-tree .gradetree-wrapper .badge-light { @@ -37938,10 +37947,10 @@ p.arrow_button { .path-grade-report-user .user-grade { border: none; } -.path-grade-report-user .user-grade.generaltable .levelodd { +.path-grade-report-user .user-grade.table .levelodd { background-color: transparent; } -.path-grade-report-user .user-grade.generaltable .leveleven { +.path-grade-report-user .user-grade.table .leveleven { background-color: var(--bs-body-bg); } .path-grade-report-user .user-grade .column-contributiontocoursetotal, diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index f461e1c1d6c..886a942bc73 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -29206,7 +29206,7 @@ img.icon { padding: 0.15em 0.5em; } -#trustedhosts .generaltable { +#trustedhosts .table { margin-left: auto; margin-right: auto; width: 500px; @@ -36105,17 +36105,17 @@ div#dock { align-self: flex-start; } -.path-mod-lesson .generaltable td { +.path-mod-lesson .table td { vertical-align: middle; } -.path-mod-lesson .generaltable td label { +.path-mod-lesson .table td label { margin-bottom: 0; } -.path-mod-lesson .generaltable td .highlight { +.path-mod-lesson .table td .highlight { display: inline-block; margin-left: 0.25rem; } -.path-mod-lesson .generaltable td input[type=checkbox] { +.path-mod-lesson .table td input[type=checkbox] { display: block; } @@ -36801,19 +36801,19 @@ img.userpicture { font-size: 1.03125rem; } -#page-report-outline-index .generaltable tbody tr { +#page-report-outline-index .table tbody tr { background-color: #fff; } -#page-report-outline-index .generaltable tbody tr.section { +#page-report-outline-index .table tbody tr.section { padding-left: 2rem; } -#page-report-outline-index .generaltable tbody tr.section h3, #page-report-outline-index .generaltable tbody tr.section .h3 { +#page-report-outline-index .table tbody tr.section h3, #page-report-outline-index .table tbody tr.section .h3 { font-size: 1.171875rem; } -#page-report-outline-index .generaltable tbody tr.section h4, #page-report-outline-index .generaltable tbody tr.section .h4 { +#page-report-outline-index .table tbody tr.section h4, #page-report-outline-index .table tbody tr.section .h4 { font-size: 1.03125rem; } -#page-report-outline-index .generaltable tbody td.delegated { +#page-report-outline-index .table tbody td.delegated { padding-left: 3.5rem; } @@ -37053,47 +37053,20 @@ img.userpicture { background: #222; } +/** + * File tables.scss. + * Contains styles for tables. + */ .generaltable { - width: 100%; - margin-bottom: 1rem; - color: var(--bs-emphasis-color); - background-color: var(--bs-body-bg); + border-top: var(--bs-border-width) solid var(--bs-border-color); } .generaltable th, .generaltable td { padding: 0.75rem; - vertical-align: top; border-top: var(--bs-border-width) solid var(--bs-border-color); } -.generaltable thead th, -.generaltable thead td { - vertical-align: bottom; - border-bottom: calc(2 * var(--bs-border-width)) solid var(--bs-border-color); -} -.generaltable tbody + tbody { - border-top: calc(2 * var(--bs-border-width)) solid var(--bs-border-color); -} -.generaltable.table-sm th, -.generaltable.table-sm td { - padding: 0.3rem; -} -.generaltable tbody tr:hover.dimmed_text a:not(.menu-action) { - color: var(--bs-emphasis-color); -} -.generaltable tbody tr:hover td.sticky-column { - background-color: rgba(var(--bs-emphasis-color-rgb), 0.075); -} -.generaltable tbody td, -.generaltable tbody th { - color: inherit; - background-color: inherit; -} -table caption { - font-size: 24px; - font-weight: bold; - line-height: 42px; - text-align: left; +table { caption-side: top; } table .sticky-column { @@ -37113,6 +37086,42 @@ table .sticky-column { font-size: 3rem; } +/** + * Custom styles for Bootstrap table classes. + */ +.table { + border-top: var(--bs-border-width) solid var(--bs-border-color); +} +.table tbody td, +.table tbody th { + color: inherit; + background-color: inherit; +} +.table tbody tr:hover.dimmed_text a:not(.menu-action), .table tbody tr:hover.text-muted a:not(.menu-action) { + color: var(--bs-emphasis-color); +} +.table tbody tr:hover td.sticky-column { + background-color: rgba(var(--bs-emphasis-color-rgb), 0.075); +} + +.table-responsive { + scrollbar-width: thin; + scrollbar-color: #6a737b #f8f9fa; +} +.table-responsive::-webkit-scrollbar { + width: 12px; +} +.table-responsive::-webkit-scrollbar-track { + background: #f8f9fa; +} +.table-responsive::-webkit-scrollbar-thumb { + background-color: #6a737b; + border-radius: 20px; + border: 3px solid #f8f9fa; +} +.table-responsive::-webkit-scrollbar-thumb:hover { + background-color: #495057; +} .table-responsive .dropdown { position: static !important; /* stylelint-disable-line declaration-no-important */ } @@ -37760,110 +37769,110 @@ p.arrow_button { font-weight: normal; padding-left: 24px; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.spacer { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.spacer { height: 0.5rem; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr[data-hidden=true] { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr[data-hidden=true] { display: none; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr th { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr th { vertical-align: bottom; border: none; text-align: left; background-color: #f8f9fa; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr th.rowspan { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr th.rowspan { padding: 0; width: 24px; min-width: 24px; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td { min-width: 4.5em; background-color: #f8f9fa; border: none; vertical-align: middle; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-name .small { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td.column-name .small { font-size: 70%; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-name .itemselect { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td.column-name .itemselect { margin-right: 15px; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-weight { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td.column-weight { min-width: 15em; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-weight .weightoverride { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td.column-weight .weightoverride { margin-right: 5px; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-actions .dropdown-toggle::after { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td.column-actions .dropdown-toggle::after { display: none; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.movehere { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td.movehere { padding: 0; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.movehere a.movehere { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td.movehere a.movehere { display: block; width: 100%; margin: 5px 0 5px 0; padding: 3px 0 3px 0; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.movehere a.movehere hr { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td.movehere a.movehere hr { border-top: 2px dashed #8f959e; margin: 0; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.movehere a.movehere:hover hr { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr td.movehere a.movehere:hover hr { border-top: 2px dashed #0f6cbf; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.category td { background-color: #fff; border-top: 1px solid #dee2e6; border-bottom: 1px solid #dee2e6; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td:first-child { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.category td:first-child { border-left: 1px solid #dee2e6; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td:last-child { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.category td:last-child { border-right: 1px solid #dee2e6; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.category td.column-name { font-weight: bold; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name div { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.category td.column-name div { display: flex; min-height: 30px; align-items: center; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name div a.toggle-category { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.category td.column-name div a.toggle-category { height: 24px; width: 24px; font-size: 12px; line-height: 24px; margin-right: 3px; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name div a.toggle-category[aria-expanded=true] .expanded, .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name div a.toggle-category[aria-expanded=false] .collapsed { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.category td.column-name div a.toggle-category[aria-expanded=true] .expanded, .path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.category td.column-name div a.toggle-category[aria-expanded=false] .collapsed { display: none; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name div a.toggle-category i { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.category td.column-name div a.toggle-category i { font-size: 12px; width: 12px; height: 12px; color: #1d2125; margin: 0; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.item td { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.item td { background-color: #fff; border-top: 3px solid #f8f9fa; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.item.categoryitem td, .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.item.courseitem td { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.item.categoryitem td, .path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.item.courseitem td { min-width: 4.5em; background-color: #f8f9fa; border: none; vertical-align: middle; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.item.categoryitem td.column-name, .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.item.courseitem td.column-name { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.item.categoryitem td.column-name, .path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.item.courseitem td.column-name { padding-left: 0; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.item.categoryitem td:not(.column-actions), .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.item.courseitem td:not(.column-actions) { +.path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.item.categoryitem td:not(.column-actions), .path-grade-edit-tree .gradetree-wrapper .setup-grades.table tr.item.courseitem td:not(.column-actions) { font-weight: bold; } .path-grade-edit-tree .gradetree-wrapper .badge-light { @@ -37938,10 +37947,10 @@ p.arrow_button { .path-grade-report-user .user-grade { border: none; } -.path-grade-report-user .user-grade.generaltable .levelodd { +.path-grade-report-user .user-grade.table .levelodd { background-color: transparent; } -.path-grade-report-user .user-grade.generaltable .leveleven { +.path-grade-report-user .user-grade.table .leveleven { background-color: var(--bs-body-bg); } .path-grade-report-user .user-grade .column-contributiontocoursetotal, diff --git a/user/templates/edit_profile_fields.mustache b/user/templates/edit_profile_fields.mustache index 288d3752a8a..5f2a3386202 100644 --- a/user/templates/edit_profile_fields.mustache +++ b/user/templates/edit_profile_fields.mustache @@ -86,7 +86,7 @@ -
{{#str}} context, role {{/str}}
+
{{#hasfields}} diff --git a/webservice/renderer.php b/webservice/renderer.php index f9466b0f8bd..07b3cb9f32c 100644 --- a/webservice/renderer.php +++ b/webservice/renderer.php @@ -41,7 +41,7 @@ class core_webservice_renderer extends plugin_renderer_base { $table = new html_table(); $table->size = array('45%', '10%', '45%'); - $table->attributes['class'] = 'roleassigntable generaltable generalbox boxaligncenter'; + $table->attributes['class'] = 'roleassigntable table generaltable'; $table->summary = ''; $table->cellspacing = 0; $table->cellpadding = 0;