Index: lams_monitoring/web/css/components-monitoring.css =================================================================== diff -u -rde360a85cbc26405ab4fa0de23a5e42ac4ffd0e4 -rcf4a7775152af5ea73a54b304a785d7cd0b40ddf --- lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision de360a85cbc26405ab4fa0de23a5e42ac4ffd0e4) +++ lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision cf4a7775152af5ea73a54b304a785d7cd0b40ddf) @@ -842,10 +842,6 @@ padding: 5px; } -body.component .ui-menu-item-wrapper.autocomplete-menu-item-with-portrait > p { - padding-top: 10px; -} - .dialogContainer { display: none; -webkit-overflow-scrolling: touch !important; Index: lams_monitoring/web/includes/javascript/monitorLesson5.js =================================================================== diff -u -rde360a85cbc26405ab4fa0de23a5e42ac4ffd0e4 -rcf4a7775152af5ea73a54b304a785d7cd0b40ddf --- lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision de360a85cbc26405ab4fa0de23a5e42ac4ffd0e4) +++ lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision cf4a7775152af5ea73a54b304a785d7cd0b40ddf) @@ -6,8 +6,6 @@ sequenceCanvas = null, // switch between SVG original size and fit-to-sreen (enlarge/shrink) learningDesignSvgFitScreen = false, -// info box show timeout - sequenceInfoTimeout = 8000, // which learner was selected in the search box sequenceSearchedLearner = null, // for synchronisation purposes @@ -1216,13 +1214,11 @@ $.each(ui.content, function(){ // only add portrait if user has got one let valueParts = this.value.split('_'); - if (valueParts.length > 1) { - this.value = valueParts[0]; - // portrait div will be added as text, then in open() function below we fix it - this.portrait = definePortrait(valueParts[1], this.value, STYLE_SMALL, true, LAMS_URL); - this.rawLabel = this.label; - this.label += this.portrait; - } + this.value = valueParts[0]; + // portrait div will be added as text, then in open() function below we fix it + this.portrait = definePortrait(valueParts.length > 1 ? valueParts[1] : null, this.value, STYLE_SMALL, true, LAMS_URL); + this.rawLabel = this.label; + this.label += this.portrait; }); }, 'open' : function(event, ui) { @@ -1291,35 +1287,6 @@ $('#forceBackwardsDialog').modal('hide'); }); - // small info box on Sequence tab, activated when the tab is showed - var sequenceInfoDialog = showDialog('sequenceInfoDialog', { - 'autoOpen' : false, - 'width' : 300, - 'modal' : false, - 'resizable' : false, - 'draggable' : false, - 'title' : LABELS.HELP, - 'open' : function(){ - // close after given time - setTimeout(function(){ - $('#sequenceInfoDialog').modal('hide') - }, sequenceInfoTimeout); - }, - 'close' : null, - 'data' : { - 'position' : { - 'my' : 'left top', - 'at' : 'left top', - 'of' : '#sequenceCanvas' - } - } - }, false); - $(sequenceInfoDialog).click(function(){ - $('#sequenceInfoDialog').modal('hide'); - }).find('.modal-header').remove(); - - $('#sequenceInfoDialog .modal-body').empty().append($('#sequenceInfoDialogContents').show()); - const learnerProgressUpdateSource = new EventSource(LAMS_URL + 'monitoring/monitoring/getLearnerProgressUpdateFlux.do?lessonId=' + lessonId); learnerProgressUpdateSource.onmessage = function (event) { if ("doRefresh" == event.data && $('#sequence-tab-content').length === 1){ @@ -1461,8 +1428,7 @@ if (sequenceSearchedLearner != null && !response.searchedLearnerFound) { // the learner has not started the lesson yet, display an info box sequenceClearSearchPhrase(); - $('#sequenceInfoDialogContents').html(LABELS.PROGRESS_NOT_STARTED); - $('#sequenceInfoDialog').modal('show'); + showToast(LABELS.PROGRESS_NOT_STARTED); } var learnerTotalCount = learnerCount + response.completedLearnerCount; Index: lams_monitoring/web/monitor5.jsp =================================================================== diff -u -r1837cd06ffdcf89f041b90ce3582951ff326ae4f -rcf4a7775152af5ea73a54b304a785d7cd0b40ddf --- lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 1837cd06ffdcf89f041b90ce3582951ff326ae4f) +++ lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision cf4a7775152af5ea73a54b304a785d7cd0b40ddf) @@ -644,11 +644,6 @@ - -
- -
-