L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-84892 theme_boost: re-use native alerts on environment page table.

Browse Source
This commit is contained in:
Paul Holden
2025-03-16 19:48:17 +00:00
parent 8f89677192
commit fe8dbab58f
4 changed files with 24 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/renderer.php
+6 -5
View File
@@ -2177,29 +2177,30 @@ class core_admin_renderer extends plugin_renderer_base {
} else {
$report = $this->doc_link(join('/', $linkparts), get_string($stringtouse, 'admin', $rec), true);
}
// Enclose report text in div so feedback text will be displayed underneath it.
$report = html_writer::div($report);
// Format error or warning line
if ($errorline) {
$messagetype = 'error';
$statusclass = 'bg-danger text-white';
$feedbackclass = 'alert-danger';
} else if ($warningline) {
$messagetype = 'warn';
$statusclass = 'bg-warning text-dark';
$feedbackclass = 'alert-warning';
} else {
$messagetype = 'ok';
$statusclass = 'bg-success text-white';
$feedbackclass = 'alert-success';
}
$status = html_writer::span($status, 'badge ' . $statusclass);
// Here we'll store all the feedback found
$feedbacktext = '';
// Append the feedback if there is some
$feedbacktext .= $environment_result->strToReport($environment_result->getFeedbackStr(), $messagetype);
$feedbacktext .= $environment_result->strToReport($environment_result->getFeedbackStr(), "alert {$feedbackclass}");
//Append the bypass if there is some
$feedbacktext .= $environment_result->strToReport($environment_result->getBypassStr(), 'warn');
$feedbacktext .= $environment_result->strToReport($environment_result->getBypassStr(), 'alert alert-warning');
//Append the restrict if there is some
$feedbacktext .= $environment_result->strToReport($environment_result->getRestrictStr(), 'error');
$feedbacktext .= $environment_result->strToReport($environment_result->getRestrictStr(), 'alert alert-danger');
$report .= $feedbacktext;
theme/boost/scss/moodle/admin.scss
-14
View File
@@ -14,20 +14,6 @@
text-align: left;
}
.environmenttable {
.warn {
@extend .alert-warning;
}
.error {
@extend .alert-danger;
}
.ok {
@extend .alert-success;
}
}
.path-admin .admintable.environmenttable .name,
.path-admin .admintable.environmenttable .info,
.path-admin #assignrole .admintable .role,
theme/boost/style/moodle.css
+9 -9
View File
@@ -18152,7 +18152,7 @@ textarea.form-control-lg {
--bs-alert-link-color: var(--bs-secondary-text-emphasis);
}
.alert-success, .environmenttable .ok {
.alert-success {
--bs-alert-color: var(--bs-success-text-emphasis);
--bs-alert-bg: var(--bs-success-bg-subtle);
--bs-alert-border-color: var(--bs-success-border-subtle);
@@ -18166,14 +18166,14 @@ textarea.form-control-lg {
--bs-alert-link-color: var(--bs-info-text-emphasis);
}
.alert-warning, .environmenttable .warn {
.alert-warning {
--bs-alert-color: var(--bs-warning-text-emphasis);
--bs-alert-bg: var(--bs-warning-bg-subtle);
--bs-alert-border-color: var(--bs-warning-border-subtle);
--bs-alert-link-color: var(--bs-warning-text-emphasis);
}
.alert-danger, .environmenttable .error {
.alert-danger {
--bs-alert-color: var(--bs-danger-text-emphasis);
--bs-alert-bg: var(--bs-danger-bg-subtle);
--bs-alert-border-color: var(--bs-danger-border-subtle);
@@ -28100,10 +28100,10 @@ input[disabled] {
opacity: 0.6;
}
.alert-success a, .environmenttable .ok a {
.alert-success a {
color: #10250f;
}
.alert-success .btn-close, .environmenttable .ok .btn-close {
.alert-success .btn-close {
color: #000100;
opacity: 0.6;
}
@@ -28116,18 +28116,18 @@ input[disabled] {
opacity: 0.6;
}
.alert-warning a, .environmenttable .warn a {
.alert-warning a {
color: #6a4c22;
}
.alert-warning .btn-close, .environmenttable .warn .btn-close {
.alert-warning .btn-close {
color: #433016;
opacity: 0.6;
}
.alert-danger a, .environmenttable .error a {
.alert-danger a {
color: #4d120c;
}
.alert-danger .btn-close, .environmenttable .error .btn-close {
.alert-danger .btn-close {
color: #210805;
opacity: 0.6;
}
theme/classic/style/moodle.css
+9 -9
View File
@@ -18152,7 +18152,7 @@ textarea.form-control-lg {
--bs-alert-link-color: var(--bs-secondary-text-emphasis);
}
.alert-success, .environmenttable .ok {
.alert-success {
--bs-alert-color: var(--bs-success-text-emphasis);
--bs-alert-bg: var(--bs-success-bg-subtle);
--bs-alert-border-color: var(--bs-success-border-subtle);
@@ -18166,14 +18166,14 @@ textarea.form-control-lg {
--bs-alert-link-color: var(--bs-info-text-emphasis);
}
.alert-warning, .environmenttable .warn {
.alert-warning {
--bs-alert-color: var(--bs-warning-text-emphasis);
--bs-alert-bg: var(--bs-warning-bg-subtle);
--bs-alert-border-color: var(--bs-warning-border-subtle);
--bs-alert-link-color: var(--bs-warning-text-emphasis);
}
.alert-danger, .environmenttable .error {
.alert-danger {
--bs-alert-color: var(--bs-danger-text-emphasis);
--bs-alert-bg: var(--bs-danger-bg-subtle);
--bs-alert-border-color: var(--bs-danger-border-subtle);
@@ -28100,10 +28100,10 @@ input[disabled] {
opacity: 0.6;
}
.alert-success a, .environmenttable .ok a {
.alert-success a {
color: #10250f;
}
.alert-success .btn-close, .environmenttable .ok .btn-close {
.alert-success .btn-close {
color: #000100;
opacity: 0.6;
}
@@ -28116,18 +28116,18 @@ input[disabled] {
opacity: 0.6;
}
.alert-warning a, .environmenttable .warn a {
.alert-warning a {
color: #6a4c22;
}
.alert-warning .btn-close, .environmenttable .warn .btn-close {
.alert-warning .btn-close {
color: #433016;
opacity: 0.6;
}
.alert-danger a, .environmenttable .error a {
.alert-danger a {
color: #4d120c;
}
.alert-danger .btn-close, .environmenttable .error .btn-close {
.alert-danger .btn-close {
color: #210805;
opacity: 0.6;
}