Index: lams_central/web/includes/javascript/dialog.js =================================================================== diff -u -r5a239f3d826e4a7158f64c5a35b14ddc8215b845 -r3544d3ccd38f39c1d6eb7115c1b2ddd1a28b50ab --- lams_central/web/includes/javascript/dialog.js (.../dialog.js) (revision 5a239f3d826e4a7158f64c5a35b14ddc8215b845) +++ lams_central/web/includes/javascript/dialog.js (.../dialog.js) (revision 3544d3ccd38f39c1d6eb7115c1b2ddd1a28b50ab) @@ -286,6 +286,19 @@ } //disable scrolling of the parent's content dialog.parent().addClass("modal-open"); + + // in case of monitor dialog reload its content. It's required as all monitor dialogs use the same ids for their HTML elements + var isMonitorDialog = dialog.data('isMonitorDialog'); + if (isMonitorDialog) { + //hide iframe until it gets loaded + $('iframe', dialog).hide(); + $('iframe', dialog).load(function() { + $('iframe', dialog).show(); + }); + + //reload iframe + $('iframe', dialog)["0"].contentWindow.location.reload(); + } } /** @@ -417,4 +430,4 @@ } } }); -} \ No newline at end of file +} Index: lams_central/web/includes/javascript/main.js =================================================================== diff -u -r6dcc39917657070688863ede60eac6f094929d6a -r3544d3ccd38f39c1d6eb7115c1b2ddd1a28b50ab --- lams_central/web/includes/javascript/main.js (.../main.js) (revision 6dcc39917657070688863ede60eac6f094929d6a) +++ lams_central/web/includes/javascript/main.js (.../main.js) (revision 3544d3ccd38f39c1d6eb7115c1b2ddd1a28b50ab) @@ -275,6 +275,7 @@ var id = "dialogMonitorLesson" + lessonID, dialog = showDialog(id, { 'data' : { + 'isMonitorDialog' : true, 'lessonID' : lessonID }, 'autoOpen' : false, Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -rbddec51eae5eadd831676c4ea28eadcf446c32bd -r3544d3ccd38f39c1d6eb7115c1b2ddd1a28b50ab --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision bddec51eae5eadd831676c4ea28eadcf446c32bd) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 3544d3ccd38f39c1d6eb7115c1b2ddd1a28b50ab) @@ -24,28 +24,7 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - +
<%-- "loading..." screen, gets removed on page full load --%> @@ -565,6 +563,7 @@ +