Index: lams_central/web/css/components.css =================================================================== diff -u -ref5bed2f62785ca5cdb668d9f1e8fbf4f0256dff -re820169ce662888b003dbe47ef24a48cf19d124c --- lams_central/web/css/components.css (.../components.css) (revision ef5bed2f62785ca5cdb668d9f1e8fbf4f0256dff) +++ lams_central/web/css/components.css (.../components.css) (revision e820169ce662888b003dbe47ef24a48cf19d124c) @@ -429,16 +429,18 @@ overflow: hidden; } -.component-page-wrapper #lesson-name { - font-size: 2rem; - margin-left: 1.8rem; +.component-page-wrapper button.no-decoration { + background-color: inherit; + border: none; } +.component-page-wrapper button.no-decoration:focus { + border: thin solid var(--bs-secondary); +} + .component-page-wrapper .component-page-content > header .sidebar-toggle-button { font-size: 2rem; - margin-top: .3rem; color: var(--bs-blue); - cursor: pointer; } .component-page-wrapper .component-page-content { Index: lams_learning/web/css/components-learner.css =================================================================== diff -u -ref5bed2f62785ca5cdb668d9f1e8fbf4f0256dff -re820169ce662888b003dbe47ef24a48cf19d124c --- lams_learning/web/css/components-learner.css (.../components-learner.css) (revision ef5bed2f62785ca5cdb668d9f1e8fbf4f0256dff) +++ lams_learning/web/css/components-learner.css (.../components-learner.css) (revision e820169ce662888b003dbe47ef24a48cf19d124c) @@ -1,3 +1,7 @@ +.component-page-wrapper #lesson-name { + margin-left: 1rem; +} + .component-page-wrapper .component-sidebar { top: 6rem; left: -72rem; @@ -15,7 +19,6 @@ font-size: 1.5rem; align-self: end; color: var(--bs-primary); - cursor: pointer; } .component-page-wrapper .component-sidebar #progress-bar-items { Index: lams_learning/web/includes/javascript/learnerPage.js =================================================================== diff -u -r966fe6dea3c644eaf336f305c960861b7e62fd73 -re820169ce662888b003dbe47ef24a48cf19d124c --- lams_learning/web/includes/javascript/learnerPage.js (.../learnerPage.js) (revision 966fe6dea3c644eaf336f305c960861b7e62fd73) +++ lams_learning/web/includes/javascript/learnerPage.js (.../learnerPage.js) (revision e820169ce662888b003dbe47ef24a48cf19d124c) @@ -1,6 +1,14 @@ // refresh progress bar on first/next activity load function initLearnerPage(toolSessionId, userId) { + $('.component-page-wrapper .sidebar-toggle-button').click(function () { + let topToggleButton = $('.component-page-wrapper .component-page-content > header .sidebar-toggle-button'), + isExpanded = topToggleButton.attr('aria-expanded') == 'true'; + topToggleButton.attr('aria-expanded', !isExpanded) + .children('i').toggleClass(topToggleButton.data('closed-class')).toggleClass(topToggleButton.data('opened-class')); + $('.component-page-wrapper .component-sidebar').toggleClass('active').attr('aria-expanded', !isExpanded); + }); + $.ajax({ url : LAMS_URL + 'learning/learner/getLearnerProgress.do', data : { @@ -15,20 +23,24 @@ for (var activityIndex = 0; activityIndex < result.activities.length; activityIndex++) { let activityData = result.activities[activityIndex], - activityItem = $('
  • ').text(activityData.name).appendTo(progressBarItems); + activityItem = $('
  • ').attr('role', 'navigation menubaritem').appendTo(progressBarItems); if (activityData.status === 0) { - activityItem.addClass('progress-bar-item-current') + activityItem.addClass('progress-bar-item-current').text(activityData.name) .prepend(''); } else if (activityData.status === 1) { activityItem.addClass('progress-bar-item-complete') - .prepend(''); + .prepend('') if (activityData.url) { - activityItem.addClass('progress-bar-item-openable').click(function () { - window.open(activityData.url, "_blank"); + let activityLink = $('').text(activityData.name).attr({ + 'target' : '_blank', + 'href' : activityData.url, + 'role' : 'navigation', + 'title' : 'Open completed activty "' + activityData.url + '"' }); + activityItem.addClass('progress-bar-item-openable').append(activityLink); } } else { - activityItem.addClass('progress-bar-item-incomplete') + activityItem.addClass('progress-bar-item-incomplete').text(activityData.name) .prepend(''); } } Index: lams_monitoring/web/css/components-monitoring.css =================================================================== diff -u -ref5bed2f62785ca5cdb668d9f1e8fbf4f0256dff -re820169ce662888b003dbe47ef24a48cf19d124c --- lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision ef5bed2f62785ca5cdb668d9f1e8fbf4f0256dff) +++ lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision e820169ce662888b003dbe47ef24a48cf19d124c) @@ -48,6 +48,10 @@ width: calc(100% - 12px); } +.component-page-wrapper #lesson-name { + margin-left: 1.8rem; +} + body.component #sequenceInfoDialog { cursor: pointer; } Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -re820169ce662888b003dbe47ef24a48cf19d124c --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 72bf0041a18e7e902404c65e55e167bf6ff84269) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision e820169ce662888b003dbe47ef24a48cf19d124c) @@ -594,7 +594,7 @@
    -

    +

    Index: lams_tool_nb/web/learnerContent.jsp =================================================================== diff -u -ref5bed2f62785ca5cdb668d9f1e8fbf4f0256dff -re820169ce662888b003dbe47ef24a48cf19d124c --- lams_tool_nb/web/learnerContent.jsp (.../learnerContent.jsp) (revision ef5bed2f62785ca5cdb668d9f1e8fbf4f0256dff) +++ lams_tool_nb/web/learnerContent.jsp (.../learnerContent.jsp) (revision e820169ce662888b003dbe47ef24a48cf19d124c) @@ -3,86 +3,87 @@ <%@ include file="/includes/taglibs.jsp"%> - + function submitForm(methodName) { + var f = document.getElementById('nbLearnerForm'); + f.action = methodName + ".do"; + f.submit(); + } + - +

    + +

    + + + - - - + +
    +
    +

    + +

    +

    + + + + + + + + +

    +
    +
    - -
    -
    -

    - -

    -

    - - - - - - - - -

    -
    -
    +
    -
    + +
    + +
    - -
    - -
    + +
    + + + + + + + + +
    - -
    - - - - - - - - -
    +
    -
    - -
    +
    \ No newline at end of file