Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rf501cc0e98c8cd9b45ca61b9e65ba742ab1c7f84 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f501cc0e98c8cd9b45ca61b9e65ba742ab1c7f84)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -496,6 +496,6 @@
 error.context.exists  =This URL context is taken
 config.learner.collapsible.progress.panel  =Set collapsible panel for progress bar in Learner
 config.authoring.suffix  =Add unique suffix when importing Learning Designs
+config.authoring.single.activity  =Allow creating single activity lessons
 
-
 #======= End labels: Exported 490 labels for en AU =====
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
Binary files differ
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rf501cc0e98c8cd9b45ca61b9e65ba742ab1c7f84 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f501cc0e98c8cd9b45ca61b9e65ba742ab1c7f84)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -282,6 +282,10 @@
 error.finish.date.passed  =The time allocated for this lesson has expired. You cannot access it anymore. Contact the instructor for assistance.
 index.emailnotifications  =Notifications
 index.emailnotifications.tooltip  =Email notifications
+index.single.activity.lesson.title =Add single activity lesson
+index.single.activity.lesson.prompt =Please enter a title for the lesson
+index.single.activity.lesson.prompt.blank =You must enter a title. If you do not want to save the lesson, click Cancel
+index.single.activity.lesson.desc =or one-click activity:
 label.portrait.please.wait  =Please wait
 label.portrait.take.snapshot.from.webcamera  =Take portrait using Webcam
 label.portrait.configure  =Configure
Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -130,6 +130,8 @@
 	    request.setAttribute("tools", getAuthoringService().getAllToolDTOs());
 	    request.setAttribute("orgBean", iob);
 	    request.setAttribute("allowSorting", allowSorting);
+	    request.setAttribute("singleActivityLessonsEnabled",
+		    Configuration.get(ConfigurationKeys.SINGLE_ACTIVITY_LESSONS_ENABLED));
 	}
 
 	return mapping.findForward(forwardPath);
Index: lams_central/web/css/index.css
===================================================================
diff -u
--- lams_central/web/css/index.css	(revision 0)
+++ lams_central/web/css/index.css	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -0,0 +1,130 @@
+#content-main {
+	padding: 10px;
+}
+
+td#messageCell {
+	width: 80%;
+}
+
+#message {
+	padding: 8px 10px 10px 40px;
+	text-align: left;
+	background: url('../images/css/edit.gif') no-repeat #d8e4f1 10px 8px;
+	border: 1px solid #3c78b5;
+}
+
+#linksCell div {
+	margin: 0 5px 15px 0;
+}
+
+.dialogContainer {
+	display: none;
+}
+
+.dialogContainer iframe {
+	width: 100%;
+	height: 100%;
+	border: none;
+}
+
+#mainContentTable td {
+	vertical-align: top;
+	padding: 0;
+}
+
+#orgTabs {
+	padding-right: 10px;
+}
+
+#orgTabs td {
+	padding: 0;
+	vertical-align: top;
+	font-family: verdana, arial, helvetica, sans-serif;
+}
+
+#orgTabs li.orgTabsHeader {
+	width: 150px;
+	white-space: normal;
+}
+
+#orgTabsPanelCell {
+	width: 100%;
+	border-left: none;
+}
+
+#content-main .row {
+	overflow: visible;
+}
+
+#content-main .row .split-menu-button {
+	margin-top: 6px;
+}
+
+#content-main .row .split-menu-button>ul {
+	margin: 0;
+}
+
+#content-main .row .split-menu-button ul li ul li {
+	padding-top: 0;
+	padding-bottom: 0;
+}
+
+#content-main .row .split-menu-button a.add-lesson-button {
+	border-top: none;
+	border-left: none;
+	padding-top: 0;
+}
+
+#content-main .row .split-menu-button a.add-lesson-button span {
+	display: block;
+	float: left;
+	padding-top: 4px;
+}
+
+#content-main .row .split-menu-button a.add-lesson-button img {
+	display: block;
+	float: right;
+	padding-top: 3px;
+}
+
+#content-main .row .split-menu-button ul.button-menu span {
+	padding-left: 5px;
+}
+
+#content-main div.j-course-contents {
+	clear: both;
+}
+
+.ui-tabs-vertical {
+	border: none;
+}
+
+.ui-tabs-vertical .ui-tabs-nav {
+	background: none;
+	border: none;
+}
+
+.ui-tabs-vertical .ui-tabs-nav li {
+	width: 100%;
+	margin-bottom: 7px;
+	border: 1px solid #C5DBEC;
+	padding: 3px 0 3px 0 !important;
+}
+
+.ui-tabs-vertical .ui-tabs-nav li.ui-tabs-active {
+	border: 1px solid #79B7E7;
+	border-right-width: 0px;
+	margin-bottom: 7px;
+	padding: 3px 0 3px 0 !important;
+}
+
+.ui-tabs-vertical .ui-tabs-nav li a {
+	display: block;
+	float: none;
+	border: none;
+}
+
+td#actionAccord {
+	width: 20%;
+	padding-top: 1px;
+}
\ No newline at end of file
Index: lams_central/web/includes/javascript/groupDisplay.js
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_central/web/includes/javascript/groupDisplay.js	(.../groupDisplay.js)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_central/web/includes/javascript/groupDisplay.js	(.../groupDisplay.js)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -428,9 +428,9 @@
 	if (save) {
 		var ldTitle = '';
 		while (ldTitle == '') {
-			ldTitle = prompt('Please enter a title for the lesson');
+			ldTitle = prompt(LABELS.SINGLE_ACTIVITY_LESSON_PROMPT);
 			if (ldTitle == '') {
-				alert('You must enter a title. If you do not want to save the lesson, click Cancel');
+				alert(LABELS.SINGLE_ACTIVITY_LESSON_PROMPT_BLANK);
 			}
 		}
 			
Index: lams_central/web/main2.jsp
===================================================================
diff -u -r4af02ecbccab467c19f535fd5c6bf38ab8e7ef7a -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_central/web/main2.jsp	(.../main2.jsp)	(revision 4af02ecbccab467c19f535fd5c6bf38ab8e7ef7a)
+++ lams_central/web/main2.jsp	(.../main2.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -26,100 +26,13 @@
 	</c:choose>
 	
 	<lams:css style="main" />
+	
 	<link rel="icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 	<link rel="stylesheet" href="<lams:LAMSURL/>/css/thickbox.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-redmond-theme.css" type="text/css" media="screen">
-	<style type="text/css">
-		#content-main {
-			padding: 10px;
-		}
-		
-		td#messageCell {
-			width:80%;
-		}
-		
-		#message {
-			padding:8px 10px 10px 40px;
-			text-align: left;
-			background: url('images/css/edit.gif') no-repeat #d8e4f1 10px 8px;
-			border: 1px solid #3c78b5;
-		}
-		
-		#linksCell div {
-			margin: 0 5px 15px 0;
-		}
-		
-		.dialogContainer {
-			display: none;
-		}
-		
-		.dialogContainer iframe {
-			width: 100%;
-			height: 100%;
-			border: none;
-		}
-		
-		#mainContentTable td {
-			vertical-align: top;
-			padding: 0;
-		}
-		
-		#orgTabs {
-			padding-right: 10px;
-		}
-		
-		#orgTabs td {
-			padding: 0;
-			vertical-align: top;
-			font-family: verdana,arial,helvetica,sans-serif;
-		}
-		
-		#orgTabs li {
-			width: 150px;
-			white-space: normal;
-		}
-		
-		#orgTabsPanelCell {
-			width: 100%;
-			border-left: none;
-		}
-		
-		.ui-tabs-vertical {
-			border: none;
-		}
-		
-		.ui-tabs-vertical .ui-tabs-nav {
-			background: none;
-			border: none;
-		}
-		
-		.ui-tabs-vertical .ui-tabs-nav li {
-			width: 100%;
-			margin-bottom: 7px;
-			border: 1px solid #C5DBEC;
-			padding: 3px 0 3px 0 !important;
-			
-		}
-		
-		.ui-tabs-vertical .ui-tabs-nav li.ui-tabs-active {
-			border: 1px solid #79B7E7;
-			border-right-width: 0px;
-			margin-bottom: 7px;
-			padding: 3px 0 3px 0 !important;
-		}	
-			
-		.ui-tabs-vertical .ui-tabs-nav li a {
-			display: block;
-			float: none;
-			border: none;
-		}
-		
-		td#actionAccord {
-			width: 20%;
-			padding-top: 1px;
-		}
-	</style>
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/index.css" type="text/css" media="screen">
+
 	<script language="JavaScript" type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
 	<script language="javascript" type="text/javascript" src="loadVars.jsp"></script>
 	<script language="JavaScript" type="text/javascript" src="includes/javascript/openUrls.js"></script>
@@ -136,11 +49,14 @@
 					REMOVE_LESSON_CONFIRM1 : '<fmt:message key="index.remove.lesson.confirm1"/>',
 					REMOVE_LESSON_CONFIRM2 : '<fmt:message key="index.remove.lesson.confirm2"/>',
 					SORTING_ENABLE : '<fmt:message key="label.enable.lesson.sorting"/>',
-					SORTING_DISABLE : '<fmt:message key="label.disable.lesson.sorting"/>'
+					SORTING_DISABLE : '<fmt:message key="label.disable.lesson.sorting"/>',
+					SINGLE_ACTIVITY_LESSON_TITLE : '<fmt:message key="index.single.activity.lesson.title"/>',
+					SINGLE_ACTIVITY_LESSON_PROMPT : '<fmt:message key="index.single.activity.lesson.prompt"/>',
+					SINGLE_ACTIVITY_LESSON_PROMTP_BLANK : '<fmt:message key="index.single.activity.lesson.prompt.blank"/>'
 			}
 			
 			var tabName = '${tab}';
-			var stateId = tabName == 'profile' ? 3 : 1; 
+			var stateId = tabName == 'profile' ? 3 : 1;
 
 			$(document).ready(function(){
 				initMainPage();
@@ -215,12 +131,12 @@
 				<div class="${tabLeft}"></div>
 				<div class="${tabMiddle}">
 						<c:choose>
-						<c:when test="${fn:startsWith(headerlink.name,'index')}">
-							<lams:TabName url="${headerlink.url}" highlight="${highlight}"><fmt:message key="${headerlink.name}" /></lams:TabName>
-						</c:when>
-						<c:otherwise>
-							<lams:TabName url="${headerlink.url}" highlight="${highlight}"><c:out value="${headerlink.name}" /></lams:TabName>						
-						</c:otherwise>
+							<c:when test="${fn:startsWith(headerlink.name,'index')}">
+								<lams:TabName url="${headerlink.url}" highlight="${highlight}"><fmt:message key="${headerlink.name}" /></lams:TabName>
+							</c:when>
+							<c:otherwise>
+								<lams:TabName url="${headerlink.url}" highlight="${highlight}"><c:out value="${headerlink.name}" /></lams:TabName>						
+							</c:otherwise>
 						</c:choose>
 				</div>
 				<div class="${tabRight}"></div>
@@ -254,7 +170,7 @@
 						</c:forEach>
 					</c:if>
 					<div>
-						<a title="<fmt:message key="index.refresh.hint"/>" href="javascript:refresh()" class="button">
+						<a title="<fmt:message key="index.refresh.hint"/>" href="javascript:loadOrgTab(null, true)" class="button">
 							<fmt:message key="index.refresh" />
 						</a>
 					</div>
@@ -274,16 +190,16 @@
 							<tr>
 								<td>
 									<ul>
-										<c:forEach items="${collapsedOrgDTOs}" var="dto">
-											<li>
-												<a href="#orgTab-${dto.orgId}"><c:out value="${dto.orgName}" /></a>
+										<c:forEach items="${collapsedOrgDTOs}" var="dto" varStatus="status">
+											<li class="orgTabsHeader">
+												<a href="#orgTab-${status.index}-${dto.orgId}"><c:out value="${dto.orgName}" /></a>
 											</li>
 										</c:forEach>
 									</ul>
 								</td>
 								<td id="orgTabsPanelCell" class="ui-widget-content ui-corner-all">
-									<c:forEach items="${collapsedOrgDTOs}" var="dto">
-										<div id="orgTab-${dto.orgId}" class="orgTab"></div>
+									<c:forEach items="${collapsedOrgDTOs}" var="dto" varStatus="status">
+										<div id="orgTab-${status.index}-${dto.orgId}" class="orgTab"></div>
 									</c:forEach>
 								</td>
 							</tr>
@@ -331,6 +247,9 @@
 <div id="addLessonDialog" class="dialogContainer">
 	<iframe id="addLessonFrame"></iframe>
 </div>
+<div id="addSingleActivityLessonDialog" class="dialogContainer">
+	<iframe id="addSingleActivityLessonFrame"></iframe>
+</div>
 <div id="monitorDialog" class="dialogContainer">
 	<iframe id="monitorFrame"></iframe>
 </div>
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040017.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040017.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040017.sql	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -0,0 +1,13 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+
+-- 	LDEV-3070 Allow single activity lesson creation on redesigned index page
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('SingleActivityLessonsEnabled','false', 'config.authoring.single.activity', 'config.header.features', 'BOOLEAN', 0);
+
+-- If there were no errors, commit and restore autocommit to on
+SET FOREIGN_KEY_CHECKS=0;
+COMMIT;
+SET AUTOCOMMIT = 1;
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
diff -u -r4380bee72735f5311cf4f474a711c38fe33a8585 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision 4380bee72735f5311cf4f474a711c38fe33a8585)
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -284,4 +284,7 @@
     // CNG-26 Add to lams_configuration and set to false
     // if you don't want imported LD to have _<timestamp>_<seq_number> appended
     public static String SUFFIX_IMPORTED_LD = "SuffixImportedLD";
+    
+    // LDEV-3070 Allow single activity lesson creation on redesigned index page
+    public static String SINGLE_ACTIVITY_LESSONS_ENABLED = "SingleActivityLessonsEnabled";
 }
\ No newline at end of file
Index: lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp
===================================================================
diff -u -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp	(.../overallfeedbacklist.jsp)	(revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0)
+++ lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp	(.../overallfeedbacklist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -102,7 +102,7 @@
 	var obj = window.document.getElementById('advancedInputArea');
 	if (!obj && window.parent) {
 		 obj = window.parent.document.getElementById('advancedInputArea');
-	} 
+	}  
 	if (!obj) {
 		obj = window.top.document.getElementById('advancedInputArea');
 	}
Index: lams_tool_chat/web/pages/authoring/addCondition.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_chat/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_chat/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -15,6 +15,20 @@
 		<link href="${tool}includes/css/chat.css" rel="stylesheet" type="text/css">
 		<lams:headItems />
 		<lams:css style="tabbed" />
+		
+		<script type="text/javascript"> 
+			function callHideConditionMessage() {
+				var win = null;
+				if (window.hideConditionMessage) {
+					win = window;
+				} else if (window.parent && window.parent.hideConditionMessage) {
+					win = window.parent;
+				} else {
+					win = window.top;
+				}
+				win.hideConditionMessage();
+			}
+		</script>
 	</lams:head>
 	<body class="tabpart">
 		<!-- Basic Info Form-->
@@ -38,7 +52,7 @@
 		<lams:ImgButtonWrapper>
 			<a href="javascript:;" onclick="javascript:chatConditionForm.submit();" class="button-add-item"><fmt:message
 					key="button.save" /> </a>
-			<a href="javascript:;" onclick="javascript:window.hideConditionMessage ? window.hideConditionMessage() : window.top.hideConditionMessage()"
+			<a href="javascript:;" onclick="javascript:callHideConditionMessage()"
 				class="button space-left"><fmt:message key="label.cancel" /> </a>
 		</lams:ImgButtonWrapper>
 	</body>
Index: lams_tool_chat/web/pages/authoring/conditionList.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_chat/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_chat/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -82,10 +82,15 @@
 
 <%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
 <script type="text/javascript">
-	var win = window.hideConditionMessage ? window : window.top;
-	if (win.hideConditionMessage != null){
-		win.hideConditionMessage();
-		var obj = win.document.getElementById('conditionsArea');
-		obj.innerHTML= document.getElementById("conditionList").innerHTML;
-	}
+	var win = null;
+	if (window.hideConditionMessage) {
+		win = window;
+	} else if (window.parent && window.parent.hideConditionMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
+	} 
+	win.hideConditionMessage();
+	var obj = win.document.getElementById('conditionsArea');
+	obj.innerHTML= document.getElementById("conditionList").innerHTML;
 </script>
Index: lams_tool_daco/web/includes/javascript/dacoAuthoring.js
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_daco/web/includes/javascript/dacoAuthoring.js	(.../dacoAuthoring.js)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_daco/web/includes/javascript/dacoAuthoring.js	(.../dacoAuthoring.js)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -15,11 +15,14 @@
 	
 	//Resizes the question input area so it is visible on the screen.
 	function resizeQuestionInputArea (){
-		var questionInputArea = window.document.getElementById('questionInputArea');
-		if (!questionInputArea) { 
-			questionInputArea = window.top.document.getElementById('questionInputArea');
+		var obj = window.document.getElementById('questionInputArea');
+		if (!obj && window.parent) { 
+			 obj = window.parent.document.getElementById('questionInputArea');
+		}  
+		if (!obj) {
+			obj = window.top.document.getElementById('questionInputArea');
 		}
-		questionInputArea.style.height=questionInputArea.contentWindow.document.body.scrollHeight+10+'px';
+		obj.style.height=obj.contentWindow.document.body.scrollHeight + 10 + 'px';
 	}
 	
 	//Checks if the additional options area has all the default values, so it may stay hidden
Index: lams_tool_daco/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_daco/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0)
+++ lams_tool_daco/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -68,10 +68,15 @@
 
 <%-- This script will work when a new question is submited in order to refresh "Question List" panel. --%>
 <script type="text/javascript">
-	var win = window.hideMessage ? window : window.top;
-	if (win.hideMessage != null){
-		win.hideQuestionInputArea();
-		var obj = win.document.getElementById('questionListArea');
-		obj.innerHTML= document.getElementById("questionList").innerHTML;
+	var win = null;
+	if (window.hideQuestionInputArea) { 
+		win = window;
+	} else if (window.parent && window.parent.hideQuestionInputArea) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideQuestionInputArea();
+	var obj = win.document.getElementById('questionListArea');
+	obj.innerHTML= document.getElementById("questionList").innerHTML;
 </script>
\ No newline at end of file
Index: lams_tool_eadventure/web/includes/javascript/eadventureitem.js
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_eadventure/web/includes/javascript/eadventureitem.js	(.../eadventureitem.js)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_eadventure/web/includes/javascript/eadventureitem.js	(.../eadventureitem.js)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -42,7 +42,10 @@
 	}
 	function adjustInstructionsDisplayAreaHeight(adjustAmount){
 		var obj = window.document.getElementById('reourceInputArea');
-		if (!obj) { 
+		if (!obj && window.parent) { 
+			 obj = window.parent.document.getElementById('reourceInputArea');
+		}  
+		if (!obj) {
 			obj = window.top.document.getElementById('reourceInputArea');
 		}
 		obj.style.height=obj.contentWindow.document.body.scrollHeight+adjustAmount+'px';
@@ -93,11 +96,14 @@
 	}
 	
 	function cancelEadventureGame(){
-		if (window.hideMessage) {
-			window.hideMessage();
-			window.showGame();
+		var win = null;
+		if (window.hideMessage) { 
+			win = window;
+		} else if (window.parent && window.parent.hideMessage) {
+			win = window.parent;
 		} else {
-			window.top.hideMessage();
-			window.top.showGame();
+			win = window.top;
 		}
+		win.hideMessage();
+		win.showGame();
 	}
\ No newline at end of file
Index: lams_tool_eadventure/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_eadventure/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_eadventure/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -45,12 +45,15 @@
 		}
 		
 		function hideShowGame(){
-			var area= window.document.getElementById("addGame");
-			if (!area) { 
-				area = window.top.document.getElementById("addGame");
+			var obj = window.document.getElementById('addGame');
+			if (!obj && window.parent) {
+				 obj = window.parent.document.getElementById('addGame');
+			}  
+			if (!obj) {
+				obj = window.top.document.getElementById('addGame');
 			}
-			if(area != null){
-				area.style.display="none";
+			if (obj){
+				obj.style.display="none";
 			}
 		}
 
Index: lams_tool_eadventure/web/pages/authoring/parts/addcondition.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_eadventure/web/pages/authoring/parts/addcondition.jsp	(.../addcondition.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_eadventure/web/pages/authoring/parts/addcondition.jsp	(.../addcondition.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -7,7 +7,19 @@
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
 		
-
+		<script type="text/javascript"> 
+			function callHideConditionMessage() {
+				var win = null;
+				if (window.hideConditionMessage) {
+					win = window;
+				} else if (window.parent && window.parent.hideConditionMessage) {
+					win = window.parent;
+				} else {
+					win = window.top;
+				}
+				win.hideConditionMessage();
+			}
+		</script>
 	</lams:head>
 	<body class="tabpart">
 		<!-- Basic Info Form-->
@@ -41,7 +53,7 @@
 		<lams:ImgButtonWrapper>
 			<a href="#" onclick="eadventureConditionForm.submit();" class="button-add-item"><fmt:message
 					key="button.add" /> </a>
-			<a href="javascript:;" onclick="window.hideConditionMessage ? window.hideConditionMessage() : window.top.hideConditionMessage()"
+			<a href="javascript:;" onclick="javascript:callHideConditionMessage()"
 				class="button space-left"><fmt:message key="label.cancel" /> </a>
 		</lams:ImgButtonWrapper>
 	</body>
Index: lams_tool_eadventure/web/pages/authoring/parts/conditionlist.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_eadventure/web/pages/authoring/parts/conditionlist.jsp	(.../conditionlist.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_eadventure/web/pages/authoring/parts/conditionlist.jsp	(.../conditionlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -83,10 +83,15 @@
 
 
 <script lang="javascript">
-	var win = window.hideConditionMessage ? window : window.top;
-	if (win.hideConditionMessage != null){
-		win.hideConditionMessage();
-		var obj = win.document.getElementById('conditionsArea');
-		obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	var win = null;
+	if (window.hideConditionMessage) {
+		win = window;
+	} else if (window.parent && window.parent.hideConditionMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideConditionMessage();
+	var obj = win.document.getElementById('conditionsArea');
+	obj.innerHTML= document.getElementById("conditionList").innerHTML;
 </script>
Index: lams_tool_eadventure/web/pages/authoring/parts/editexpression-vieja.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_eadventure/web/pages/authoring/parts/editexpression-vieja.jsp	(.../editexpression-vieja.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_eadventure/web/pages/authoring/parts/editexpression-vieja.jsp	(.../editexpression-vieja.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -7,70 +7,26 @@
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
 		
-		
+		<script type="text/javascript"> 
+			function callHideExpressionMessage() {
+				var win = null;
+				if (window.hideExpressionMessage) {
+					win = window;
+				} else if (window.parent && window.parent.hideExpressionMessage) {
+					win = window.parent;
+				} else {
+					win = window.top;
+				}
+				win.hideExpressionMessage();
+			}
+		</script>
 	</lams:head>
 	<body class="tabpart">
 		<!-- Basic Info Form-->
 		<%@ include file="/common/messages.jsp"%>
 		<html:form action="/authoring/saveOrUpdateExpression" method="post" styleId="eadventureExpressionForm" >
-				<html:hidden property="sessionMapID" />
-			<!--<html:hidden property="sessionMapID" />
-			<h2 class="no-space-left">
-				<fmt:message key="label.authoring.conditions.add.expression" />
-			</h2>
-			<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-			
-			<!--<div id="editExpression">-->
+			<html:hidden property="sessionMapID" />
 	
-			<!--<table>
-				<tr>
-					<td>
-						<fmt:message key="label.authoring.conditions.condition.var1" />
-						<c:set var="url">
-						<html:rewrite
-							page="/authoring/prepareOperatorAndSecondVar.do?sessionMapID=${sessionMapID}" />
-						</c:set>
-						
-					</td>
-					<!--<td>
-					<fmt:message key="label.authoring.conditions.condition.operator" />
-						<c:if test="${empty eadventureExpressionForm.possibleOperator }">
-						<html:select property="selectedOperator" >
-							<logic:iterate name="eadventureExpressionForm" id="varOp" property="possibleOperator"> 
-							<html:option value="varOp" >
-								<bean:write name="varOp" />
-							</html:option>
-							</logic:iterate>
-						</html:select>
-						</c:if>
-					</td>
-					<td>
-					<fmt:message key="label.authoring.conditions.condition.var2" />
-					<c:if test="${empty eadventureExpressionForm.possibleVarOp2 }">
-						<div id="selectVar">
-						<html:select property="selectedVarOp2" >
-							<logic:iterate name="eadventureExpressionForm" id="varOp2" property="possibleVarsOp2"> 
-							<html:option value="varOp2" >
-								<bean:write name="varOp2" />
-							</html:option>
-							</logic:iterate>
-						</html:select>
-						</div>
-					</c:if>
-						<div id="introduceVar">
-							<html:text property="introducedValue" style="width: 99%;"></html:text>
-						</div>
-						<input type="checkbox" name="check" onclick="javascript:changeSecondOp()"/>
-					</td>
-					<td>
-					<fmt:message key="label.authoring.conditions.empty.condition.var1" />
-					<c:if test="${empty formBean.selectedVarOp1 }">
-					
-					</c:if>
-					</td>
-				</tr>
-			</table>
-			<!--</div>-->
 			<div class="small-space-bottom">
          		<html:text property="name" size="55"/>
 			</div>
@@ -89,7 +45,7 @@
 		<lams:ImgButtonWrapper>
 			<a href="#" onclick="eadventureExpressionForm.submit();" class="button-add-item"><fmt:message
 					key="button.add" /> </a>
-			<a href="javascript:;" onclick="window.hideExpressionMessage ? window.hideExpressionMessage() : window.top.hideExpressionMessage()"
+			<a href="javascript:;" onclick="javascript:callHideExpressionMessage()"
 				class="button space-left"><fmt:message key="label.cancel" /> </a>
 		</lams:ImgButtonWrapper>
 		
Index: lams_tool_eadventure/web/pages/authoring/parts/editexpression.jsp
===================================================================
diff -u -r7322054ababd8f5387c3424cdd38d99c3ab49e02 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_eadventure/web/pages/authoring/parts/editexpression.jsp	(.../editexpression.jsp)	(revision 7322054ababd8f5387c3424cdd38d99c3ab49e02)
+++ lams_tool_eadventure/web/pages/authoring/parts/editexpression.jsp	(.../editexpression.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -21,8 +21,8 @@
 			if(area != null && option!="no-option" ){
 				area.src=url;
 			}
-			
-			window.top.document.location.hash = "expressionInputArea";
+			var win = window.top ? window.top : window;
+			win.document.location.hash = "expressionInputArea";
 		}
 		
 		function changeSecondOp(){
@@ -39,7 +39,8 @@
 		
 		function submitExpression(){
 		var eadventureExpressionForm = document.getElementById("eadventureExpressionForm");
-			window.top.document.location.hash = "conditionInputArea";
+			var win = window.top ? window.top : window;
+			win.top.document.location.hash = "conditionInputArea";
 			if (eadventureExpressionForm.group!= null){
 			if(eadventureExpressionForm.group[0].checked){
 				eadventureExpressionForm.secondVarSelected.value = false;
Index: lams_tool_eadventure/web/pages/authoring/parts/editgame.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_eadventure/web/pages/authoring/parts/editgame.jsp	(.../editgame.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_eadventure/web/pages/authoring/parts/editgame.jsp	(.../editgame.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -18,7 +18,15 @@
 	<body class="tabpart">
 
 	<script lang="javascript">
-		window.hideShowGame ? window.hideShowGame() : window.top.hideShowGame();
+		var win = null;
+		if (window.hideShowGame) {
+			win = window;
+		} else if (window.parent && window.parent.hideShowGame) {
+			win = window.parent;
+		} else {
+			win = window.top;
+		}
+		win.hideShowGame();
 	</script>
 		<!-- Basic Info Form-->
 		<%@ include file="/common/messages.jsp"%>
Index: lams_tool_eadventure/web/pages/authoring/parts/expression-vieja.jsp
===================================================================
diff -u -r7322054ababd8f5387c3424cdd38d99c3ab49e02 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_eadventure/web/pages/authoring/parts/expression-vieja.jsp	(.../expression-vieja.jsp)	(revision 7322054ababd8f5387c3424cdd38d99c3ab49e02)
+++ lams_tool_eadventure/web/pages/authoring/parts/expression-vieja.jsp	(.../expression-vieja.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -14,11 +14,9 @@
 			if (elem != null) {
 				elem.style.display="none";
 			}
-			var quitar = location.hash;
-			var loque = window.top.document.location.hash ;
-			location.hash = "expressionInputArea";
-			//var soloporhacerhueco = document.getElementById("conditionInputArea");
 			
+			var win = window.top ? window.top : window;
+			win.document.location.hash = "expressionInputArea";
 		}
 		function hideExpressionMessage(){
 			var area=document.getElementById("expressionInputArea");
Index: lams_tool_eadventure/web/pages/authoring/parts/expression.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_eadventure/web/pages/authoring/parts/expression.jsp	(.../expression.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_eadventure/web/pages/authoring/parts/expression.jsp	(.../expression.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -14,11 +14,10 @@
 			if (elem != null) {
 				elem.style.display="none";
 			}
-			
-			window.top.document.location.hash = "expressionInputArea";
-			
-			
+			var win = window.top ? window.top : window;
+			win.document.location.hash = "expressionInputArea";
 		}
+		
 		function hideExpressionMessage(){
 			var area=document.getElementById("expressionInputArea");
 			if(area != null){
@@ -50,9 +49,12 @@
 		    		method:'get',
 		    		parameters:param,
 		    		onComplete: function(resp){
-		    			var obj = window.document.getElementById("conditionInputArea");
+		    			var obj = window.document.getElementById('conditionInputArea');
+		    			if (!obj && window.parent) {
+		    				 obj = window.parent.document.getElementById('conditionInputArea');
+		    			}  
 		    			if (!obj) {
-		    				obj = window.top.document.getElementById("conditionInputArea");
+		    				obj = window.top.document.getElementById('conditionInputArea');
 		    			}
 		    			obj.contentDocument.getElementById("expressionArea").innerHTML  = resp.responseText;
 		    			obj.contentWindow.hideExpressionMessage();
@@ -82,9 +84,12 @@
 		    		method:'get',
 		    		parameters:param,
 		    		onComplete: function(resp){
-		    			var obj = window.document.getElementById("conditionInputArea");
+		    			var obj = window.document.getElementById('conditionInputArea');
+		    			if (!obj && window.parent) {
+		    				 obj = window.parent.document.getElementById('conditionInputArea');
+		    			}  
 		    			if (!obj) {
-		    				obj = window.top.document.getElementById("conditionInputArea");
+		    				obj = window.top.document.getElementById('conditionInputArea');
 		    			}
 						obj.contentDocument.getElementById("expressionArea").innerHTML  = resp.responseText;
 					},
@@ -103,9 +108,12 @@
 		    		method:'get',
 		    		parameters:param,
 		    		onComplete: function(resp){
-		    			var obj = window.document.getElementById("conditionInputArea");
+		    			var obj = window.document.getElementById('conditionInputArea');
+		    			if (!obj && window.parent) {
+		    				 obj = window.parent.document.getElementById('conditionInputArea');
+		    			}  
 		    			if (!obj) {
-		    				obj = window.top.document.getElementById("conditionInputArea");
+		    				obj = window.top.document.getElementById('conditionInputArea');
 		    			}
 						obj.contentDocument.getElementById("expressionArea").innerHTML  = resp.responseText;
 					},
Index: lams_tool_eadventure/web/pages/authoring/parts/expressionlist.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_eadventure/web/pages/authoring/parts/expressionlist.jsp	(.../expressionlist.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_eadventure/web/pages/authoring/parts/expressionlist.jsp	(.../expressionlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -100,12 +100,14 @@
 
 
 <script lang="javascript">
-			var area = window.document.getElementById("conditionInputArea");
-			if (!area) {
-				area = window.top.document.getElementById("conditionInputArea");
-			}
-			area.contentWindow.hideExpressionMessage();
-			var frame = area.contentDocument;
-			var obj = frame.getElementById("expressionArea");
-			obj.innerHTML= document.getElementById("expressionList").innerHTML;
+	var area = window.document.getElementById('conditionInputArea');
+	if (!area && window.parent) {
+		area = window.parent.document.getElementById('conditionInputArea');
+	}  
+	if (!area) {
+		area = window.top.document.getElementById('conditionInputArea');
+	}
+	area.contentWindow.hideExpressionMessage();
+	var obj = area.contentDocument.getElementById("expressionArea");
+	obj.innerHTML = document.getElementById("expressionList").innerHTML;
 </script>
\ No newline at end of file
Index: lams_tool_eadventure/web/pages/authoring/parts/gamearea.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_eadventure/web/pages/authoring/parts/gamearea.jsp	(.../gamearea.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_eadventure/web/pages/authoring/parts/gamearea.jsp	(.../gamearea.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -8,7 +8,15 @@
 	<!-- No se xk no coge el atrubuto delete, ver que pasa-->
 	<c:if test="${gameDelete == 1}">
 	<script lang="javascript">
-		window.forceEmptyTable ? window.forceEmptyTable() : window.top.forceEmptyTable();
+		var win = null;
+		if (window.forceEmptyTable) { 
+			win = window;
+		} else if (window.parent && window.parent.forceEmptyTable) {
+			win = window.parent;
+		} else {
+			win = window.top;
+		}
+		win.forceEmptyTable();
 	</script>
 	
 	
@@ -18,7 +26,15 @@
 			
 		<!-- show the conditions add button -->
 		<script lang="javascript">
-			window.showConditionsAddButton ? window.showConditionsAddButton() : window.top.showConditionsAddButton();
+			var win = null;
+			if (window.showConditionsAddButton) { 
+				win = window;
+			} else if (window.parent && window.parent.showConditionsAddButton) {
+				win = window.parent;
+			} else {
+				win = window.top;
+			}
+			win.showConditionsAddButton();
 		</script>
 			
 		<table border="0" style="align:left;width:400px">
@@ -44,13 +60,16 @@
 		<c:otherwise>
 				<!-- show the conditions add button -->
 				<script lang="javascript">
-					if (window.hideConditionsAddButton){
-						window.hideConditionsAddButton();
-						window.forceEmptyTable();
+					var win = null;
+					if (window.hideConditionsAddButton) {
+						win = window;
+					} else if (window.parent && window.parent.hideConditionsAddButton) {
+						win = window.parent;
 					} else {
-						window.top.hideConditionsAddButton();
-						window.top.forceEmptyTable();
+						win = window.top;
 					}
+					win.hideConditionsAddButton();
+					win.forceEmptyTable();
 				</script>
 			<p align="small-space-bottom">
 				<a href="javascript:showMessage('<html:rewrite page="/authoring/editGameInit.do?sessionMapID=${sessionMapID}"/>');"  class="button-add-item">
@@ -61,11 +80,17 @@
 	</c:choose>
 </div>			
 <script lang="javascript">
-	var win = window.hideMessage ? window : window.top;
-	if (win.hideMessage != null){
-		win.hideMessage();
-		win.showGame();
-		var obj = win.document.getElementById('addGame');
-		obj.innerHTML= document.getElementById("showGame").innerHTML;
+	var win = null;
+	if (window.hideMessage) { 
+		win = window;
+	} else if (window.parent && window.parent.hideMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideMessage();
+	win.showGame();
+	var obj = win.document.getElementById('addGame');
+	obj.innerHTML= document.getElementById("showGame").innerHTML;
+	
 </script>
\ No newline at end of file
Index: lams_tool_eadventure/web/pages/authoring/parts/instructions.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_eadventure/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_eadventure/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -77,7 +77,10 @@
 <script type="text/javascript">
 	document.getElementById("instructionCount").value = "${listSize}";
 	var obj = window.document.getElementById('reourceInputArea');
-	if (!obj) { 
+	if (!obj && window.parent) {
+		 obj = window.parent.document.getElementById('reourceInputArea');
+	}  
+	if (!obj) {
 		obj = window.top.document.getElementById('reourceInputArea');
 	}
 	obj.style.height=obj.contentWindow.document.body.scrollHeight+'px';
Index: lams_tool_eadventure/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_eadventure/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_eadventure/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -39,12 +39,17 @@
 
 <%-- This script will works when a new resoruce item submit in order to refresh "Eadventure List" panel. --%>
 <script lang="javascript">
-	var win = window.hideMessage ? window : window.top;
-	if (win.hideMessage != null){
-		win.hideMessage();
-		var obj = win.document.getElementById('eadventureListArea');
-		obj.innerHTML= document.getElementById("itemList").innerHTML;
-		win.document.getElementById('addGame').hide();
+	var win = null;
+	if (window.hideMessage) { 
+		win = window;
+	} else if (window.parent && window.parent.hideMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideMessage();
+	var obj = win.document.getElementById('eadventureListArea');
+	obj.innerHTML= document.getElementById("itemList").innerHTML;
+	win.document.getElementById('addGame').hide();
 </script>
 
Index: lams_tool_forum/web/jsps/authoring/message/topiclist.jsp
===================================================================
diff -u -r74865706e83891b502e67d75cad229ca6d6ddcd9 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision 74865706e83891b502e67d75cad229ca6d6ddcd9)
+++ lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -65,7 +65,7 @@
 <%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
 <script lang="javascript">
 	var win = null;
-	if (window.hideMessage) {
+	if (window.hideMessage) { 
 		win = window;
 	} else if (window.parent && window.parent.hideMessage) {
 		win = window.parent;
Index: lams_tool_images/web/includes/javascript/imageGalleryitem.js
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_images/web/includes/javascript/imageGalleryitem.js	(.../imageGalleryitem.js)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_images/web/includes/javascript/imageGalleryitem.js	(.../imageGalleryitem.js)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -25,16 +25,28 @@
 	}
 	
 	function cancelImageGalleryItem(){
-		window.hidenMessage ? window.hideMessage() : window.top.hideMessage();
+		var win = null;
+		if (window.hideMessage) { 
+			win = window;
+		} else if (window.parent && window.parent.hideMessage) {
+			win = window.parent;
+		} else {
+			win = window.top;
+		}
+		win.hideMessage();
 	}
 	/**
 	 * Launches the popup window for the instruction files
 	 */
 	function showMessage(url) {
-		var area=window.document.getElementById("reourceInputArea");
+		var area = window.document.getElementById('reourceInputArea');
 		var elem = window.document.getElementById("saveCancelButtons");
-		if (!area)  {
-			area = window.top.document.getElementById("reourceInputArea");
+		if (!area && window.parent) {
+			area = window.parent.document.getElementById('reourceInputArea');
+			elem = window.parent.document.getElementById("saveCancelButtons");
+		}  
+		if (!area) {
+			obj = window.top.document.getElementById('reourceInputArea');
 			elem = window.top.document.getElementById("saveCancelButtons");
 		}
 		
Index: lams_tool_images/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_images/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_images/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -78,13 +78,19 @@
 
 <%-- This script will works when a new resoruce item submit in order to refresh "ImageGallery List" panel. --%>
 <script lang="javascript">
-	var win = window.hideMessage ? window : window.top;
-	if (win.hideMessage != null){
-		win.hideMessage();
-		var obj = win.document.getElementById('imageGalleryListArea');
-		obj.innerHTML= document.getElementById("itemList").innerHTML;
-		
-		//call it from parent window as this one was just hidden
-		win.initLytebox();
+	var win = null;
+	if (window.hideMessage) { 
+		win = window;
+	} else if (window.parent && window.parent.hideMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideMessage();
+	var obj = win.document.getElementById('imageGalleryListArea');
+	obj.innerHTML= document.getElementById("itemList").innerHTML;
+	
+	//call it from parent window as this one was just hidden
+	win.initLytebox();
+	
 </script>
Index: lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -124,10 +124,15 @@
 
 <%-- This script will works when a new resoruce item submit in order to refresh "CommonCartridge List" panel. --%>
 <script lang="javascript">
-	var win = window.hideMessage ? window : window.top;
-	if (win.hideMessage != null){
-		win.hideMessage();
-		var obj = win.document.getElementById('commonCartridgeListArea');
-		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	var win = null;
+	if (window.hideMessage) { 
+		win = window;
+	} else if (window.parent && window.parent.hideMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideMessage();
+	var obj = win.document.getElementById('commonCartridgeListArea');
+	obj.innerHTML= document.getElementById("itemList").innerHTML;
 </script>
Index: lams_tool_lamc/web/monitoring/itemlist.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_lamc/web/monitoring/itemlist.jsp	(.../itemlist.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_lamc/web/monitoring/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -96,11 +96,15 @@
 </div>
 <%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
 <script lang="javascript">
-	var win = window.hideMessage ? window : window.top;
-	if (win.hideMessage != null){
-		win.hideMessage();
-		var obj = win.document.getElementById('resourceListArea');
-		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	var win = null;
+	if (window.hideMessage) { 
+		win = window;
+	} else if (window.parent && window.parent.hideMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
-</script>
-
+	win.hideMessage();
+	var obj = win.document.getElementById('resourceListArea');
+	obj.innerHTML= document.getElementById("itemList").innerHTML;
+</script>
\ No newline at end of file
Index: lams_tool_laqa/web/authoring/addCondition.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_laqa/web/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_laqa/web/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -6,7 +6,19 @@
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
-
+		<script type="text/javascript"> 
+			function callHideConditionMessage() {
+				var win = null;
+				if (window.hideConditionMessage) {
+					win = window;
+				} else if (window.parent && window.parent.hideConditionMessage) {
+					win = window.parent;
+				} else {
+					win = window.top;
+				}
+				win.hideConditionMessage();
+			}
+		</script>
 	</lams:head>
 	<body class="tabpart">
 		<!-- Basic Info Form-->
@@ -40,7 +52,7 @@
 		<lams:ImgButtonWrapper>
 			<a href="javascript:;" onclick="javascript:QaConditionForm.submit();" class="button-add-item"><fmt:message
 					key="label.save.question" /> </a>
-			<a href="javascript:;" onclick="javascript:window.hideConditionMessage ? window.hideConditionMessage() : window.top.hideConditionMessage()"
+			<a href="javascript:;" onclick="javascript:callHideConditionMessage()"
 				class="button space-left"><fmt:message key="label.cancel" /> </a>
 		</lams:ImgButtonWrapper>
 	</body>
Index: lams_tool_laqa/web/authoring/conditionList.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_laqa/web/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_laqa/web/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -83,10 +83,15 @@
 
 <%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
 <script lang="javascript">
-	var win = window.hideConditionMessage ? window : window.top;
-	if (win.hideConditionMessage != null){
-		win.hideConditionMessage();
-		var obj = win.document.getElementById('conditionsArea');
-		obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	var win = null;
+	if (window.hideConditionMessage) {
+		win = window;
+	} else if (window.parent && window.parent.hideConditionMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
-</script>
+	win.hideConditionMessage();
+	var obj = win.document.getElementById('conditionsArea');
+	obj.innerHTML= document.getElementById("conditionList").innerHTML;
+</script>
\ No newline at end of file
Index: lams_tool_laqa/web/authoring/itemlist.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_laqa/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_laqa/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -104,10 +104,15 @@
 </div>
 <%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
 <script lang="javascript">
-	var win = window.hideMessage ? window : window.top;
-	if (win.hideMessage != null){
-		win.hideMessage();
-		var obj = win.document.getElementById('resourceListArea');
-		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	var win = null;
+	if (window.hideMessage) { 
+		win = window;
+	} else if (window.parent && window.parent.hideMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideMessage();
+	var obj = win.document.getElementById('resourceListArea');
+	obj.innerHTML= document.getElementById("itemList").innerHTML;
 </script>
Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -100,8 +100,17 @@
                             {
                                 heightOffSet = document.getElementById('wizardDiv').offsetHeight;
                             }
-                            window.resizeIframe ? window.resizeIframe(heightOffSet) : window.top.resizeIframe(heightOffSet);
-                            heightOffSet = heightOffSet * -1;
+                            
+                        	var win = null;
+                        	if (window.resizeIframe) { 
+                        		win = window;
+                        	} else if (window.parent && window.parent.resizeIframe) {
+                        		win = window.parent;
+                        	} else {
+                        		win = window.top;
+                        	}
+                        	win.resizeIframe(heightOffSet);
+                        	heightOffSet = heightOffSet * -1;
                         });
                     });
                     
Index: lams_tool_laqa/web/monitoring/itemlist.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_laqa/web/monitoring/itemlist.jsp	(.../itemlist.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_laqa/web/monitoring/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -94,11 +94,16 @@
 </div>
 <%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
 <script lang="javascript">
-	var win = window.hideMessage ? window : window.top;
-	if (win.hideMessage != null){
-		win.hideMessage();
-		var obj = win.document.getElementById('resourceListArea');
-		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	var win = null;
+	if (window.hideMessage) { 
+		win = window;
+	} else if (window.parent && window.parent.hideMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideMessage();
+	var obj = win.document.getElementById('resourceListArea');
+	obj.innerHTML= document.getElementById("itemList").innerHTML;
 </script>
 
Index: lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js	(.../rsrcresourceitem.js)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js	(.../rsrcresourceitem.js)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -34,7 +34,10 @@
 	}
 	function adjustInstructionsDisplayAreaHeight(adjustAmount){
 		var obj = window.document.getElementById('reourceInputArea');
-		if (!obj) { 
+		if (!obj && window.parent) {
+			 obj = window.parent.document.getElementById('reourceInputArea');
+		}  
+		if (!obj) {
 			obj = window.top.document.getElementById('reourceInputArea');
 		}
 		obj.style.height=obj.contentWindow.document.body.scrollHeight+adjustAmount+'px';
@@ -86,5 +89,13 @@
 		// then refresh "basic tab" resourcelist and close this window.
 	}
 	function cancelResourceItem(){ 
-		window.hideMessage ? window.hideMessage() : window.top.hideMessage();
+		var win = null;
+		if (window.hideMessage) { 
+			win = window;
+		} else if (window.parent && window.parent.hideMessage) {
+			win = window.parent;
+		} else {
+			win = window.top;
+		}
+		win.hideMessage();
 	}
Index: lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp
===================================================================
diff -u -rf5063ab1505eccbf887e7ebfa8ec73dee52f76d9 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision f5063ab1505eccbf887e7ebfa8ec73dee52f76d9)
+++ lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -77,7 +77,10 @@
 <script type="text/javascript">
 	document.getElementById("instructionCount").value = "${listSize}";
 	var obj = window.document.getElementById('reourceInputArea');
-	if (!obj) { 
+	if (!obj && window.parent) {
+		 obj = window.parent.document.getElementById('reourceInputArea');
+	}  
+	if (!obj) {
 		obj = window.top.document.getElementById('reourceInputArea');
 	}
 	obj.style.height=obj.contentWindow.document.body.scrollHeight+'px';
Index: lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -248,10 +248,15 @@
 
 <%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
 <script lang="javascript">
-	var win = window.hideMessage ? window : window.top;
-	if (win.hideMessage != null){
-		win.hideMessage();
-		var obj = win.document.getElementById('resourceListArea');
-		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	var win = null;
+	if (window.hideMessage) { 
+		win = window;
+	} else if (window.parent && window.parent.hideMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideMessage();
+	var obj = win.document.getElementById('resourceListArea');
+	obj.innerHTML= document.getElementById("itemList").innerHTML;
 </script>
Index: lams_tool_notebook/web/pages/authoring/addCondition.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_notebook/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_notebook/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -14,6 +14,20 @@
 		</title>
 		<lams:headItems />
 		<lams:css style="tabbed" />
+		
+		<script type="text/javascript"> 
+			function callHideConditionMessage() {
+				var win = null;
+				if (window.hideConditionMessage) {
+					win = window;
+				} else if (window.parent && window.parent.hideConditionMessage) {
+					win = window.parent;
+				} else {
+					win = window.top;
+				}
+				win.hideConditionMessage();
+			}
+		</script>
 	</lams:head>
 	<body class="tabpart">
 		<!-- Basic Info Form-->
@@ -37,7 +51,7 @@
 		<lams:ImgButtonWrapper>
 			<a href="javascript:;" onclick="javascript:notebookConditionForm.submit();" class="button-add-item"><fmt:message
 					key="button.save" /> </a>
-			<a href="javascript:;" onclick="javascript:window.hideConditionMessage ? window.hideConditionMessage() : window.top.hideConditionMessage()"
+			<a href="javascript:;" onclick="javascript:callHideConditionMessage()"
 				class="button space-left"><fmt:message key="label.cancel" /> </a>
 		</lams:ImgButtonWrapper>
 	</body>
Index: lams_tool_notebook/web/pages/authoring/conditionList.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_notebook/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_notebook/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -82,10 +82,15 @@
 
 <%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
 <script type="text/javascript">
-	var win = window.hideConditionMessage ? window : window.top;
-	if (win.hideConditionMessage != null){
-		win.hideConditionMessage();
-		var obj = win.document.getElementById('conditionsArea');
-		obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	var win = null;
+	if (window.hideConditionMessage) {
+		win = window;
+	} else if (window.parent && window.parent.hideConditionMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideConditionMessage();
+	var obj = win.document.getElementById('conditionsArea');
+	obj.innerHTML= document.getElementById("conditionList").innerHTML;
 </script>
Index: lams_tool_scribe/web/pages/authoring/headingForm.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_scribe/web/pages/authoring/headingForm.jsp	(.../headingForm.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_scribe/web/pages/authoring/headingForm.jsp	(.../headingForm.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -1,4 +1,19 @@
 <%@ include file="/common/taglibs.jsp"%>
+
+<script type="text/javascript"> 
+	function callHideMessage() {
+		var win = null;
+		if (window.hideMessage) {
+			win = window;
+		} else if (window.parent && window.parent.hideMessage) {
+			win = window.parent;
+		} else {
+			win = window.top;
+		}
+		win.hideMessage();
+	}
+</script>
+
 <table>
 	<tr>
 		<td>
@@ -34,7 +49,7 @@
 					</html:submit>
 
 					<html:button property="Cancel" styleClass="button"
-						onclick="javascript:window.hideMessage ? window.hideMessage () : window.top.hideMessage()">
+						onclick="javascript:callHideMessage()">
 						<fmt:message key="button.cancel" />
 					</html:button>
 			</html:form>
Index: lams_tool_scribe/web/pages/authoring/headingResponse.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_scribe/web/pages/authoring/headingResponse.jsp	(.../headingResponse.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_scribe/web/pages/authoring/headingResponse.jsp	(.../headingResponse.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -7,12 +7,17 @@
 	</div>
 
 	<script type="text/javascript">
-		var win = window.hideMessage ? window : window.top;
-		if (win.hideMessage != null){
-			win.hideMessage();
-			var obj = win.document.getElementById('itemListArea');
-			obj.innerHTML= document.getElementById("itemList").innerHTML;
+		var win = null;
+		if (window.hideMessage) { 
+			win = window;
+		} else if (window.parent && window.parent.hideMessage) {
+			win = window.parent;
+		} else {
+			win = window.top;
 		}
+		win.hideMessage();
+		var obj = win.document.getElementById('itemListArea');
+		obj.innerHTML= document.getElementById("itemList").innerHTML;	
 	</script>
 
 </div>
Index: lams_tool_spreadsheet/web/includes/javascript/rsrcspreadsheetitem.js
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_spreadsheet/web/includes/javascript/rsrcspreadsheetitem.js	(.../rsrcspreadsheetitem.js)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_spreadsheet/web/includes/javascript/rsrcspreadsheetitem.js	(.../rsrcspreadsheetitem.js)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -110,8 +110,13 @@
 		// then refresh "basic tab" spreadsheetlist and close this window.
 	}
 	function cancelSpreadsheetItem(){
-		var win = window.hideMessage ? window : window.top;
-		if (win.hideMessage != null){
-			win.hideMessage();
+		var win = null;
+		if (window.hideMessage) { 
+			win = window;
+		} else if (window.parent && window.parent.hideMessage) {
+			win = window.parent;
+		} else {
+			win = window.top;
 		}
+		win.hideMessage();
 	}
\ No newline at end of file
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp	(.../editmark.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp	(.../editmark.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -6,6 +6,19 @@
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
+		<script type="text/javascript"> 
+			function callHideMessage() {
+				var win = null;
+				if (window.hideMessage) {
+					win = window;
+				} else if (window.parent && window.parent.hideMessage) {
+					win = window.parent;
+				} else {
+					win = window.top;
+				}
+				win.hideMessage();
+			}
+		</script>
 	</lams:head>
 	<body class="tabpart">
 		<!-- Basic Info Form-->
@@ -44,7 +57,7 @@
 			<a href="#" onclick="markForm.submit();" class="button space-left">
 				<fmt:message key="label.monitoring.summary.marking.update.marks" /> 
 			</a>
-			<a href="javascript:;" onclick="javascript: window.hideMessage ? window.hideMessage() : window.top.hideMessage()" class="button space-left">
+			<a href="javascript:;" onclick="javascript:callHideMessage" class="button space-left">
 				<fmt:message key="label.cancel" /> 
 			</a>
 		</lams:ImgButtonWrapper>
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp	(.../summarylist.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp	(.../summarylist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -152,10 +152,15 @@
 
 <%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
 <script type="text/javascript">
-	var win = window.hideMessage ? window : window.top;
-	if (win.hideMessage != null){
-		win.hideMessage();
-		var obj = win.document.getElementById('summariesArea');
-		obj.innerHTML= document.getElementById("summaryList2").innerHTML;
+	var win = null;
+	if (window.hideMessage) { 
+		win = window;
+	} else if (window.parent && window.parent.hideMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideMessage();
+	var obj = win.document.getElementById('summariesArea');
+	obj.innerHTML= document.getElementById("summaryList2").innerHTML;
 </script>
Index: lams_tool_survey/web/includes/javascript/surveyitem.js
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_survey/web/includes/javascript/surveyitem.js	(.../surveyitem.js)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_survey/web/includes/javascript/surveyitem.js	(.../surveyitem.js)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -93,8 +93,13 @@
 	}
 	
 	function cancelSurveyItem(){
-		var win = window.hideMessage ? window : window.top;
-		if (win.hideMessage != null){
-			win.hideMessage();
+		var win = null;
+		if (window.hideMessage) { 
+			win = window;
+		} else if (window.parent && window.parent.hideMessage) {
+			win = window.parent;
+		} else {
+			win = window.top;
 		}
+		win.hideMessage();
 	}
Index: lams_tool_survey/web/pages/authoring/addCondition.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_survey/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_survey/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -6,7 +6,19 @@
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
-
+		<script type="text/javascript"> 
+			function callHideConditionMessage() {
+				var win = null;
+				if (window.hideConditionMessage) {
+					win = window;
+				} else if (window.parent && window.parent.hideConditionMessage) {
+					win = window.parent;
+				} else {
+					win = window.top;
+				}
+				win.hideConditionMessage();
+			}
+		</script>
 	</lams:head>
 	<body class="tabpart">
 		<!-- Basic Info Form-->
@@ -40,7 +52,7 @@
 		<lams:ImgButtonWrapper>
 			<a href="javascript:;" onclick="javascript:surveyConditionForm.submit();" class="button-add-item"><fmt:message
 					key="label.save" /> </a>
-			<a href="javascript:;" onclick="javascript:window.hideConditionMessage ? window.hideConditionMessage() : window.top.hideConditionMessage()"
+			<a href="javascript:;" onclick="javascript:callHideConditionMessage()"
 				class="button space-left"><fmt:message key="label.cancel" /> </a>
 		</lams:ImgButtonWrapper>
 	</body>
Index: lams_tool_survey/web/pages/authoring/conditionList.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_survey/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_survey/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -83,10 +83,15 @@
 
 <%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
 <script type="text/javascript">
-	var win = window.hideMessage ? window : window.top;
-	if (win.hideMessage != null){
-		win.hideMessage();
-		var obj = win.document.getElementById('conditionsArea');
-		obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	var win = null;
+	if (window.hideMessage) { 
+		win = window;
+	} else if (window.parent && window.parent.hideMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideMessage();
+	var obj = win.document.getElementById('conditionsArea');
+	obj.innerHTML= document.getElementById("conditionList").innerHTML;
 </script>
Index: lams_tool_survey/web/pages/authoring/parts/instructions.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_survey/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_survey/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -62,6 +62,9 @@
 <script type="text/javascript">
 	$("instructionCount").value="${listSize}";
 	var obj = window.document.getElementById('questionInputArea');
+	if (!obj && window.parent) {
+		 obj = window.parent.document.getElementById('questionInputArea');
+	}  
 	if (!obj) {
 		obj = window.top.document.getElementById('questionInputArea');
 	}
Index: lams_tool_survey/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -92,10 +92,15 @@
 </div>
 <%-- This script will works when a new resoruce item submit in order to refresh "Survey List" panel. --%>
 <script lang="javascript">
-	var win = window.hideMessage ? window : window.top;
-	if (win.hideMessage != null){
-		win.hideMessage();
-		var obj = win.document.getElementById('surveyListArea');
-		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	var win = null;
+	if (window.hideMessage) { 
+		win = window;
+	} else if (window.parent && window.parent.hideMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideMessage();
+	var obj = win.document.getElementById('surveyListArea');
+	obj.innerHTML= document.getElementById("itemList").innerHTML;
 </script>
Index: lams_tool_task/web/pages/authoring/parts/addcondition.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_task/web/pages/authoring/parts/addcondition.jsp	(.../addcondition.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_task/web/pages/authoring/parts/addcondition.jsp	(.../addcondition.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -6,7 +6,19 @@
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
-
+		<script type="text/javascript"> 
+			function callHideConditionMessage() {
+				var win = null;
+				if (window.hideConditionMessage) {
+					win = window;
+				} else if (window.parent && window.parent.hideConditionMessage) {
+					win = window.parent;
+				} else {
+					win = window.top;
+				}
+				win.hideConditionMessage();
+			}
+		</script>
 	</lams:head>
 	<body class="tabpart">
 		<!-- Basic Info Form-->
@@ -45,7 +57,7 @@
 		<lams:ImgButtonWrapper>
 			<a href="#" onclick="taskListConditionForm.submit();" class="button-add-item"><fmt:message
 					key="button.add" /> </a> 
-			<a href="javascript:;" onclick="window.hideConditionMessage ? window.hideConditionMessage() : window.top.hideConditionMessage();"
+			<a href="javascript:;" onclick="javascript:callHideConditionMessage()"
 				class="button space-left"><fmt:message key="label.cancel" /> </a>
 		</lams:ImgButtonWrapper>
 	</body>
Index: lams_tool_task/web/pages/authoring/parts/addtask.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_task/web/pages/authoring/parts/addtask.jsp	(.../addtask.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_task/web/pages/authoring/parts/addtask.jsp	(.../addtask.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -11,7 +11,18 @@
 	function uncheckIsCommentsRequired() {
 		document.getElementById("isCommentsRequired").checked=false;
 	}
-
+	
+	function callHideMessage() {
+		var win = null;
+		if (window.hideMessage) {
+			win = window;
+		} else if (window.parent && window.parent.hideMessage) {
+			win = window.parent;
+		} else {
+			win = window.top;
+		}
+		win.hideMessage();
+	}
 </script>
 
 <lams:html>
@@ -109,43 +120,7 @@
 					<fmt:message key="label.authoring.basic.task.isFilesRequired" />
 				</label>
 			</div>
-		    
-<%-- 
-			<div class="space-top">
-				<html:checkbox property="commentsAllowed" styleClass="noBorder"	styleId="isCommentsAllowed"
-					onclick="document.taskListItemForm.showCommentsToAll[0].disabled = !document.taskListItemForm.showCommentsToAll[0].disabled;
-					document.taskListItemForm.showCommentsToAll[1].disabled = !document.taskListItemForm.showCommentsToAll[1].disabled">
-				</html:checkbox>
-
-				<label for="isCommentsAllowed">
-					<fmt:message key="label.authoring.basic.task.isCommentsFilesAllowed" />
-				</label>
-			</div>
-					
-			<div class="space-top">
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;	
-				<input type="radio" name="showCommentsToAll" value="${false}" styleId="showToMonitoring"
-					<c:if test="${not formBean.showCommentsToAll}">checked="checked"</c:if>
-					<c:if test="${not formBean.commentsAllowed}">disabled="disabled"</c:if>/>
-					
-				<label for="showToMonitoring">
-					<fmt:message key="label.authoring.basic.task.show.only.to.monitoring" />
-				</label>
-			</div>
 			
-			<div class="space-top">
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;	
-				<input type="radio" name="showCommentsToAll" value="${true}" styleId="showToLearners"
-					<c:if test="${formBean.showCommentsToAll}">checked="checked"</c:if>
-					<c:if test="${not formBean.commentsAllowed}">disabled="disabled"</c:if>/>
-					
-				<label for="showToLearners">
-					<fmt:message key="label.authoring.basic.task.show.to.all.learners" />
-				</label>
-			</div>
---%>			
-			
-			
 			<div class="space-top" ">
 				<html:checkbox property="childTask" styleClass="noBorder" 
 					disabled="${(fn:length(sessionMap.taskListList) == 0) || (fn:length(sessionMap.taskListList) == 1) && (formBean.itemIndex > -1)}"
@@ -186,7 +161,7 @@
 		<lams:ImgButtonWrapper>
 			<a href="#" onclick="taskListItemForm.submit();" class="button-add-item"><fmt:message
 					key="button.add" /> </a>
-			<a href="javascript:;" onclick="window.hideMessage ? window.hideMessage() : window.top.hideMessage()"
+			<a href="javascript:;" onclick="javascript:callHideMessage()"
 				class="button space-left"><fmt:message key="label.cancel" /> </a>
 		</lams:ImgButtonWrapper>
 	</body>
Index: lams_tool_task/web/pages/authoring/parts/conditionlist.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_task/web/pages/authoring/parts/conditionlist.jsp	(.../conditionlist.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_task/web/pages/authoring/parts/conditionlist.jsp	(.../conditionlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -83,10 +83,15 @@
 
 <%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
 <script lang="javascript"> 
-	var win = window.hideConditionMessage ? window : window.top;
-	if (win.hideConditionMessage != null){
-		win.hideConditionMessage();
-		var obj = win.document.getElementById('conditionsArea');
-		obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	var win = null;
+	if (window.hideConditionMessage) {
+		win = window;
+	} else if (window.parent && window.parent.hideConditionMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideConditionMessage();
+	var obj = win.document.getElementById('conditionsArea');
+	obj.innerHTML= document.getElementById("conditionList").innerHTML;
 </script>
Index: lams_tool_task/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_task/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_task/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -69,10 +69,15 @@
 
 <%-- This script will works when a new resoruce item submit in order to refresh "TaskList List" panel. --%>
 <script lang="javascript">
-	var win = window.hideMessage ? window : window.top;
-	if (win.hideMessage != null){
-		win.hideMessage();
-		var obj = win.document.getElementById('taskListListArea');
-		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	var win = null;
+	if (window.hideMessage) { 
+		win = window;
+	} else if (window.parent && window.parent.hideMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideMessage();
+	var obj = win.document.getElementById('taskListListArea');
+	obj.innerHTML= document.getElementById("itemList").innerHTML;	
 </script>
Index: lams_tool_videorecorder/web/pages/authoring/addCondition.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_videorecorder/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_videorecorder/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -14,6 +14,19 @@
 		</title>
 		<lams:headItems />
 		<lams:css style="tabbed" />
+		<script type="text/javascript"> 
+			function callHideConditionMessage() {
+				var win = null;
+				if (window.hideConditionMessage) {
+					win = window;
+				} else if (window.parent && window.parent.hideConditionMessage) {
+					win = window.parent;
+				} else {
+					win = window.top;
+				}
+				win.hideConditionMessage();
+			}
+		</script>
 	</lams:head>
 	<body class="tabpart">
 		<!-- Basic Info Form-->
@@ -37,7 +50,7 @@
 		<lams:ImgButtonWrapper>
 			<a href="#" onclick="videoRecorderConditionForm.submit();" class="button-add-item"><fmt:message
 					key="button.save" /> </a>
-			<a href="#" onclick="window.hideConditionMessage ? window.hideConditionMessage() : window.top.hideConditionMessage()"
+			<a href="#" onclick="javascript:callHideConditionMessage()"
 				class="button space-left"><fmt:message key="label.cancel" /> </a>
 		</lams:ImgButtonWrapper>
 	</body>
Index: lams_tool_videorecorder/web/pages/authoring/conditionList.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_videorecorder/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_videorecorder/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -82,10 +82,15 @@
 
 <%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
 <script type="text/javascript">
-	var win = window.hideConditionMessage ? window : window.top;
-	if (win.hideConditionMessage != null){
-		win.hideConditionMessage();
-		var obj = win.document.getElementById('conditionsArea');
-		obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	var win = null;
+	if (window.hideConditionMessage) {
+		win = window;
+	} else if (window.parent && window.parent.hideConditionMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideConditionMessage();
+	var obj = win.document.getElementById('conditionsArea');
+	obj.innerHTML= document.getElementById("conditionList").innerHTML;
 </script>
Index: lams_tool_vote/web/authoring/itemlist.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_vote/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_vote/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -105,11 +105,16 @@
 </div>
 <%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
 <script lang="javascript">
-	var win = window.hideMessage ? window : window.top;
-	if (win.hideMessage != null){
-		win.hideMessage();
-		var obj = win.document.getElementById('resourceListArea');
-		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	var win = null;
+	if (window.hideMessage) { 
+		win = window;
+	} else if (window.parent && window.parent.hideMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideMessage();
+	var obj = win.document.getElementById('resourceListArea');
+	obj.innerHTML= document.getElementById("itemList").innerHTML;
 </script>
 
Index: lams_tool_vote/web/monitoring/itemlist.jsp
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r2b350be06485bbfe1da8c66def9fc2cd81e883a8
--- lams_tool_vote/web/monitoring/itemlist.jsp	(.../itemlist.jsp)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_vote/web/monitoring/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
@@ -94,11 +94,16 @@
 </div>
 <%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
 <script lang="javascript">
-	var win = window.hideMessage ? window : window.top;
-	if (win.hideMessage != null){
-		win.hideMessage();
-		var obj = win.document.getElementById('resourceListArea');
-		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	var win = null;
+	if (window.hideMessage) { 
+		win = window;
+	} else if (window.parent && window.parent.hideMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideMessage();
+	var obj = win.document.getElementById('resourceListArea');
+	obj.innerHTML= document.getElementById("itemList").innerHTML;
 </script>