Index: lams_central/web/css/components.css =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 --- lams_central/web/css/components.css (.../components.css) (revision 72bf0041a18e7e902404c65e55e167bf6ff84269) +++ lams_central/web/css/components.css (.../components.css) (revision 1f6e357f9932435e8c97e005196baa2f23909191) @@ -434,7 +434,7 @@ margin-left: 1.8rem; } -.component-page-wrapper #sidebar-opener-button { +.component-page-wrapper .component-page-content > header .sidebar-toggle-button { font-size: 2rem; margin-top: .3rem; color: var(--bs-blue); @@ -451,24 +451,16 @@ .component-page-wrapper .component-sidebar { position: absolute; height: initial; - width: 7rem; - padding: 0.7rem 1.7rem 2rem 1.7rem; - border-radius: 0 0 1.2rem 1.2rem; background-color: var(--bs-white); text-align: center; display: flex; align-items: center; flex-direction: column; transition: all .3s ease; - transform: translateX(-7rem); z-index: 1; - + padding: 0.7rem 1.7rem 2rem 1.7rem; } -.component-page-wrapper .component-sidebar.active { - transform: translateX(0); -} - .component-page-wrapper .component-sidebar .lams-logo { width: 3.6rem; margin-bottom: 1.2rem; Index: lams_learning/.gitignore =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1f6e357f9932435e8c97e005196baa2f23909191 --- lams_learning/.gitignore (.../.gitignore) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_learning/.gitignore (.../.gitignore) (revision 1f6e357f9932435e8c97e005196baa2f23909191) @@ -1,4 +1,5 @@ /bin/ /build/ /.sass-cache/ -/web/css/*.css +/web/css/kumalive.css +/web/css/presence.css \ No newline at end of file Index: lams_learning/web/css/components-learner.css =================================================================== diff -u --- lams_learning/web/css/components-learner.css (revision 0) +++ lams_learning/web/css/components-learner.css (revision 1f6e357f9932435e8c97e005196baa2f23909191) @@ -0,0 +1,61 @@ +.component-page-wrapper .component-sidebar { + top: 6rem; + left: -72rem; + max-width: 70rem; + border-radius: 1.2rem; + border: thin solid var(--bs-gray-200); + box-shadow: 0 0 3px rgba(0, 0, 0, .05); +} + +.component-page-wrapper .component-sidebar.active { + left: 1rem; +} + +.component-page-wrapper .component-sidebar .sidebar-toggle-button { + font-size: 1.5rem; + align-self: end; + color: var(--bs-primary); + cursor: pointer; +} + +.component-page-wrapper .component-sidebar #progress-bar-items { + background-color: var(--lams-background-gray); + padding: .5rem; + margin-bottom: 0; + border-radius: 1.2rem; + list-style: none; + text-align: left; +} + +.component-page-wrapper .component-sidebar #progress-bar-items > li { + padding: .5rem 2rem; + border-radius: 1.2rem; + color: var(--bs-secondary); +} + +.component-page-wrapper .component-sidebar #progress-bar-items > li.progress-bar-item-openable { + cursor: pointer; +} + +.component-page-wrapper .component-sidebar #progress-bar-items > li > .progress-bar-icon { + margin-right: .5rem; +} + +.component-page-wrapper .component-sidebar #progress-bar-items > li.progress-bar-item-complete, +.component-page-wrapper .component-sidebar #progress-bar-items > li.progress-bar-item-complete > .progress-bar-icon { + color: var(--bs-green); +} + +.component-page-wrapper .component-sidebar #progress-bar-items > li.progress-bar-item-current, +.component-page-wrapper .component-sidebar #progress-bar-items > li.progress-bar-item-current > .progress-bar-icon { + color: var(--bs-black); +} + +.component-page-wrapper .component-sidebar #progress-bar-items > li:hover { + background-color: var(--bs-white); +} + +.component-page-wrapper .activity-bottom-buttons { + display: flex; + flex-direction: row-reverse; +} \ No newline at end of file Index: lams_learning/web/includes/javascript/learnerPage.js =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 --- lams_learning/web/includes/javascript/learnerPage.js (.../learnerPage.js) (revision 72bf0041a18e7e902404c65e55e167bf6ff84269) +++ lams_learning/web/includes/javascript/learnerPage.js (.../learnerPage.js) (revision 1f6e357f9932435e8c97e005196baa2f23909191) @@ -10,7 +10,36 @@ cache : false, dataType : 'json', success : function(result){ - $('#lesson-name').text(result.lessonName); + $('.component-page-wrapper .component-page-content #lesson-name').text(result.lessonName); + let progressBarItems = $('.component-page-wrapper .component-sidebar #progress-bar-items').empty(); + + for (var activityIndex = 0; activityIndex < result.activities.length; activityIndex++) { + let activityData = result.activities[activityIndex], + activityItem = $('
  • ').text(activityData.name).appendTo(progressBarItems); + if (activityData.status === 0) { + activityItem.addClass('progress-bar-item-current') + .prepend(''); + } else if (activityData.status === 1) { + activityItem.addClass('progress-bar-item-complete') + .prepend(''); + if (activityData.url) { + activityItem.addClass('progress-bar-item-openable').click(function () { + window.open(activityData.url, "_blank"); + }); + } + } else { + activityItem.addClass('progress-bar-item-incomplete') + .prepend(''); + } + } } }); +} + +function nextActivity(){ + let contentFrame = $('#learner-page-content-frame'); + contentFrame.on('load', function (){ + location.href = contentFrame[0].contentDocument.URL; + }); + contentFrame[0].contentWindow.submitForm('finish'); } \ No newline at end of file Index: lams_monitoring/web/css/components-monitoring.css =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 --- lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision 72bf0041a18e7e902404c65e55e167bf6ff84269) +++ lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision 1f6e357f9932435e8c97e005196baa2f23909191) @@ -70,6 +70,16 @@ display: none; } +.component-page-wrapper .component-sidebar { + width: 7rem; + border-radius: 0 0 1.2rem 1.2rem; + transform: translateX(-7rem); +} + +.component-page-wrapper .component-sidebar.active { + transform: translateX(0); +} + .monitoring-page-wrapper .component-sidebar.active.expanded { width: 25rem; } Index: lams_tool_nb/web/WEB-INF/tags/PageLearner.tag =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 --- lams_tool_nb/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision 72bf0041a18e7e902404c65e55e167bf6ff84269) +++ lams_tool_nb/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision 1f6e357f9932435e8c97e005196baa2f23909191) @@ -11,6 +11,7 @@ + @@ -20,6 +21,12 @@ var LAMS_URL = ''; $(document).ready(function (){ initLearnerPage(${toolSessionID}); + + $('.component-page-wrapper .sidebar-toggle-button').click(function () { + let topToggleButton = $('.component-page-wrapper .component-page-content > header .sidebar-toggle-button'); + topToggleButton.toggleClass(topToggleButton.data('closed-class')).toggleClass(topToggleButton.data('opened-class')); + $('.component-page-wrapper .component-sidebar').toggleClass('active'); + }); }); @@ -33,15 +40,31 @@
    - +

    +
    + +
    +
    + +
    +
    - + +
    + + +
     Progress bar
    +
      +
    Index: lams_tool_nb/web/images/1.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/2.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/3.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/4.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/5.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/6.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Fisheye: Tag 1f6e357f9932435e8c97e005196baa2f23909191 refers to a dead (removed) revision in file `lams_tool_nb/web/images/arrow.svg'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1f6e357f9932435e8c97e005196baa2f23909191 refers to a dead (removed) revision in file `lams_tool_nb/web/images/arrow2.svg'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1f6e357f9932435e8c97e005196baa2f23909191 refers to a dead (removed) revision in file `lams_tool_nb/web/images/assess-icon.svg'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1f6e357f9932435e8c97e005196baa2f23909191 refers to a dead (removed) revision in file `lams_tool_nb/web/images/assess-icon1.svg'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1f6e357f9932435e8c97e005196baa2f23909191 refers to a dead (removed) revision in file `lams_tool_nb/web/images/assess-icon2.svg'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1f6e357f9932435e8c97e005196baa2f23909191 refers to a dead (removed) revision in file `lams_tool_nb/web/images/assess-icon3.svg'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1f6e357f9932435e8c97e005196baa2f23909191 refers to a dead (removed) revision in file `lams_tool_nb/web/images/assess-icon4.svg'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1f6e357f9932435e8c97e005196baa2f23909191 refers to a dead (removed) revision in file `lams_tool_nb/web/images/assess-icon5.svg'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1f6e357f9932435e8c97e005196baa2f23909191 refers to a dead (removed) revision in file `lams_tool_nb/web/images/assess-icon6.svg'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1f6e357f9932435e8c97e005196baa2f23909191 refers to a dead (removed) revision in file `lams_tool_nb/web/images/assess-icon7.svg'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/images/bell.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/chat.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/cross.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/dots.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/down-arw.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Fisheye: Tag 1f6e357f9932435e8c97e005196baa2f23909191 refers to a dead (removed) revision in file `lams_tool_nb/web/images/down-arw.svg'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/images/file.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Fisheye: Tag 1f6e357f9932435e8c97e005196baa2f23909191 refers to a dead (removed) revision in file `lams_tool_nb/web/images/icon1.svg'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1f6e357f9932435e8c97e005196baa2f23909191 refers to a dead (removed) revision in file `lams_tool_nb/web/images/icon2.svg'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1f6e357f9932435e8c97e005196baa2f23909191 refers to a dead (removed) revision in file `lams_tool_nb/web/images/icon3.svg'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/images/img1.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/info-icon.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/lams_logo_white.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/lines.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/men-profile.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Fisheye: Tag 1f6e357f9932435e8c97e005196baa2f23909191 refers to a dead (removed) revision in file `lams_tool_nb/web/images/minus.svg'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/images/nata.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/pene.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Fisheye: Tag 1f6e357f9932435e8c97e005196baa2f23909191 refers to a dead (removed) revision in file `lams_tool_nb/web/images/plus.svg'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/images/polygon1x.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/profile-girl.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/ramiro.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Fisheye: Tag 1f6e357f9932435e8c97e005196baa2f23909191 refers to a dead (removed) revision in file `lams_tool_nb/web/images/search.svg'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/images/table-graph.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/tick.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/up-arw.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/images/user-map.png =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 Binary files differ Index: lams_tool_nb/web/learner5.jsp =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 --- lams_tool_nb/web/learner5.jsp (.../learner5.jsp) (revision 72bf0041a18e7e902404c65e55e167bf6ff84269) +++ lams_tool_nb/web/learner5.jsp (.../learner5.jsp) (revision 1f6e357f9932435e8c97e005196baa2f23909191) @@ -2,5 +2,6 @@ <%@ include file="/includes/taglibs.jsp"%> - + \ No newline at end of file Index: lams_tool_nb/web/learnerContent5.jsp =================================================================== diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r1f6e357f9932435e8c97e005196baa2f23909191 --- lams_tool_nb/web/learnerContent5.jsp (.../learnerContent5.jsp) (revision 72bf0041a18e7e902404c65e55e167bf6ff84269) +++ lams_tool_nb/web/learnerContent5.jsp (.../learnerContent5.jsp) (revision 1f6e357f9932435e8c97e005196baa2f23909191) @@ -67,32 +67,32 @@ - - - + <%-- --%> + <%-- --%> + <%-- --%> - - - + <%-- --%> + <%-- --%> + <%-- --%> - - - - - - - - - + <%-- --%> + <%-- --%> + <%-- --%> + <%-- --%> + <%-- --%> + <%-- --%> + <%-- --%> + <%-- --%> + <%-- --%> - - - - + <%-- --%> + <%-- --%> + <%-- --%> + <%-- --%>