Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -r4818b288dd85a6e6b94bdead072dedd9d4003921 -r33482940822e346adaf78052222495d6da24907d
--- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 4818b288dd85a6e6b94bdead072dedd9d4003921)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 33482940822e346adaf78052222495d6da24907d)
@@ -393,17 +393,37 @@
,'width=650,height=350,resizable=no,scrollbars=no,status=no,menubar=no,toolbar=no');
}
-//sets up dialog for emailing learners
function showEmailDialog(userId){
- window.parent.showEmailDialog(userId, lessonId);
+
+ //Check whether current window is a top level window. Otherwise it's an iframe, popup or something
+ var isTopLevelWindow = window.top == window.self;
+ var windowElement = isTopLevelWindow ? $(window) : $(window.parent);
+
+ var dialog = showDialog("dialogEmail", {
+ 'autoOpen' : true,
+ 'height' : Math.max(380, Math.min(700, windowElement.height() - 30)),
+ 'width' : Math.max(380, Math.min(700, windowElement.width() - 60)),
+ 'modal' : true,
+ 'resizable' : true,
+ 'title' : LABELS.EMAIL_TITLE,
+ //whether dialog should be created in a parent window
+ "isCreateInParentWindow" : !isTopLevelWindow,
+ 'open' : function(){
+ autoRefreshBlocked = true;
+ var dialog = $(this);
+ // load contents after opening the dialog
+ $('iframe', dialog).attr('src',
+ LAMS_URL + 'emailUser.do?method=composeMail&lessonID=' + lessonId
+ + '&userID=' + userId);
+ },
+ 'close' : function(){
+ autoRefreshBlocked = false;
+ $(this).remove();
+ }
+ }, false, true);
}
-function closeEmailDialog(){
- window.parent.closeEmailDialog();
-}
-
-
function updatePresenceAvailableCount(){
var checked = $('#presenceButton').hasClass('btn-success'),
counter = $('#presenceCounter');
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r6cdea6bc0e8e9b603b7fb6f1b1953bae691c9a85 -r33482940822e346adaf78052222495d6da24907d
--- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 6cdea6bc0e8e9b603b7fb6f1b1953bae691c9a85)
+++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 33482940822e346adaf78052222495d6da24907d)
@@ -164,8 +164,8 @@
CONTRIBUTE_ATTENTION : '',
HELP : '',
- LESSON_INTRODUCTION : ''
-
+ LESSON_INTRODUCTION : '',
+ EMAIL_TITLE : ''
}
$(document).ready(function(){