Index: lams_central/web/includes/javascript/dialog.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/dialog.js,v
diff -u -r1.1.2.19 -r1.1.2.20
--- lams_central/web/includes/javascript/dialog.js	28 Nov 2016 16:28:16 -0000	1.1.2.19
+++ lams_central/web/includes/javascript/dialog.js	8 Dec 2016 14:36:07 -0000	1.1.2.20
@@ -272,7 +272,7 @@
 }
 
 
-//used by both main.jsp and /lti/addlesson.jsp pages
+//used by both /lams_central/web/main.jsp and /lams_central/web/lti/addlesson.jsp pages
 function showAuthoringDialog(learningDesignID){
 	var dialog = showDialog('dialogAuthoring', {
 		'height' : Math.max(300, $(window).height() - 30),
@@ -306,4 +306,39 @@
 	$('.modal-content', dialog).on('resizestop', function() {
 		$('iframe', this)[0].contentWindow.GeneralLib.resizePaper();
 	});
+}
+
+
+//used by both /lams_central/web/main.jsp and /lams_monitoring/web/monitor.jsp pages
+function showNotificationsDialog(orgID, lessonID) {
+	// if screen is narrow, then it is much longer
+	var width = Math.max(380, Math.min(800, $(window).width() - 60)),
+		height = width < 798 ? 850 : 650;
+	height = Math.max(380, Math.min(height, $(window).height() - 30));
+		
+	var id = "dialogNotifications" + (lessonID ? "Lesson" + lessonID : "Org" + orgID);
+	showDialog(id, {
+		'data' : {
+			'orgID' : orgID,
+			'lessonID' : lessonID
+		},
+		'height': height,
+		'width' : width,
+		'title' : LABELS.EMAIL_NOTIFICATIONS_TITLE,
+		'open' : function() {
+			var dialog = $(this),
+				lessonID = dialog.data('lessonID');
+			// if lesson ID is given, use lesson view; otherwise use course view
+			if (lessonID) {
+				// load contents after opening the dialog
+				$('iframe', dialog).attr('src', LAMS_URL
+					+ 'monitoring/emailNotifications.do?method=getLessonView&lessonID='
+					+ lessonID);
+			} else {
+				$('iframe', dialog).attr('src', LAMS_URL
+					+ 'monitoring/emailNotifications.do?method=getCourseView&organisationID='
+					+ orgID);
+			}
+		}
+	}, true);
 }
\ No newline at end of file
Index: lams_central/web/includes/javascript/main.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/Attic/main.js,v
diff -u -r1.1.2.16 -r1.1.2.17
--- lams_central/web/includes/javascript/main.js	30 Nov 2016 16:20:56 -0000	1.1.2.16
+++ lams_central/web/includes/javascript/main.js	8 Dec 2016 14:36:07 -0000	1.1.2.17
@@ -404,40 +404,6 @@
 }
 
 
-function showNotificationsDialog(orgID, lessonID) {
-	// if screen is narrow, then it is much longer
-	var width = Math.max(380, Math.min(800, $(window).width() - 60)),
-		height = width < 798 ? 850 : 650;
-	height = Math.max(380, Math.min(height, $(window).height() - 30));
-		
-	var id = "dialogNotifications" + (lessonID ? "Lesson" + lessonID : "Org" + orgID);
-	showDialog(id, {
-		'data' : {
-			'orgID' : orgID,
-			'lessonID' : lessonID
-		},
-		'height': height,
-		'width' : width,
-		'title' : LABELS.EMAIL_NOTIFICATIONS_TITLE,
-		'open' : function() {
-			var dialog = $(this),
-				lessonID = dialog.data('lessonID');
-			// if lesson ID is given, use lesson view; otherwise use course view
-			if (lessonID) {
-				// load contents after opening the dialog
-				$('iframe', dialog).attr('src', LAMS_URL
-					+ 'monitoring/emailNotifications.do?method=getLessonView&lessonID='
-					+ lessonID);
-			} else {
-				$('iframe', dialog).attr('src', LAMS_URL
-					+ 'monitoring/emailNotifications.do?method=getCourseView&organisationID='
-					+ orgID);
-			}
-		}
-	}, true);
-}
-
-
 function showPrivateNotificationsDialog(){
 	var notificationDialog = showDialog("dialogPrivateNotifications", {
 		'height': Math.max(380, Math.min(600, $(window).height() - 30)),
Index: lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.50.2.10 -r1.50.2.11
--- lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	3 Dec 2016 23:01:37 -0000	1.50.2.10
+++ lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	8 Dec 2016 14:42:32 -0000	1.50.2.11
@@ -304,6 +304,6 @@
 class.add.all.confirm  =Do you want to add all learners to the class?
 class.add.all.success  =All learners were added to the class
 button.edit.class.add.all  =Add all
+index.emailnotifications  =Notifications
 
-
 #======= End labels: Exported 298 labels for en AU =====
Index: lams_monitoring/web/monitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/monitor.jsp,v
diff -u -r1.27.2.41 -r1.27.2.42
--- lams_monitoring/web/monitor.jsp	8 Dec 2016 05:45:56 -0000	1.27.2.41
+++ lams_monitoring/web/monitor.jsp	8 Dec 2016 14:42:32 -0000	1.27.2.42
@@ -55,6 +55,8 @@
 			
 			decoderDiv = $('<div />'),
 			LABELS = {
+				<fmt:message key="index.emailnotifications" var="EMAIL_NOTIFICATIONS_TITLE_VAR"/>
+				EMAIL_NOTIFICATIONS_TITLE : '<c:out value="${EMAIL_NOTIFICATIONS_TITLE_VAR}" />',
 				<fmt:message key="force.complete.click" var="FORCE_COMPLETE_CLICK_VAR"/>
 				FORCE_COMPLETE_CLICK : decoderDiv.html('<c:out value="${FORCE_COMPLETE_CLICK_VAR}" />').text(),
 				<fmt:message key="button.force.complete" var="FORCE_COMPLETE_BUTTON_VAR"/>
@@ -313,8 +315,8 @@
 									  	title='<fmt:message key="button.edit.class.tooltip"/>'><i class="fa fa-sm fa-user-times"></i> <span class="hidden-xs"><fmt:message key="button.edit.class"/></span></button>
 									<c:if test="${lesson.enabledLessonNotifications}">	
 									  <button id="notificationButton" class="btn btn-default roffset10" 
-									  	type="button" onClick="javascript:window.parent.showNotificationsDialog(null,${lesson.lessonID})"><i class="fa fa-sm fa-bullhorn"></i> <span class="hidden-xs"><fmt:message key="email.notifications"/></span></button>
-									</c:if>							  
+									  	type="button" onClick="javascript:showNotificationsDialog(null,${lesson.lessonID})"><i class="fa fa-sm fa-bullhorn"></i> <span class="hidden-xs"><fmt:message key="email.notifications"/></span></button>
+									</c:if>
 									<c:if test="${lesson.enableLessonIntro}">	
 									  <button id="editIntroButton" class="btn btn-default" 
 									  	type="button" onClick="javascript:showIntroductionDialog(${lesson.lessonID})"><i class="fa fa-sm fa-info"></i> <span class="hidden-xs"><fmt:message key="label.lesson.introduction"/></span></button>