Index: lams_monitoring/web/monitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/monitor.jsp,v
diff -u -r1.27.2.28 -r1.27.2.29
--- lams_monitoring/web/monitor.jsp 27 Oct 2016 00:21:31 -0000 1.27.2.28
+++ lams_monitoring/web/monitor.jsp 28 Oct 2016 02:50:48 -0000 1.27.2.29
@@ -665,10 +665,6 @@
-
-
-
-
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/includes/javascript/monitorLesson.js,v
diff -u -r1.44.2.40 -r1.44.2.41
--- lams_monitoring/web/includes/javascript/monitorLesson.js 21 Oct 2016 09:03:44 -0000 1.44.2.40
+++ lams_monitoring/web/includes/javascript/monitorLesson.js 28 Oct 2016 02:50:49 -0000 1.44.2.41
@@ -1,4 +1,4 @@
-// ********** GLOBAL VARIABLES **********
+// ********** GLOBAL VARIABLES **********
// copy of lesson SVG so it does no need to be fetched every time
var originalSequenceCanvas = null,
// DIV container for lesson SVG
@@ -173,7 +173,7 @@
},
'buttons' : [
{
- 'text' : LABELS.CANCEL_BUTTON,
+ 'text' : LABELS.CLOSE_BUTTON,
'id' : 'classDialogCancelButton',
'class' : 'btn btn-sm btn-default',
'click' : function() {
@@ -217,26 +217,6 @@
}
});
- // sets up dialog for emailing learners
- $('#emailDialog').dialog({
- 'autoOpen' : false,
- 'height' : 530,
- 'width' : 700,
- 'modal' : true,
- 'resizable' : false,
- 'show' : 'fold',
- 'hide' : 'fold',
- 'title' : LABELS.EMAIL_BUTTON,
- 'open' : function(){
- autoRefreshBlocked = true;
- $('#emailFrame').attr('src',
- LAMS_URL + 'emailUser.do?method=composeMail&lessonID=' + lessonId
- + '&userID=' + $(this).dialog('option', 'userId'));
- },
- 'close' : function(){
- autoRefreshBlocked = false;
- }
- });
}
@@ -475,17 +455,14 @@
,'width=650,height=350,resizable=no,scrollbars=no,status=no,menubar=no,toolbar=no');
}
-
+//sets up dialog for emailing learners
function showEmailDialog(userId){
- $('#emailDialog').dialog('option',{
- 'userId' : userId
- }).dialog('open');
+ window.parent.showEmailDialog(userId, lessonId);
}
function closeEmailDialog(){
- $('#emailFrame').attr('src', null);
- $('#emailDialog').dialog('close');
+ window.parent.closeEmailDialog();
}