Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.138.2.31 -r1.138.2.32
--- lams_central/conf/language/lams/ApplicationResources.properties	1 Nov 2016 03:27:31 -0000	1.138.2.31
+++ lams_central/conf/language/lams/ApplicationResources.properties	7 Nov 2016 04:41:30 -0000	1.138.2.32
@@ -703,4 +703,6 @@
 
 
 error.cannot.load.thumbnail=Unable to load sequence thumbnail.
+label.lesson.introduction.updated=Lesson Introduction Updated
+
 #======= End labels: Exported 439 labels for en AU =====
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.111.2.16 -r1.111.2.17
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	1 Nov 2016 03:27:31 -0000	1.111.2.16
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	7 Nov 2016 04:41:30 -0000	1.111.2.17
@@ -701,4 +701,5 @@
 label.email.send.me.a.copy=Send me a copy
 
 error.cannot.load.thumbnail=Unable to load sequence thumbnail.
+label.lesson.introduction.updated=Lesson Introduction Updated
 #======= End labels: Exported 439 labels for en AU =====
Index: lams_central/web/editLessonIntro.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/editLessonIntro.jsp,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_central/web/editLessonIntro.jsp	20 Jul 2016 06:50:51 -0000	1.3.2.2
+++ lams_central/web/editLessonIntro.jsp	7 Nov 2016 04:42:26 -0000	1.3.2.3
@@ -14,25 +14,22 @@
 	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="includes/javascript/jquery.form.js"></script>
 	<script language="JavaScript" type="text/javascript">
-	<!--
-
 		$(function() {
 			$('#lessonForm').ajaxForm( {
 				beforeSerialize: function(arr, $form, options) { 
 					$("#lessonDescription").val(CKEDITOR.instances.lessonDescription.getData());                 
 				},
 			    success:    function() {
-			    	self.parent.document.location.reload();
-			    	self.parent.tb_remove();
+			    	alert('<fmt:message key="label.lesson.introduction.updated"/>');
+			    	if ( typeof parent.window.closeIntroductionDialog !== "undefined") {
+						parent.window.closeIntroductionDialog();
+			    	}
 			    }
 			 } );
 		});
-	//-->
 	</script>
 	
 	<lams:css/>
-	<style media="screen,projection" type="text/css">
-	</style>	
 	
 </lams:head>
 
@@ -59,18 +56,11 @@
 				<fmt:message key="label.display.lesson.design"></fmt:message>
 			</div>
 			
-			<br /><br /><br />        
-			
-			<lams:ImgButtonWrapper>
-				<div class="pull-right">
-					<a href="#nogo" onclick="$('#lessonForm').submit();" onmousedown="self.focus();" class="btn btn-primary">
-						<fmt:message key="button.save" /> 
-					</a>
-					<a href="#nogo" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="btn btn-default loffset5">
-						<fmt:message key="label.cancel" /> 
-					</a>
-				</div>
-			</lams:ImgButtonWrapper>
+			<div class="pull-right">
+				<a href="#nogo" onclick="$('#lessonForm').submit();" class="btn btn-primary">
+					<fmt:message key="button.save" /> 
+				</a>
+			</div>
 		
 		</form>
 			
Index: lams_central/web/lessonIntro.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lessonIntro.jsp,v
diff -u -r1.8.2.6 -r1.8.2.7
--- lams_central/web/lessonIntro.jsp	4 Nov 2016 01:58:50 -0000	1.8.2.6
+++ lams_central/web/lessonIntro.jsp	7 Nov 2016 04:42:26 -0000	1.8.2.7
@@ -98,12 +98,6 @@
 		</c:if>
 			
 		<div class="voffset10 pull-right">
-			<c:if test="${isMonitor}">
-			 	<a class="thickbox btn btn-default" href="editLessonIntro.do?method=edit&lessonID=${lesson.lessonId}&KeepThis=true&TB_iframe=true&height=600&width=800" title="<fmt:message key='label.edit'/>">
-					<fmt:message key="label.edit"/>
-				</a>
-			</c:if>
-
 			<html:link href="${lams}home.do?method=learner&lessonID=${lesson.lessonId}&isLessonIntroWatched=true" styleClass="btn btn-primary na">
 				<span class="nextActivity"><fmt:message key="label.start.lesson" /></span>
 			</html:link>
Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.66.2.17 -r1.66.2.18
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	21 Oct 2016 09:03:44 -0000	1.66.2.17
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	7 Nov 2016 04:43:25 -0000	1.66.2.18
@@ -312,5 +312,7 @@
 email.notifications.delete=Delete Notification
 email.notification.delete.alert1=About to delete the scheduled notification: {0}
 email.notification.delete.alert2=This cannot be undone. Do you want to delete?
+label.lesson.introduction=Lesson Introduction
 
+
 #======= End labels: Exported 310 labels for en AU =====
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.8 -r1.50.2.9
--- lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	11 May 2016 07:14:44 -0000	1.50.2.8
+++ lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	7 Nov 2016 04:43:25 -0000	1.50.2.9
@@ -315,6 +315,6 @@
 learner.group.forward.10  =10 pages forward
 learner.group.backward.1  =Previous page
 learner.group.backward.10  =10 pages back
+label.lesson.introduction=Lesson Introduction
 
-
 #======= End labels: Exported 310 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.34 -r1.27.2.35
--- lams_monitoring/web/monitor.jsp	5 Nov 2016 15:07:13 -0000	1.27.2.34
+++ lams_monitoring/web/monitor.jsp	7 Nov 2016 04:43:25 -0000	1.27.2.35
@@ -154,7 +154,8 @@
 				CONTRIBUTE_BUTTON : '<c:out value="${CONTRIBUTE_BUTTON_VAR}" />',
 				<fmt:message key="lesson.task.attention" var="CONTRIBUTE_ATTENTION_VAR"/>
 				CONTRIBUTE_ATTENTION : '<c:out value="${CONTRIBUTE_ATTENTION_VAR}" />',
-				HELP : '<fmt:message key="button.help"/>'
+				HELP : '<fmt:message key="button.help"/>',
+				LESSON_INTRODUCTION : '<fmt:message key="label.lesson.introduction"/>'
 				
 			}
 	    
@@ -304,9 +305,13 @@
 									  	type="button" onClick="javascript:showClassDialog()" 
 									  	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="${notificationsAvailable && lesson.enabledLessonNotifications}">	
-									  <button id="notificationButton" class="btn btn-default" 
+									  <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>							  
+									<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>
+									</c:if>							  
 									</div>
 								</dd>
 		
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.46 -r1.44.2.47
--- lams_monitoring/web/includes/javascript/monitorLesson.js	5 Nov 2016 15:07:13 -0000	1.44.2.46
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	7 Nov 2016 04:43:25 -0000	1.44.2.47
@@ -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
@@ -647,6 +647,28 @@
 	$('#sequenceInfoDialog .modal-body').empty().append($('#sequenceInfoDialogContents').show());
 }
 
+function showIntroductionDialog(lessonId) {
+	
+	showDialog('introductionDialog', {
+		'height'	: 450,
+		'width'  	: Math.max(380, Math.min(800, $(window).width() - 60)),
+		'resizable' : false,
+		'title'		: LABELS.LESSON_INTRODUCTION,
+		'open'      : function(){
+			$('iframe', this).attr('src', LAMS_URL + 'editLessonIntro.do?method=edit&lessonID='+lessonId);
+			$('iframe', this).css('height', '360px'); 
+			autoRefreshBlocked = true;
+		},
+		'close' 	: function(){
+			closeIntroductionDialog()
+		}
+	}, false);
+}	
+	
+function closeIntroductionDialog() {
+	autoRefreshBlocked = false;
+	$('#introductionDialog').remove();
+}
 /**
  * Updates learner progress in sequence tab according to respose sent to refreshMonitor()
  */