Index: lams_central/web/images/completed.svg =================================================================== diff -u --- lams_central/web/images/completed.svg (revision 0) +++ lams_central/web/images/completed.svg (revision 0d54fb2115b353bfc618685ce50c08afa8cd669a) @@ -0,0 +1 @@ + Index: lams_central/web/images/exclamation.svg =================================================================== diff -u --- lams_central/web/images/exclamation.svg (revision 0) +++ lams_central/web/images/exclamation.svg (revision 0d54fb2115b353bfc618685ce50c08afa8cd669a) @@ -0,0 +1 @@ + \ No newline at end of file Index: lams_monitoring/web/css/_monitorLesson_base.scss =================================================================== diff -u -r10e18e7fa7a4a12ddd5266f712e05a1bfacfd1b0 -r0d54fb2115b353bfc618685ce50c08afa8cd669a --- lams_monitoring/web/css/_monitorLesson_base.scss (.../_monitorLesson_base.scss) (revision 10e18e7fa7a4a12ddd5266f712e05a1bfacfd1b0) +++ lams_monitoring/web/css/_monitorLesson_base.scss (.../_monitorLesson_base.scss) (revision 0d54fb2115b353bfc618685ce50c08afa8cd669a) @@ -352,7 +352,14 @@ div#sequenceCanvas .activity-requires-attention { position: absolute; cursor : pointer; + width: 16px; + height: 16px; } + +#completedLearnersContainer #completedLessonLearnersIcon { + width: 35px; + height: 35px; +} div#sequenceCanvas svg.learningDesignSvg { display: block; Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -rc409342a1ec177f2f5a6d324a9006bf3694697d6 -r0d54fb2115b353bfc618685ce50c08afa8cd669a --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision c409342a1ec177f2f5a6d324a9006bf3694697d6) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 0d54fb2115b353bfc618685ce50c08afa8cd669a) @@ -1165,7 +1165,7 @@ } // clear all completed learner icons except the door - $('#completedLearnersContainer :not(img#completedLearnersDoorIcon)').remove(); + $('#completedLearnersContainer :not(img#completedLessonLearnersIcon)').remove(); var sequenceTopButtonsContainer = $('#sequenceTopButtonsContainer'); if ($('img#sequenceCanvasLoading', sequenceTopButtonsContainer).length == 0){ @@ -1558,7 +1558,7 @@ $('') .attr({ 'id' : 'act' + activity.id + 'attention', - 'src' : LAMS_URL + 'images/icons/exclamation.png', + 'src' : LAMS_URL + 'images/exclamation.svg', 'title' : LABELS.CONTRIBUTE_ATTENTION }) .addClass('activity-requires-attention') @@ -1793,11 +1793,6 @@ */ function addCompletedLearnerIcons(learners, learnerCount, learnerTotalCount) { var iconsContainer = $('#completedLearnersContainer'); - // show (current/total) label - $('').attr({ - 'title' : LABELS.LEARNER_FINISHED_COUNT.replace('[0]', learnerCount).replace('[1]', learnerTotalCount) - }).text('(' + learnerCount + '/' + learnerTotalCount + ')') - .appendTo(iconsContainer); if (learners) { // create learner icons, along with handlers Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -ra7f44561b0ef4da722742ba9b1ead48fcae392dc -r0d54fb2115b353bfc618685ce50c08afa8cd669a --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision a7f44561b0ef4da722742ba9b1ead48fcae392dc) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 0d54fb2115b353bfc618685ce50c08afa8cd669a) @@ -78,8 +78,6 @@ SAVE_BUTTON : '', CANCEL_BUTTON : '', - - LEARNER_FINISHED_COUNT : '', LEARNER_FINISHED_DIALOG_TITLE : '', @@ -567,7 +565,7 @@
- +
Index: lams_monitoring/web/tblmonitor/sequence.jsp =================================================================== diff -u -r1cacada3b99a289e0a7fa6e887fd62285be99a81 -r0d54fb2115b353bfc618685ce50c08afa8cd669a --- lams_monitoring/web/tblmonitor/sequence.jsp (.../sequence.jsp) (revision 1cacada3b99a289e0a7fa6e887fd62285be99a81) +++ lams_monitoring/web/tblmonitor/sequence.jsp (.../sequence.jsp) (revision 0d54fb2115b353bfc618685ce50c08afa8cd669a) @@ -255,7 +255,7 @@
- +