Index: lams_central/web/WEB-INF/tags/PageLearner.tag =================================================================== diff -u -rb311244c55b221fc9f910cf4de25874d13d2296d -r68f0d8c20848cfdce8fe3d16b7631d48dfa8c4a0 --- lams_central/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision b311244c55b221fc9f910cf4de25874d13d2296d) +++ lams_central/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision 68f0d8c20848cfdce8fe3d16b7631d48dfa8c4a0) @@ -62,10 +62,7 @@ LABEL_SUPPORT_ACTIVITY = "", LABEL_COMPLETED_ACTIVITY = "", LABEL_CURRENT_ACTIVITY = "", - LABEL_NOT_STARTED_ACTIVITY = "", - LABEL_COMPLETED_GATE = "", - LABEL_CURRENT_GATE = "", - LABEL_NOT_STARTED_GATE = ""; + LABEL_NOT_STARTED_ACTIVITY = ""; var commandWebsocketHookTrigger = null, commandWebsocketHook = null; Index: lams_learning/web/WEB-INF/tags/PageLearner.tag =================================================================== diff -u -r76e2ef1e524594fd572167511caaf8c713027922 -r68f0d8c20848cfdce8fe3d16b7631d48dfa8c4a0 --- lams_learning/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision 76e2ef1e524594fd572167511caaf8c713027922) +++ lams_learning/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision 68f0d8c20848cfdce8fe3d16b7631d48dfa8c4a0) @@ -62,10 +62,7 @@ LABEL_SUPPORT_ACTIVITY = "", LABEL_COMPLETED_ACTIVITY = "", LABEL_CURRENT_ACTIVITY = "", - LABEL_NOT_STARTED_ACTIVITY = "", - LABEL_COMPLETED_GATE = "", - LABEL_CURRENT_GATE = "", - LABEL_NOT_STARTED_GATE = ""; + LABEL_NOT_STARTED_ACTIVITY = ""; var commandWebsocketHookTrigger = null, commandWebsocketHook = null; Index: lams_learning/web/includes/javascript/learnerPage.js =================================================================== diff -u -rb311244c55b221fc9f910cf4de25874d13d2296d -r68f0d8c20848cfdce8fe3d16b7631d48dfa8c4a0 --- lams_learning/web/includes/javascript/learnerPage.js (.../learnerPage.js) (revision b311244c55b221fc9f910cf4de25874d13d2296d) +++ lams_learning/web/includes/javascript/learnerPage.js (.../learnerPage.js) (revision 68f0d8c20848cfdce8fe3d16b7631d48dfa8c4a0) @@ -49,30 +49,18 @@ //current if (activityData.status === 0) { - activityItem.addClass('active'); - $(".col", activityItem).text(activityName); - if (activityData.type === 'g') { - activityIcon.addClass('fa-solid fa-unlock') - .attr('title', LABEL_CURRENT_GATE); - - } else { - activityIcon.addClass('fa-regular fa-pen-to-square') - .attr('title', LABEL_CURRENT_ACTIVITY); - } + activityItem.addClass('active'); + $(".col", activityItem).text(activityName); + activityIcon.addClass('fa-regular fa-pen-to-square') + .attr('title', LABEL_CURRENT_ACTIVITY); //completed } else if (activityData.status === 1) { completedActivityCount++; - activityItem.addClass('progress-bar-item-complete'); - if (activityData.type === 'g') { - activityIcon.addClass('fa-solid fa-lock-open') - .attr('title', LABEL_COMPLETED_GATE); - - } else { - activityIcon.addClass('fa-solid fa-square-check') - .attr('title', LABEL_COMPLETED_ACTIVITY); - } + activityItem.addClass('progress-bar-item-complete'); + activityIcon.addClass('fa-solid fa-square-check') + .attr('title', LABEL_COMPLETED_ACTIVITY); if (activityData.url) { let activityLink = $('').text(activityName).attr({ 'target': '_blank', @@ -87,15 +75,9 @@ //not yet finished } else { activityItem.addClass('progress-bar-item-incomplete'); - $(".col", activityItem).text(activityName); - if (activityData.type === 'g') { - activityIcon.addClass('fa-solid fa-lock') - .attr('title', LABEL_NOT_STARTED_GATE); - - } else { - activityIcon.addClass('fa-regular fa-square') - .attr('title', LABEL_NOT_STARTED_ACTIVITY); - } + $(".col", activityItem).text(activityName); + activityIcon.addClass('fa-regular fa-square') + .attr('title', LABEL_NOT_STARTED_ACTIVITY); } });