Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -rf44c4b85fd2563394f045ad28218d3c0b5cbb9da -rfb406a57261a31898b62f3c808ffccb853089336
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision f44c4b85fd2563394f045ad28218d3c0b5cbb9da)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision fb406a57261a31898b62f3c808ffccb853089336)
@@ -8,33 +8,40 @@
 	<!--
 		function gotoURL(){
  		    var reqIDVar = new Date();
-			parent.frames['newResourceFrame'].location = "<c:url value="/pages/learning/addurl.jsp"/>?&reqID="+reqIDVar.getTime();
-	      	parent.newResourceFrame.focus();
+			var gurl = "<c:url value="/pages/learning/addurl.jsp"/>?&reqID="+reqIDVar.getTime();
+	      	showMessage(gurl);
 	      	return false;
 		}
 		function gotoFile(){
  		    var reqIDVar = new Date();
-			parent.frames['newResourceFrame'].location = "<c:url value="/pages/learning/addfile.jsp"/>?&reqID="+reqIDVar.getTime();
-	      	parent.newResourceFrame.focus();
+ 		    var gurl = "<c:url value="/pages/learning/addfile.jsp"/>?&reqID="+reqIDVar.getTime();
+	      	showMessage(gurl);
 	      	return false;
 		}
 		function checkNew(){
  		    var reqIDVar = new Date();
-			parent.frames['learningFrame'].location= "<c:url value="/pages/learning/learning.jsp"/>?reqID="+reqIDVar.getTime();
+			document.location.href = "<c:url value="/pages/learning/learning.jsp"/>?reqID="+reqIDVar.getTime();
  		    return false;
 		}
 		function viewItem(itemUid){
 			var myUrl = "<c:url value="/reviewItem.do"/>?itemUid=" + itemUid;
 			launchPopup(myUrl,"Review");
 		}
 		function completeItem(itemUid){
-			parent.frames['learningFrame'].location = "<c:url value="/learning/completeItem.do"/>?itemUid=" + itemUid;
+			document.location.href = "<c:url value="/learning/completeItem.do"/>?itemUid=" + itemUid;
 			return false;
 		}
 		function finishSession(){
-			parent.frames['learningFrame'].location ='<c:url value="/learning/finish.do?toolSessionID=${toolSessionID}"/>';
+			document.location.href ='<c:url value="/learning/finish.do?toolSessionID=${toolSessionID}"/>';
 			return false;
 		}
+		function showMessage(url) {
+			var area=document.getElementById("reourceInputArea");
+			area.style.width="100%";
+			area.style.height="100%";
+			area.src=url;
+			area.style.display="block";
+		}
 	-->        
     </script>
 </head>
@@ -61,7 +68,7 @@
 				<fmt:message key="label.completed" />
 			</th>
 			<th scope="col" style="width:200px">
-				<a href="#" style="width:120px" class="button" onclick="return 	"><fmt:message key="label.check.for.new" /></a>
+				<a href="#" style="width:120px" class="button" onclick="return checkNew()"><fmt:message key="label.check.for.new" /></a>
 			</th>
 		</tr>
 		<c:forEach var="item" items="${resourceList}">
@@ -95,15 +102,57 @@
 			</tr>
 		</c:if>
 	</table>
-	<table border="0" align="center" class="forms" width="95%">
-		<tr>
-			<td style="align:left" >
-				<fmt:message key="label.suggest.new"/> 
-				<input type="radio" name="suggest" value="url" checked="true" onclick="gotoURL()"><fmt:message key="label.authoring.basic.resource.url.input"/> |
-				<input type="radio" name="suggest" value="file"  onclick="gotoFile()"><fmt:message key="label.authoring.basic.resource.file.input"/> 
-			</td>
-		</tr>
-	</table>
+	<c:if test="${resource.allowAddFiles || resource.allowAddUrls}">
+		<table border="0" align="center" class="forms" width="95%">
+			<tr>
+				<td style="align:left" >
+					<fmt:message key="label.suggest.new"/> 
+					<c:choose>
+						<c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
+							<input type="radio" name="suggest" value="url" checked="true" onclick="gotoURL()"><fmt:message key="label.authoring.basic.resource.url.input"/> |
+							<input type="radio" name="suggest" value="file"  onclick="gotoFile()"><fmt:message key="label.authoring.basic.resource.file.input"/> 
+						</c:when>
+						<c:when test="${resource.allowAddFiles && !resource.allowAddUrls}">
+							<input type="radio" name="suggest" value="file"  checked="true" onclick="gotoFile()"><fmt:message key="label.authoring.basic.resource.file.input"/> 
+						</c:when>
+						<c:when test="${!resource.allowAddFiles && resource.allowAddUrls}">
+							<input type="radio" name="suggest" value="url" checked="true" onclick="gotoURL()"><fmt:message key="label.authoring.basic.resource.url.input"/>
+						</c:when>
+					</c:choose>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<iframe onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'" 
+						id="reourceInputArea" name="reourceInputArea" style="width:0px;height:0px;border:0px;display:none" frameborder="no" scrolling="no">
+					</iframe>
+				</td>
+			</tr>			
+		</table>
+	</c:if>
+	<c:choose>
+		<c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
+			<script type="text/javascript">
+				<!--
+					showMessage("<c:url value='/pages/learning/addurl.jsp'/>");
+				-->
+			</script>
+		</c:when>
+		<c:when test="${resource.allowAddFiles && !resource.allowAddUrls}">
+			<script type="text/javascript">
+				<!--
+					showMessage("<c:url value='/pages/learning/addfile.jsp'/>");
+				-->
+			</script>
+		</c:when>
+		<c:when test="${!resource.allowAddFiles && resource.allowAddUrls}">
+			<script type="text/javascript">
+				<!--
+					showMessage("<c:url value='/pages/learning/addurl.jsp'/>");
+				-->
+			</script>
+		</c:when>
+	</c:choose>		
 </body>
 </html:html>