From 6b5f575ca073978527d6361e59ad2513ea972264 Mon Sep 17 00:00:00 2001 From: Alexander Bias Date: Wed, 21 Aug 2024 11:15:21 +0200 Subject: [PATCH] Upgrade: Update Bootstrap classes for Moodle 4.4. --- CHANGES.md | 1 + settings_pagelist.php | 28 ++++++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 77b4dcb..3f9e467 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ Changes ### Unreleased +* 2024-08-20 - Upgrade: Update Bootstrap classes for Moodle 4.4. * 2024-08-20 - Prepare compatibility for Moodle 4.4. ### v4.3-r2 diff --git a/settings_pagelist.php b/settings_pagelist.php index afec5d6..e1a4d37 100644 --- a/settings_pagelist.php +++ b/settings_pagelist.php @@ -111,18 +111,20 @@ $statusbadgevariant = strtr( $pageurlstandardavailable, [ - STATICPAGE_CHECKAVAILABILITY_RESPONSE_SUCCESS => 'badge-success', - STATICPAGE_CHECKAVAILABILITY_RESPONSE_FAIL => 'badge-danger', - STATICPAGE_CHECKAVAILABILITY_RESPONSE_ERROR => 'badge-danger', - STATICPAGE_CHECKAVAILABILITY_RESPONSE_DISABLED => 'badge-info', + STATICPAGE_CHECKAVAILABILITY_RESPONSE_SUCCESS => 'bg-success text-light', + STATICPAGE_CHECKAVAILABILITY_RESPONSE_FAIL => 'bg-danger text-light', + STATICPAGE_CHECKAVAILABILITY_RESPONSE_ERROR => 'bg-danger text-light', + STATICPAGE_CHECKAVAILABILITY_RESPONSE_DISABLED => 'bg-info text-dark', ] ); $html .= html_writer::tag('p', get_string('settingspagelistentrystandard'.$pageurlstandardavailable, 'local_staticpage', - html_writer::link($pageurlstandard, html_writer::tag('span', get_string('checkavailabilityresponse'.$pageurlstandardavailable, 'local_staticpage'), - ['class' => 'badge '.$statusbadgevariant]).' '.$pageurlstandard))); + ['class' => 'badge mr-2 '.$statusbadgevariant]). + html_writer::link($pageurlstandard, $pageurlstandard) + ) + ); } // Print rewritten static page URL. @@ -134,18 +136,20 @@ $statusbadgevariant = strtr( $pageurlrewriteavailable, [ - STATICPAGE_CHECKAVAILABILITY_RESPONSE_SUCCESS => 'badge-success', - STATICPAGE_CHECKAVAILABILITY_RESPONSE_FAIL => 'badge-warning', - STATICPAGE_CHECKAVAILABILITY_RESPONSE_ERROR => 'badge-warning', - STATICPAGE_CHECKAVAILABILITY_RESPONSE_DISABLED => 'badge-info', + STATICPAGE_CHECKAVAILABILITY_RESPONSE_SUCCESS => 'bg-success text-light', + STATICPAGE_CHECKAVAILABILITY_RESPONSE_FAIL => 'bg-warning text-dark', + STATICPAGE_CHECKAVAILABILITY_RESPONSE_ERROR => 'bg-warning text-dark', + STATICPAGE_CHECKAVAILABILITY_RESPONSE_DISABLED => 'bg-info text-dark', ] ); $html .= html_writer::tag('p', get_string('settingspagelistentryrewrite'.$pageurlrewriteavailable, 'local_staticpage', - html_writer::link($pageurlrewrite, html_writer::tag('span', get_string('checkavailabilityresponse'.$pageurlrewriteavailable, 'local_staticpage'), - ['class' => 'badge '.$statusbadgevariant]).' '.$pageurlrewrite))); + ['class' => 'badge mr-2 '.$statusbadgevariant]). + html_writer::link($pageurlrewrite, $pageurlrewrite) + ) + ); // Finish page list entry. $html .= html_writer::end_tag('li');