Index: lams_monitoring/web/css/_monitorLesson_base.scss =================================================================== diff -u -rbcaaf5a30589260995755b4d83133af1bc6f8bc2 -r10e18e7fa7a4a12ddd5266f712e05a1bfacfd1b0 --- lams_monitoring/web/css/_monitorLesson_base.scss (.../_monitorLesson_base.scss) (revision bcaaf5a30589260995755b4d83133af1bc6f8bc2) +++ lams_monitoring/web/css/_monitorLesson_base.scss (.../_monitorLesson_base.scss) (revision 10e18e7fa7a4a12ddd5266f712e05a1bfacfd1b0) @@ -309,7 +309,8 @@ text-align: center; width: 100%; height: 100%; - overflow: auto; } + overflow: auto; +} div#sequenceCanvas div.learner-icon, #completedLearnersContainer div.learner-icon { display: inline-block; @@ -348,28 +349,6 @@ text-align: center; } -div#sequenceCanvas div.more-learner-icon > a, #completedLearnersContainer div.more-learner-icon > a { - color: black; - text-decoration: none; - outline: none; -} - -div.more-learner-popover { - max-width: 460px; - max-height: 500px; - overflow: auto; -} - -div.more-learner-popover div.more-learner-popover-icon { - display : inline-block; - text-align : center; - margin-right: 5px; -} - -div.more-learner-popover div.more-learner-popover-icon > p { - font-size : 10px; -} - div#sequenceCanvas .activity-requires-attention { position: absolute; cursor : pointer; Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -rbcaaf5a30589260995755b4d83133af1bc6f8bc2 -r10e18e7fa7a4a12ddd5266f712e05a1bfacfd1b0 --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision bcaaf5a30589260995755b4d83133af1bc6f8bc2) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 10e18e7fa7a4a12ddd5266f712e05a1bfacfd1b0) @@ -1566,15 +1566,10 @@ : null, allLearnersIcon = activity.learnerCount > 0 ? $('
') - .css({ 'position' : 'absolute' }) .addClass('more-learner-icon') - .append($('').attr({ - role : 'button', - tabindex : 0 - })) : null, learningDesignSvgViewbox = learningDesignSvg.attr('viewBox').split(' '), learningDesignSvgInternalLeftOffset = +learningDesignSvgViewbox[0], @@ -1639,10 +1634,8 @@ 'top' : activityTopOffset - 60 + 'px', 'z-index' : 108 }) - .appendTo(sequenceCanvas) - .children('a').text('+' + (activity.learnerCount - 7)); - - allLearnersIcon.popover('show'); + .text('+' + (activity.learnerCount - 7)) + .appendTo(sequenceCanvas); } } @@ -1659,8 +1652,8 @@ 'left' : activityLeftOffset + 'px', 'top' : activityTopOffset - 80 + 'px' }) - .appendTo(sequenceCanvas) - .children('a').text(activity.learnerCount); + .text(activity.learnerCount) + .appendTo(sequenceCanvas); } if (requiresAttentionIcon) { @@ -1676,8 +1669,8 @@ 'left' : activityLeftOffset - 20 + 'px', 'top' : activityTopOffset - 100 + 'px' }) - .appendTo(sequenceCanvas) - .children('a').text(activity.learnerCount); + .text(activity.learnerCount) + .appendTo(sequenceCanvas); } if (requiresAttentionIcon) { @@ -1693,8 +1686,8 @@ 'left' : activityLeftOffset + coord.width - 50 + 'px', 'top' : activityTopOffset - 98 + 'px' }) - .appendTo(sequenceCanvas) - .children('a').text(activity.learnerCount); + .text(activity.learnerCount) + .appendTo(sequenceCanvas); } if (requiresAttentionIcon) { @@ -1765,30 +1758,7 @@ } if (activity.learnerCount > 0){ - var learnerGroup = $('#act' + activity.id + 'learnerGroup', sequenceCanvas) - .popover({ - content: function(){ - var learnerPopoverContainer = $(''); - - $.each(activity.learners, function(learnerIndex, learner){ - $('').addClass('more-learner-popover-icon') - .append(definePortrait(learner.portraitId, learner.id, STYLE_SMALL, true, LAMS_URL)) - .append($('').text(getLearnerDisplayName(learner))) - .appendTo(learnerPopoverContainer); - }); - - return learnerPopoverContainer.html(); - }, - template : '