Index: lams_central/web/main.jsp
===================================================================
diff -u -rf6359207eef0f47bdd53b51c0b73aea8ec236b64 -r83b61e8e5503d355c9e70e407dc2c55ef001b944
--- lams_central/web/main.jsp	(.../main.jsp)	(revision f6359207eef0f47bdd53b51c0b73aea8ec236b64)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision 83b61e8e5503d355c9e70e407dc2c55ef001b944)
@@ -33,13 +33,8 @@
 	<style type="text/css">
 		.dialogContainer {
 			display: none;
+			overflow: hidden !important;
 		}
-		
-		.dialogContainer iframe {
-			width: 100%;
-			height: 100%;
-			border: none;
-		}
 	</style>
 	<script language="JavaScript" type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
 	<script language="javascript" type="text/javascript" src="loadVars.jsp"></script>
@@ -51,27 +46,28 @@
 		<script language="JavaScript" type="text/javascript" src="includes/javascript/groupDisplay.js"></script>	
 	</c:if>
 	<script language="javascript" type="text/javascript">
+		var monitorDialog = null;
+		var addLessonDialog = null;
+		
 		function showMonitorLessonDialog(lessonID){
-			$("#monitorDialog").dialog('option', 'lessonID', lessonID)
+			monitorDialog.dialog('option', 'lessonID', lessonID)
 								 .dialog('open');
 		}
 		
 		function showAddLessonDialog(orgID){
-			$("#addLessonDialog").dialog('option', 'orgID', orgID)
+			addLessonDialog.dialog('option', 'orgID', orgID)
 								 .dialog('open');
 		}
 		
 		function closeAddLessonDialog(refresh) {
-			$('#addLessonFrame').attr('src', null);
 			// was the dialog just closed or a new lesson really added? if latter, refresh the list
-			$("#addLessonDialog").dialog('option', 'refresh', refresh ? true : false)
-								 .dialog('close');
+			addLessonDialog.dialog('option', 'refresh', refresh ? true : false)
+					       .dialog('close');
 		}
 	
 		function closeMonitorLessonDialog(refresh) {
-			$('#monitorFrame').attr('src', null);
 			// was the dialog just closed or a new lesson really added? if latter, refresh the list
-			$("#monitorDialog").dialog('option', 'refresh', refresh ? true : false)
+			monitorDialog.dialog('option', 'refresh', refresh ? true : false)
 								 .dialog('close');
 		}
 		
@@ -112,7 +108,7 @@
 				
 		       
 		        // initialise lesson dialog
-				$('#addLessonDialog').dialog({
+				addLessonDialog = $('#addLessonDialog').dialog({
  					'autoOpen'  : false,
  					'height'    : 600,
  					'width'     : 800,
@@ -121,21 +117,32 @@
  					'show'      : 'fold',
  					'hide'      : 'fold',
  					'open'      : function(){
- 						// load contents after opening the dialog
- 						$('#addLessonFrame').prop('src', '<lams:LAMSURL/>home.do?method=addLesson&organisationID='
- 								                         + $(this).dialog('option', 'orgID'));
+ 						addLessonDialog.html(null);
+						$.ajax({
+							url : '<lams:LAMSURL/>home.do',
+							cache : false,
+							data : {
+	 							'method'         : 'addLesson',
+	 							'organisationID' : addLessonDialog.dialog('option', 'orgID')
+							},
+							success : function(response) {
+								addLessonDialog.html(response);
+							}
+						});
  					},
  					'close' : function() {
  						// refresh if lesson was added
- 						if($(this).dialog('option', 'refresh')){
+ 						if(addLessonDialog.dialog('option', 'refresh')){
  							refresh();
  						}
  					}
- 				// tabs are the title bar, so remove dialog's one
- 				}).closest('.ui-dialog').children('.ui-dialog-titlebar').remove();
+ 				});
+				// tabs are the title bar, so remove dialog's one
+		        addLessonDialog.closest('.ui-dialog').children('.ui-dialog-titlebar').remove();
 		        
+				
 				// initialise monitor dialog
-				$('#monitorDialog').dialog({
+				monitorDialog = $('#monitorDialog').dialog({
  					'autoOpen'  : false,
  					'height'    : 600,
  					'width'     : 800,
@@ -144,21 +151,31 @@
  					'show'      : 'fold',
  					'hide'      : 'fold',
  					'open'      : function(){
- 						// load contents after opening the dialog
- 						$('#monitorFrame').prop('src', '<lams:LAMSURL/>monitoring/monitoring.do?method=monitorLesson&lessonID='
- 								                         + $(this).dialog('option', 'lessonID'));
+ 					    // load contents after opening the dialog
+ 						monitorDialog.html(null);
+						$.ajax({
+							url : '<lams:LAMSURL/>monitoring/monitoring.do',
+							cache : false,
+							data : {
+	 							'method'   : 'monitorLesson',
+	 							'lessonID' : monitorDialog.dialog('option', 'lessonID')
+							},
+							success : function(response) {
+								monitorDialog.html(response);
+							}
+						});
  					},
  					'close' : function() {
  						// refresh if lesson was added
- 						if($(this).dialog('option', 'refresh')){
+ 						if(monitorDialog.dialog('option', 'refresh')){
  							refresh();
  						}
  					}
- 				}).closest('.ui-dialog').children('.ui-dialog-titlebar').remove();
+ 				});
+				monitorDialog.closest('.ui-dialog').children('.ui-dialog-titlebar').remove();
 			});
 		
 			function removeLesson(lessonID) {
-				
 				if (confirm("<fmt:message key="index.remove.lesson.confirm1"/>")) {
 					if (confirm("<fmt:message key="index.remove.lesson.confirm2"/>")) {
 				        $.ajax({
@@ -337,12 +354,8 @@
 	</div>
 </div>
 
-<div id="addLessonDialog" class="dialogContainer">
-	<iframe id="addLessonFrame"></iframe>
-</div>
-<div id="monitorDialog" class="dialogContainer">
-	<iframe id="monitorFrame"></iframe>
-</div>
+<div id="addLessonDialog" class="dialogContainer"></div>
+<div id="monitorDialog" class="dialogContainer"></div>
 
 </body>
 </lams:html>
\ No newline at end of file