Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -r8ecd468196ce6f79783ec375bc9f92c7d38579e2 -rfdc0f1b54d615ca5f50821e9b239981d24401863 --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 8ecd468196ce6f79783ec375bc9f92c7d38579e2) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision fdc0f1b54d615ca5f50821e9b239981d24401863) @@ -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(); } Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -r4ff2dce125300191562c3665e7323cfb7fb3947a -rfdc0f1b54d615ca5f50821e9b239981d24401863 --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 4ff2dce125300191562c3665e7323cfb7fb3947a) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision fdc0f1b54d615ca5f50821e9b239981d24401863) @@ -665,10 +665,6 @@ -
- -
-