diff --git a/CHANGES.md b/CHANGES.md index 05cac95a29d11d9d41431429c2c87fae5279ca20..60f0f867ebb3cd76b19e6b1dc91728ac203112d6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ Changes ### Unreleased +* 2021-04-14 - Improvement: Improve floating icons in information / hint banners * 2021-04-12 - Improvement: Modify the hint for unrestricted self enrolment in a way that it is more understandable if enrolment end dates are set or not. * 2021-04-11 - Fix Behat test for random login background image * 2021-03-14 - Fix Behat test for unrestricted self enrolment hint diff --git a/classes/output/core_renderer.php b/classes/output/core_renderer.php index 25adac4793c4567ab886d1efa0883db882133f58..0e5654ff9a85b5b4fb8d022e50f0fad274295a0b 100644 --- a/classes/output/core_renderer.php +++ b/classes/output/core_renderer.php @@ -215,7 +215,11 @@ class core_renderer extends \core_renderer { && $this->page->url->compare(new moodle_url('/course/view.php'), URL_MATCH_BASE) && $COURSE->visible == false) { $html .= html_writer::start_tag('div', array('class' => 'course-hidden-infobox alert alert-warning')); - $html .= html_writer::tag('i', null, array('class' => 'fa fa-exclamation-circle fa-3x fa-pull-left')); + $html .= html_writer::start_tag('div', array('class' => 'media')); + $html .= html_writer::start_tag('div', array('class' => 'mr-3 icon-size-5')); + $html .= html_writer::tag('i', null, array('class' => 'fa fa-exclamation-circle fa-3x')); + $html .= html_writer::end_tag('div'); + $html .= html_writer::start_tag('div', array('class' => 'media-body align-self-center')); $html .= get_string('showhintcoursehiddengeneral', 'theme_boost_campus', $COURSE->id); // If the user has the capability to change the course settings, an additional link to the course settings is shown. if (has_capability('moodle/course:update', context_course::instance($COURSE->id))) { @@ -223,6 +227,8 @@ class core_renderer extends \core_renderer { 'theme_boost_campus', array('url' => $CFG->wwwroot.'/course/edit.php?id='. $COURSE->id))); } $html .= html_writer::end_tag('div'); + $html .= html_writer::end_tag('div'); + $html .= html_writer::end_tag('div'); } // MODIFICATION END. @@ -237,11 +243,17 @@ class core_renderer extends \core_renderer { && $this->page->url->compare(new moodle_url('/course/view.php'), URL_MATCH_BASE) && !is_role_switched($COURSE->id)) { $html .= html_writer::start_tag('div', array('class' => 'course-guestaccess-infobox alert alert-warning')); - $html .= html_writer::tag('i', null, array('class' => 'fa fa-exclamation-circle fa-3x fa-pull-left')); + $html .= html_writer::start_tag('div', array('class' => 'media')); + $html .= html_writer::start_tag('div', array('class' => 'mr-3 icon-size-5')); + $html .= html_writer::tag('i', null, array('class' => 'fa fa-exclamation-circle fa-3x')); + $html .= html_writer::end_tag('div'); + $html .= html_writer::start_tag('div', array('class' => 'media-body align-self-center')); $html .= get_string('showhintcourseguestaccessgeneral', 'theme_boost_campus', array('role' => role_get_name(get_guest_role()))); $html .= theme_boost_campus_get_course_guest_access_hint($COURSE->id); $html .= html_writer::end_tag('div'); + $html .= html_writer::end_tag('div'); + $html .= html_writer::end_tag('div'); } // MODIFICATION END. @@ -330,7 +342,11 @@ class core_renderer extends \core_renderer { ($selfenrolmentpossiblecurrently == true || $selfenrolmentpossiblefuture == true)) { // Start hint box. $html .= html_writer::start_tag('div', array('class' => 'course-selfenrol-infobox alert alert-info')); - $html .= html_writer::tag('i', null, array('class' => 'fa fa-sign-in fa-3x fa-pull-left')); + $html .= html_writer::start_tag('div', array('class' => 'media')); + $html .= html_writer::start_tag('div', array('class' => 'mr-3 icon-size-5')); + $html .= html_writer::tag('i', null, array('class' => 'fa fa-sign-in fa-3x')); + $html .= html_writer::end_tag('div'); + $html .= html_writer::start_tag('div', array('class' => 'media-body align-self-center')); // Show the start of the hint depending on the fact if enrolment is already possible currently or // will be in the future. @@ -390,6 +406,8 @@ class core_renderer extends \core_renderer { // End hint box. $html .= html_writer::end_tag('div'); + $html .= html_writer::end_tag('div'); + $html .= html_writer::end_tag('div'); } } // MODIFICATION END. @@ -409,7 +427,11 @@ class core_renderer extends \core_renderer { array('id' => $COURSE->id, 'sesskey' => sesskey(), 'switchrole' => 0, 'returnurl' => $this->page->url->out_as_local_url(false))); $html .= html_writer::start_tag('div', array('class' => 'switched-role-infobox alert alert-info')); - $html .= html_writer::tag('i', null, array('class' => 'fa fa-user-circle fa-3x fa-pull-left')); + $html .= html_writer::start_tag('div', array('class' => 'media')); + $html .= html_writer::start_tag('div', array('class' => 'mr-3 icon-size-5')); + $html .= html_writer::tag('i', null, array('class' => 'fa fa-user-circle fa-3x')); + $html .= html_writer::end_tag('div'); + $html .= html_writer::start_tag('div', array('class' => 'media-body align-self-center')); $html .= html_writer::start_tag('div'); $html .= get_string('switchedroleto', 'theme_boost_campus'); // Give this a span to be able to address via CSS. @@ -421,6 +443,8 @@ class core_renderer extends \core_renderer { array('class' => 'switched-role-backlink', 'href' => $url)); $html .= html_writer::end_tag('div'); // Return to normal role link: end div. $html .= html_writer::end_tag('div'); + $html .= html_writer::end_tag('div'); + $html .= html_writer::end_tag('div'); } } // MODIFICATION END.