Skip to content

LearnR - Fix Bootstrap 5 compatibility issues #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jlhollowell wants to merge 1 commit into
base: main
Choose a base branch
from
Open

LearnR - Fix Bootstrap 5 compatibility issues #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion classes/output/core_renderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
use moodle_url;
//Begin DBN Update
use custom_menu;
use help_icon; // Added for help button feature
use pix_icon; // Added for help button feature
use stdClass;
use theme_config;
//End DBN Update
Expand Down Expand Up @@ -379,7 +381,8 @@ public function fpicons() {
$createbuttonurl = (empty($this->page->theme->settings->createbuttonurl)) ? false : $this->page->theme->settings->createbuttonurl;
$createbuttontext = (empty($this->page->theme->settings->createbuttontext)) ? false : format_string($this->page->theme->settings->createbuttontext);
$hasslideicon = (empty($this->page->theme->settings->slideicon && isloggedin() && !isguestuser())) ? false : $this->page->theme->settings->slideicon;
$slideiconbuttonurl = 'data-toggle="collapse" data-target="#collapseExample';
//$slideiconbuttonurl = 'data-toggle="collapse" data-target="#collapseExample';
$slideiconbuttonurl = '';
$slideiconbuttontext = (empty($this->page->theme->settings->slideiconbuttontext)) ? false : format_string($this->page->theme->settings->slideiconbuttontext);
$hasnav1icon = (empty($this->page->theme->settings->nav1icon && isloggedin() && !isguestuser())) ? false : $this->page->theme->settings->nav1icon;
$hasnav2icon = (empty($this->page->theme->settings->nav2icon && isloggedin() && !isguestuser())) ? false : $this->page->theme->settings->nav2icon;
Expand Down
24 changes: 12 additions & 12 deletions templates/core/full_header.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
{{{navbar}}}
</div>
{{/hasnavbar}}
<div class="ml-auto d-flex">
<div class="ms-auto d-flex">
{{{pageheadingbutton}}}
</div>
<div id="course-header">
Expand All @@ -65,9 +65,9 @@
{{#welcomemessage}}
<div class="d-flex">
{{> core/welcome }}
<div class="header-actions-container ml-auto" data-region="header-actions-container">
<div class="header-actions-container ms-auto" data-region="header-actions-container">
{{#headeractions}}
<div class="header-action ml-2">{{{.}}}</div>
<div class="header-action ms-2">{{{.}}}</div>
{{/headeractions}}
</div>
</div>
Expand All @@ -76,13 +76,13 @@
{{^courseheaderimageurl}}
<div class="d-flex">
{{#contextheader}}
<div class="mr-auto">
<div class="me-auto">
{{{contextheader}}}
</div>
{{/contextheader}}
<div class="header-actions-container ml-auto" data-region="header-actions-container">
<div class="header-actions-container ms-auto" data-region="header-actions-container">
{{#headeractions}}
<div class="header-action ml-2">{{{.}}}</div>
<div class="header-action ms-2">{{{.}}}</div>
{{/headeractions}}
</div>
</div>
Expand All @@ -91,13 +91,13 @@
{{#courseheaderimagelayoutheadingabove}}
<div class="d-flex">
{{#contextheader}}
<div class="mr-auto">
<div class="me-auto">
{{{contextheader}}}
</div>
{{/contextheader}}
<div class="header-actions-container ml-auto" data-region="header-actions-container">
<div class="header-actions-container ms-auto" data-region="header-actions-container">
{{#headeractions}}
<div class="header-action ml-2">{{{.}}}</div>
<div class="header-action ms-2">{{{.}}}</div>
{{/headeractions}}
</div>
</div>
Expand All @@ -114,13 +114,13 @@
{{#courseheaderimageposition}}background-position: {{{.}}};{{/courseheaderimageposition}}">
<div class="d-flex">
{{#contextheader}}
<div class="mr-auto">
<div class="me-auto">
{{{contextheader}}}
</div>
{{/contextheader}}
<div class="header-actions-container ml-auto" data-region="header-actions-container">
<div class="header-actions-container ms-auto" data-region="header-actions-container">
{{#headeractions}}
<div class="header-action ml-2">{{{.}}}</div>
<div class="header-action ms-2">{{{.}}}</div>
{{/headeractions}}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/coursemanagement.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{#hascoursemanagement}}
{{#showincourseonly}}
<div class="collapse" id="blockslider" class="slidingblockpanel">
<div id="blockslider" class="collapse slidingblockpanel">
<div class="fp-coursemanagement w-100">

<div class="container-fluid w-100">
Expand Down
10 changes: 5 additions & 5 deletions templates/fpicons.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{{#hasfpiconnav}}
<div class="fpstartwrap text-left">
<div class="fpstartwrap text-start">
<div class="fpstart">
<div class="iconset">
{{#fpiconnav}}
{{#hasicon}}
<div class="d-inline-flex fs-4 ">
<a class="iconbtn mr-3 ml-2" href = {{{link}}} title = "{{{linktext}}}" alt="{{{linktext}}}" target="{{linktarget}}">
<a class="iconbtn me-3 ms-2" href = {{{link}}} title ="{{{linktext}}}" target="{{linktarget}}">
<i class="fa fa-1x fa-{{{linkicon}}}"></i> {{{linktext}}}
</a>
</div>
Expand All @@ -14,7 +14,7 @@
{{#fpslideicon}}
{{#hasicon}}
<div class="d-inline-flex fs-4">
<a role="iconbtn" class="iconbtn mr-3 ml-2" data-toggle="collapse" href="#fpslider" aria-expanded="false" aria-controls="fpslider" title = "{{{linktext}}}" alt="{{{linktext}}}">
<a role="button" class="iconbtn me-3 ms-2" data-bs-toggle="collapse" href="#fpslider" aria-expanded="false" aria-controls="fpslider" title ="{{{linktext}}}">
<i class="fa fa-1x fa-{{{linkicon}}}"></i> {{{linktext}}}
</a>
</div>
Expand All @@ -23,7 +23,7 @@
{{#fpcreateicon}}
{{#hasicon}}
<div class="d-inline-flex fs-4">
<a class="iconbtn mr-3 ml-2" href = {{{link}}} title = "{{{linktext}}}" alt="{{{linktext}}}" target="{{linktarget}}">
<a class="iconbtn me-3 ms-2" href = {{{link}}} title ="{{{linktext}}}" target="{{linktarget}}">
<i class="fa fa-1x fa-{{{linkicon}}}"></i> {{{linktext}}}
</a>
</div>
Expand All @@ -32,7 +32,7 @@
</div>
</div>
{{#hasslidetextbox}}
<div id="fpslider" class="collapse text-left" style="padding:1rem;">
<div id="fpslider" class="collapse text-start" style="padding:1rem;">
{{{slidetextbox}}}
</div>
{{/hasslidetextbox}}
Expand Down
6 changes: 3 additions & 3 deletions templates/headerbuttons.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<div class="headerbuttons">
{{#showincourseonlymanagementbtn}}
<div class="text-right blockpanelbtn">
<button id="blocksliderbutton" class="btn btn-secondary headerbutton blockpanelbutton" type="button" data-toggle="collapse" data-target="#blockslider" aria-expanded="false" aria-controls="blockslider">
<button id="blocksliderbutton" class="btn btn-secondary headerbutton blockpanelbutton" type="button" data-bs-toggle="collapse" data-bs-target="#blockslider" aria-expanded="false" aria-controls="blockslider">
<i class="fa fa-arrows-v" aria-hidden="true"> </i> <span class="blockbtntext d-none d-sm-inline-block">{{# str }} courseblockpanelbtn, theme_learnr {{/ str }}</span>
</button>
</div>
Expand All @@ -58,7 +58,7 @@

{{#hascourseactivities}}
<div class="courseactivites">
<a href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-tooltip="tooltip" data-placement= "right" title="{{{courseactivitiesbtntext}}}" class="btn btn-secondary headerbutton courseactivities" style="float:right;"><i class="fa-1x fa fa-list-alt courseactivities"></i></a>
<a href="#" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-tooltip="tooltip" data-placement= "right" title="{{{courseactivitiesbtntext}}}" class="btn btn-secondary headerbutton courseactivities" style="float:right;"><i class="fa-1x fa fa-list-alt courseactivities"></i></a>
<div class="dropdown-menu dropdown-menu-right iconsidebar">
<h5>{{{courseactivitiesbtntext}}}</h5>
{{{courseactivitiesmenu}}}
Expand All @@ -68,7 +68,7 @@

{{#hasmycourses}}
<div class="mycourses">
<a href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-tooltip="tooltip" data-placement= "right" title="{{{mycourses}}}" class="btn btn-secondary headerbutton mycourses" style="float:right;"><i class="fa-1x fa fa-history mycourses"></i></a>
<a href="#" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-tooltip="tooltip" data-placement= "right" title="{{{mycourses}}}" class="btn btn-secondary headerbutton mycourses" style="float:right;"><i class="fa-1x fa fa-history mycourses"></i></a>
<div class="dropdown-menu dropdown-menu-right iconsidebar">
<h5>{{{mycourses}}}</h5>
{{{mycoursesmenu}}}
Expand Down
Loading