Index: lams_learning/web/includes/javascript/learnerPage.js
===================================================================
diff -u -r3e5f23228af144f86f91a0dd45d342702d22c22d -r9f3a96b9d3fb0e80b3b181c6ec62a1f2e000decc
--- lams_learning/web/includes/javascript/learnerPage.js (.../learnerPage.js) (revision 3e5f23228af144f86f91a0dd45d342702d22c22d)
+++ lams_learning/web/includes/javascript/learnerPage.js (.../learnerPage.js) (revision 9f3a96b9d3fb0e80b3b181c6ec62a1f2e000decc)
@@ -1,10 +1,5 @@
// refresh progress bar on first/next activity load
function initLearnerPage(toolSessionId, userId) {
- $('.component-page-wrapper .sidebar-toggle-button').click(function (event) {
- event.stopPropagation();
- toggleProgressBar();
- });
-
$.ajax({
url: LAMS_URL + 'learning/learner/getLearnerProgress.do',
data: {
@@ -18,11 +13,11 @@
// draw support activities if they exist
if (result.support) {
- let supportBarItems = $('.component-page-wrapper .component-sidebar #support-bar').removeClass('d-none')
+ let supportBarItems = $('.component-page-wrapper .offcanvas #offcanvas-support-bar').removeClass('d-none')
.find('#support-bar-items').empty();
$.each(result.support, function (activityIndex, activityData) {
- let activityItem = $('
').attr('role', 'presentation')
- .addClass('support-bar-item progress-bar-item-openable')
+ let activityItem = $('')
+ .addClass('list-group-item list-group-item-action progress-bar-item-openable')
.prepend('').appendTo(supportBarItems);
let activityLink = $('').text(activityData.name).attr({
'target': '_blank',
@@ -34,15 +29,17 @@
});
}
- let progressBarItems = $('.component-page-wrapper .component-sidebar #progress-bar-items').empty(),
+ let progressBarItems = $('.component-page-wrapper .offcanvas #progress-bar-items').empty(),
completedActivityCount = 0;
$.each(result.activities, function (activityIndex, activityData) {
- let activityItem = $('').attr('role', 'presentation').appendTo(progressBarItems),
+ let activityItem = $('')
+ .addClass('list-group-item list-group-item-action')
+ .appendTo(progressBarItems),
activityName = !activityData.name && activityData.type === 'g' ? 'Gate' : activityData.name,
- activityIcon = $('');
+ activityIcon = $('');
if (activityData.status === 0) {
- activityItem.addClass('progress-bar-item-current').text(activityName).prepend(activityIcon);
+ activityItem.addClass('active').text(activityName).prepend(activityIcon);
if (activityData.type === 'g') {
activityIcon.addClass('fa-hourglass-half');
} else {
@@ -186,9 +183,10 @@
function toggleProgressBar(forceClose) {
let pageContent = $('.component-page-wrapper .component-page-content'),
- progressBar = $('.component-page-wrapper .component-sidebar'),
- topToggleButton = $('header .sidebar-toggle-button', pageContent),
+ progressBar = $('.component-page-wrapper .offcanvas'),
+ topToggleButton = $('header #hamb', pageContent),
isExpanded = forceClose || topToggleButton.attr('aria-expanded') == 'true';
+
topToggleButton.attr('aria-expanded', !isExpanded)
.children('i').toggleClass(topToggleButton.data('closed-class')).toggleClass(topToggleButton.data('opened-class'));
progressBar.toggleClass('active').attr('aria-expanded', !isExpanded);
@@ -201,7 +199,7 @@
} else {
pageContent.attr('inert', '');
progressBar.removeAttr('inert');
- $('.sidebar-toggle-button', progressBar).focus();
+ $('.btn-close', progressBar).focus();
$('body').on('keyup', function (event) {
if (event.key === "Escape") {