Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
diff -u -re14fec2fc48a58cfcabe375deb903a3cecfabe3f -rf6b464cd3128a6d8a5a07430d2aeeca8919eb5b7
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision e14fec2fc48a58cfcabe375deb903a3cecfabe3f)
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision f6b464cd3128a6d8a5a07430d2aeeca8919eb5b7)
@@ -116,8 +116,8 @@
 						</div>
 						<div id="item-content-0" class="panel-body item-content">
 							<div class="content-panel">
-								<h4  class="embedded-title"></h3>
-								<h5  class="embedded-description"></h4>
+								<h3  class="embedded-title"></h3>
+								<h5  class="embedded-description"></h5>
 								<div class="embedded-content"></div>
 							</div>
 						</div>
@@ -147,4 +147,4 @@
 			</div>
 		</div>
 	</body>
-</lams:html>
+</lams:html>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/learning/addurl.jsp
===================================================================
diff -u -re14fec2fc48a58cfcabe375deb903a3cecfabe3f -rf6b464cd3128a6d8a5a07430d2aeeca8919eb5b7
--- lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision e14fec2fc48a58cfcabe375deb903a3cecfabe3f)
+++ lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision f6b464cd3128a6d8a5a07430d2aeeca8919eb5b7)
@@ -6,105 +6,105 @@
 		<fmt:message key="label.learning.new.url" />
 	</div>
 	<div class="panel-body">
-	
-	<lams:errors/>
-	
-	<form:form action="saveOrUpdateItem.do" method="post" modelAttribute="resourceItemForm" id="resourceItemForm" focus="title">
-	
-		<form:hidden path="itemType" id="itemType" />
-		<form:hidden path="mode" id="mode"/>
-		<form:hidden path="sessionMapID"/>
-		
-		<div class="form-group" id="addurl">
-	    	<label for="url"><fmt:message key="label.authoring.basic.resource.url.input" /></label>
-			<form:input path="url" cssClass="form-control" tabindex="2" id="url"/>
-	    </div>
-	    
-  		<div id="preview-panel" class="panel panel-default hidden">
-			<div class="panel-heading panel-title">
-				<fmt:message key="label.authoring.basic.resource.preview" />
+
+		<lams:errors/>
+
+		<form:form action="saveOrUpdateItem.do" method="post" modelAttribute="resourceItemForm" id="resourceItemForm" focus="title">
+
+			<form:hidden path="itemType" id="itemType" />
+			<form:hidden path="mode" id="mode"/>
+			<form:hidden path="sessionMapID"/>
+
+			<div class="form-group" id="addurl">
+				<label for="url"><fmt:message key="label.authoring.basic.resource.url.input" /></label>
+				<form:input path="url" cssClass="form-control" tabindex="2" id="url"/>
 			</div>
-			<div id="item-content-0" class="panel-body item-content">
-				<div class="content-panel">
-					<h4  class="embedded-title"></h3>
-					<h5  class="embedded-description"></h4>
-					<div class="embedded-content"></div>
+
+			<div id="preview-panel" class="panel panel-default hidden">
+				<div class="panel-heading panel-title">
+					<fmt:message key="label.authoring.basic.resource.preview" />
 				</div>
+				<div id="item-content-0" class="panel-body item-content">
+					<div class="content-panel">
+						<h3  class="embedded-title"></h3>
+						<h5  class="embedded-description"></h5>
+						<div class="embedded-content"></div>
+					</div>
+				</div>
 			</div>
-		</div>
-					
-		<div class="form-group">
-	    	<label for="title"><fmt:message key="label.authoring.basic.resource.title.input" /></label>:
-			<form:input path="title" tabindex="1" cssClass="form-control"/>
-	  	</div>	
 
-		<div class="form-group">
-	    	<label for="instructions"><fmt:message key="label.authoring.basic.instruction" /></label>
-			<lams:CKEditor id="instructions" value="" contentFolderID="${learnerContentFolder}"></lams:CKEditor>
-	  	</div>	
+			<div class="form-group">
+				<label for="title"><fmt:message key="label.authoring.basic.resource.title.input" /></label>:
+				<form:input path="title" tabindex="1" cssClass="form-control"/>
+			</div>
 
-		<div id="buttons" class="pull-right" >
-	 		<button name="goback" onclick="javascript:cancel()" class="btn btn-sm btn-default" id="cancelButton">
-				<fmt:message key="button.cancel" />
-			</button>&nbsp;
-			<button type="submit" class="btn btn-sm btn-default btn-disable-on-submit" id="submitButton">
-			 	<fmt:message key="button.add" />
-			</button>
-		</div>
-	
-	</form:form>
-	
-	<script type="text/javascript">
-		$(document).ready(function(){
-			$('#addresource #url').focus()
+			<div class="form-group">
+				<label for="instructions"><fmt:message key="label.authoring.basic.instruction" /></label>
+				<lams:CKEditor id="instructions" value="" contentFolderID="${learnerContentFolder}"></lams:CKEditor>
+			</div>
+
+			<div id="buttons" class="pull-right" >
+				<button name="goback" onclick="javascript:cancel()" class="btn btn-sm btn-default" id="cancelButton">
+					<fmt:message key="button.cancel" />
+				</button>&nbsp;
+				<button type="submit" class="btn btn-sm btn-default btn-disable-on-submit" id="submitButton">
+					<fmt:message key="button.add" />
+				</button>
+			</div>
+
+		</form:form>
+
+		<script type="text/javascript">
+			$(document).ready(function(){
+				$('#addresource #url').focus()
 				.attr("placeholder","<fmt:message key="label.authoring.basic.resource.url.placeholder" />")
 				.blur(function(){
-					 var url = $(this).val();
-					 if (url.trim() != '') {
-						 url = encodeURIComponent(url);
-						 $('#addresource #item-content-0 .content-panel > *').empty();
+					var url = $(this).val();
+					if (url.trim() != '') {
+						url = encodeURIComponent(url);
+						$('#addresource #item-content-0 .content-panel > *').empty();
 						$.ajax({
-						    url: "https://ckeditor.iframe.ly/api/oembed?url=" + url,
-						    dataType: "jsonp",
-						    cache: true,
-						    type: "POST",
-						    jsonpCallback: 'iframelyCallback0',
-						    contentType: "application/json; charset=utf-8",
-						    error: function (xhr, status, error) {
+							url: "https://ckeditor.iframe.ly/api/oembed?url=" + url,
+							dataType: "jsonp",
+							cache: true,
+							type: "POST",
+							jsonpCallback: 'iframelyCallback0',
+							contentType: "application/json; charset=utf-8",
+							error: function (xhr, status, error) {
 								$('#addresource #preview-panel').addClass('hidden');
-								
-						        console.log("Result: " + status + " " + error + " " + xhr.status + " " + xhr.statusText)
-						    }
+
+								console.log("Result: " + status + " " + error + " " + xhr.status + " " + xhr.statusText)
+							}
 						});
-					 }
-				 });
-			});		
-	
-		$('#resourceItemForm').submit(submitResourceForm);
-		$('#resourceItemForm').validate({
-			ignore: 'hidden, div.cke_editable',
-			errorClass: "text-danger",
-			wrapper: "span",
- 			rules: {
- 				url: {
- 			    	required: true,
- 			    	url: true
- 			    },
-			    title: {
-			    	required: true
-			    }
- 			},
-			messages : {
-				url : {
-					required : '<fmt:message key="error.resource.item.url.blank"/> ',
-					url : '<fmt:message key="error.resource.item.invalid.url"/> '
+					}
+				});
+			});
+
+			$('#resourceItemForm').submit(submitResourceForm);
+			$('#resourceItemForm').validate({
+				ignore: 'hidden, div.cke_editable',
+				errorClass: "text-danger",
+				wrapper: "span",
+				rules: {
+					url: {
+						required: true,
+						url: true
+					},
+					title: {
+						required: true
+					}
 				},
-				title : {
-					required : '<fmt:message key="error.resource.item.title.blank"/> '
-				}
-			},
-		});
-	</script>
-	
-</div>
-</div>
+				messages : {
+					url : {
+						required : '<fmt:message key="error.resource.item.url.blank"/> ',
+						url : '<fmt:message key="error.resource.item.invalid.url"/> '
+					},
+					title : {
+						required : '<fmt:message key="error.resource.item.title.blank"/> '
+					}
+				},
+			});
+		</script>
+
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -rf007d7e87e33de37ad35d279b1da1d59c9f42055 -rf6b464cd3128a6d8a5a07430d2aeeca8919eb5b7
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision f007d7e87e33de37ad35d279b1da1d59c9f42055)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision f6b464cd3128a6d8a5a07430d2aeeca8919eb5b7)
@@ -4,291 +4,290 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
-<lams:head>
-	<title><fmt:message key="label.learning.title" />
-	</title>
-	<%@ include file="/common/header.jsp"%>
-	
-	<lams:css suffix="jquery.jRating"/>
-	<link href="${lams}css/uppy.min.css" rel="stylesheet" type="text/css" />
-	<link href="${lams}css/uppy.custom.css" rel="stylesheet" type="text/css" />
-	<style media="screen,projection" type="text/css">
-	 	.item-panel {
-	 		margin: 15px;
-	 	}
-	 	
-	 	.item-content {
-	 		padding: 5px;
-	 	}
-	 	
-	 	.item-instructions {
-	 		margin-bottom: 15px;
-	 		padding-bottom: 10px;
-	 		border-bottom: 1px solid #ddd;
-	 	}
-	 	
-	 	.embedded-title {
-	 		clear: both;
-	 		font-weight: 500;
-	 		font-size: larger;
-	 	}
-	 	
-	 	.embedded-description {
-	 		padding: 0.5em;
-	 	}
-	 	
-	 	.embedded-file {
-	 		text-align: center;
-	 		margin: auto;
-	 	}
-	 	
-	 	.embedded-file img {
-	 		max-width: 800px;
-	 	}
-	 	
-	 	.embedded-file video {
-	 		width: 100%;
-	 	}
-	 	
-	 	.embedded-file embed {
-	 		width: 100%;
-	 		min-height: 500px;
-	 	}
-	 		 	
-	 	.embedded-content iframe {
-	 		border: 0;
-	 		width: 100%;
-	 		height: 100%;
-	 		min-height: 500px;
-	 	}
-	 	
-	 	.delete-item-button {
-	 		margin-left: 5px;
-	 		cursor: pointer;
-	 	}
-	 	
-	 	.commentFrame {
-	 		padding: 10px;
-	 	}
-	</style>
+	<lams:head>
+		<title><fmt:message key="label.learning.title" />
+		</title>
+		<%@ include file="/common/header.jsp"%>
 
-	<%-- param has higher level for request attribute --%>
-	<c:if test="${not empty param.sessionMapID}">
-		<c:set var="sessionMapID" value="${param.sessionMapID}" />
-	</c:if>
+		<lams:css suffix="jquery.jRating"/>
+		<link href="${lams}css/uppy.min.css" rel="stylesheet" type="text/css" />
+		<link href="${lams}css/uppy.custom.css" rel="stylesheet" type="text/css" />
+		<style media="screen,projection" type="text/css">
+			.item-panel {
+				margin: 15px;
+			}
 
-	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+			.item-content {
+				padding: 5px;
+			}
 
-	<c:set var="mode" value="${sessionMap.mode}" />
-	<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
-	<c:set var="resource" value="${sessionMap.resource}" />
-	<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
-	<c:set var="userID"><lams:user property="userID"/></c:set>
-	<c:set var="delConfirmMsgKey" value="del.confirmation" scope="request"/>
+			.item-instructions {
+				margin-bottom: 15px;
+				padding-bottom: 10px;
+				border-bottom: 1px solid #ddd;
+			}
 
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.validate.js"></script>
+			.embedded-title {
+				clear: both;
+				font-weight: 500;
+				font-size: larger;
+			}
 
-	<c:set var="language"><lams:user property="localeLanguage"/></c:set>
-	<script src="${lams}includes/javascript/uppy/uppy.min.js"></script>
-	<c:choose>
-		<c:when test="${language eq 'es'}">
-			<script type="text/javascript" src="${lams}includes/javascript/uppy/es_ES.min.js"></script>
-		</c:when>
-		<c:when test="${language eq 'fr'}">
-			<script type="text/javascript" src="${lams}includes/javascript/uppy/fr_FR.min.js"></script>
-		</c:when>
-		<c:when test="${language eq 'el'}">
-			<script type="text/javascript" src="${lams}includes/javascript/uppy/el_GR.min.js"></script>
-		</c:when>
-	</c:choose>
-	
-	<c:if test="${sessionMap.rateItems}">
+			.embedded-description {
+				padding: 0.5em;
+			}
+
+			.embedded-file {
+				text-align: center;
+				margin: auto;
+			}
+
+			.embedded-file img {
+				max-width: 800px;
+			}
+
+			.embedded-file video {
+				width: 100%;
+			}
+
+			.embedded-file embed {
+				width: 100%;
+				min-height: 500px;
+			}
+
+			.embedded-content iframe {
+				border: 0;
+				width: 100%;
+				height: 100%;
+			}
+
+			.delete-item-button {
+				margin-left: 5px;
+				cursor: pointer;
+			}
+
+			.commentFrame {
+				padding: 10px;
+			}
+		</style>
+
+		<%-- param has higher level for request attribute --%>
+		<c:if test="${not empty param.sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}" />
+		</c:if>
+
+		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+
+		<c:set var="mode" value="${sessionMap.mode}" />
+		<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
+		<c:set var="resource" value="${sessionMap.resource}" />
+		<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
+		<c:set var="userID"><lams:user property="userID"/></c:set>
+		<c:set var="delConfirmMsgKey" value="del.confirmation" scope="request"/>
+
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.validate.js"></script>
+
+		<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+		<script src="${lams}includes/javascript/uppy/uppy.min.js"></script>
+		<c:choose>
+			<c:when test="${language eq 'es'}">
+				<script type="text/javascript" src="${lams}includes/javascript/uppy/es_ES.min.js"></script>
+			</c:when>
+			<c:when test="${language eq 'fr'}">
+				<script type="text/javascript" src="${lams}includes/javascript/uppy/fr_FR.min.js"></script>
+			</c:when>
+			<c:when test="${language eq 'el'}">
+				<script type="text/javascript" src="${lams}includes/javascript/uppy/el_GR.min.js"></script>
+			</c:when>
+		</c:choose>
+
+		<c:if test="${sessionMap.rateItems}">
+			<script>
+				var pathToImageFolder = "${lams}images/css/",
+						LAMS_URL = '${lams}',
+						MAX_RATES = MAX_RATINGS_FOR_ITEM = MIN_RATES = COUNT_RATED_ITEMS = 0, // no restrictions
+						COMMENTS_MIN_WORDS_LIMIT = 0, // comments not used,
+						COMMENT_TEXTAREA_TIP_LABEL = WARN_COMMENTS_IS_BLANK_LABEL = WARN_MIN_NUMBER_WORDS_LABEL = '',
+						AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
+						YOUR_RATING_LABEL =
+								'<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+						ALLOW_RERATE = true,
+						SESSION_ID = ${toolSessionID};
+
+			</script>
+			<script src="${lams}includes/javascript/rating.js"></script>
+			<script src="${lams}includes/javascript/jquery.jRating.js"></script>
+		</c:if>
+
+		<lams:JSImport src="learning/includes/javascript/gate-check.js" />
+		<lams:JSImport src="includes/javascript/rsrcembed.js" relative="true" />
 		<script>
-			var pathToImageFolder = "${lams}images/css/",
-				LAMS_URL = '${lams}',
-				MAX_RATES = MAX_RATINGS_FOR_ITEM = MIN_RATES = COUNT_RATED_ITEMS = 0, // no restrictions
-				COMMENTS_MIN_WORDS_LIMIT = 0, // comments not used,
-				COMMENT_TEXTAREA_TIP_LABEL = WARN_COMMENTS_IS_BLANK_LABEL = WARN_MIN_NUMBER_WORDS_LABEL = '',
-				AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
-				YOUR_RATING_LABEL = 
-					'<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
-				ALLOW_RERATE = true,
-				SESSION_ID = ${toolSessionID}; 
-				
-		</script>
-		<script src="${lams}includes/javascript/rating.js"></script>
-		<script src="${lams}includes/javascript/jquery.jRating.js"></script>
-	</c:if>
-	
-	<lams:JSImport src="learning/includes/javascript/gate-check.js" />
-	<lams:JSImport src="includes/javascript/rsrcembed.js" relative="true" />
-	<script>
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', finishSession);
+			checkNextGateActivity('finishButton', '${toolSessionID}', '', finishSession);
 
-		let itemsComplete = ${itemsComplete};
-	
-		$(document).ready(function(){
-			cancel();
+			let itemsComplete = ${itemsComplete};
 
-			// show items only on Group expand
-			$('.item-collapse').on('show.bs.collapse', function(){
-				let collapse = $(this);
-				if (collapse.is(':empty')) {
-					let itemUid = collapse.data('item-uid');
-					collapse.load("<c:url value="/itemReviewContent.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&itemUid="
-								  + itemUid);
-				}
-			});
- 		});
+			$(document).ready(function(){
+				cancel();
 
- 		function submitResourceForm() {
-			if ( $(this).valid() ) {
-				//copy value from CKEditor to textarea before ajax submit
-				$("textarea[id^='instructions']").each(function()  {
-					var ckeditorData = CKEDITOR.instances[this.name].getData();
-					//skip out empty values
-					this.value = ((ckeditorData == null) || (ckeditorData.replace(/&nbsp;| |<br \/>|\s|<p>|<\/p>|\xa0/g, "").length == 0)) ? "" : ckeditorData;		
-				});
-				
-				$('.btn-disable-on-submit').prop('disabled', true);
-				var formData = new FormData(this);
-				showBusy('itemAttachmentArea');
-			    $.ajax({ // create an AJAX call...
-			        data: formData, 
-			        processData: false, // tell jQuery not to process the data
-			        contentType: false, // tell jQuery not to set contentType
-			        type: $(this).attr('method'), // GET or POST
-			        url: $(this).attr('action'), // the file to call
-			        success: function (response) {
-						$('#addresource').html(response);
-			    	},
-			    	error: function (jqXHR, textStatus, errorThrown ) {
-			    		alert(textStatus+": "+errorThrown);
-			    	},
-			    	complete: function(response) {
-			    		hideBusy('itemAttachmentArea');
-			            $('.btn-disable-on-submit').prop('disabled', false);
+				// show items only on Group expand
+				$('.item-collapse').on('show.bs.collapse', function(){
+					let collapse = $(this);
+					if (collapse.is(':empty')) {
+						let itemUid = collapse.data('item-uid');
+						collapse.load("<c:url value="/itemReviewContent.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&itemUid="
+								+ itemUid);
 					}
-			    });
+				});
+			});
+
+			function submitResourceForm() {
+				if ( $(this).valid() ) {
+					//copy value from CKEditor to textarea before ajax submit
+					$("textarea[id^='instructions']").each(function()  {
+						var ckeditorData = CKEDITOR.instances[this.name].getData();
+						//skip out empty values
+						this.value = ((ckeditorData == null) || (ckeditorData.replace(/&nbsp;| |<br \/>|\s|<p>|<\/p>|\xa0/g, "").length == 0)) ? "" : ckeditorData;
+					});
+
+					$('.btn-disable-on-submit').prop('disabled', true);
+					var formData = new FormData(this);
+					showBusy('itemAttachmentArea');
+					$.ajax({ // create an AJAX call...
+						data: formData,
+						processData: false, // tell jQuery not to process the data
+						contentType: false, // tell jQuery not to set contentType
+						type: $(this).attr('method'), // GET or POST
+						url: $(this).attr('action'), // the file to call
+						success: function (response) {
+							$('#addresource').html(response);
+						},
+						error: function (jqXHR, textStatus, errorThrown ) {
+							alert(textStatus+": "+errorThrown);
+						},
+						complete: function(response) {
+							hideBusy('itemAttachmentArea');
+							$('.btn-disable-on-submit').prop('disabled', false);
+						}
+					});
+				}
+				return false;
 			}
-			return false;
-		}
 
-		function completeItem(itemUid){
-			$.ajax({
-				dataType: 'text',
-				cache: false,
-				url:      "<c:url value="/completeItem.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=" + itemUid,
-				error: function(jqXHR, textStatus, errorThrown) {
-					alert('Error while marking item as complete.\nStatus: ' + textStatus + '\nError: ' + errorThrown);
-				},
-				success:  function() {
-					itemsComplete++;
-					if (${resource.miniViewResourceNumber} > 0 && itemsComplete >= ${resource.miniViewResourceNumber}) {
-						checkNew();
-						return;
+			function completeItem(itemUid){
+				$.ajax({
+					dataType: 'text',
+					cache: false,
+					url:      "<c:url value="/completeItem.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=" + itemUid,
+					error: function(jqXHR, textStatus, errorThrown) {
+						alert('Error while marking item as complete.\nStatus: ' + textStatus + '\nError: ' + errorThrown);
+					},
+					success:  function() {
+						itemsComplete++;
+						if (${resource.miniViewResourceNumber} > 0 && itemsComplete >= ${resource.miniViewResourceNumber}) {
+							checkNew();
+							return;
+						}
+
+						let heading = $('#heading' + itemUid);
+						$('.complete-item-button', heading).remove();
+						$('.icon-complete', heading).removeClass('hidden');
 					}
-					
-					let heading = $('#heading' + itemUid);
-					$('.complete-item-button', heading).remove();
-					$('.icon-complete', heading).removeClass('hidden');
+				});
+			}
+
+			function gotoURL(){
+				var reqIDVar = new Date();
+				var gurl = "<c:url value="/learning/addurl.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
+				$.ajaxSetup({ cache: true });
+				$("#addresource").load(gurl, function() {
+					$("#itemType").val("1");
+					$("#mode").val("${mode}");
+					$("#sessionMapID").val("${sessionMapID}");
+				});
+			}
+
+			/**
+			 Preview for adding learner URL
+			 **/
+			// there is no item ID yet, so just use 0
+			function iframelyCallback0(response) {
+				if (!response || !response.html) {
+					$('#addresource #preview-panel').addClass('hidden');
+					return;
 				}
-			});
-		}
-		
-	    function gotoURL(){
-	    	var reqIDVar = new Date();
-	   		var gurl = "<c:url value="/learning/addurl.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
-	   		$.ajaxSetup({ cache: true });
-	        $("#addresource").load(gurl, function() {
-	        	$("#itemType").val("1");
-				$("#mode").val("${mode}");
-				$("#sessionMapID").val("${sessionMapID}");
-	        });
-		}
 
-	    /**
-	     Preview for adding learner URL
-	    **/
-		// there is no item ID yet, so just use 0
-		function iframelyCallback0(response) {
-			if (!response || !response.html) {
-				$('#addresource #preview-panel').addClass('hidden');
-				return;
+				if (response.title && $('#addresource  #title').val().trim() == '') {
+					$('#title').val(response.title);
+				}
+
+				iframelyCallback(0, response);
+				$('#addresource #preview-panel').removeClass('hidden');
 			}
 
-			if (response.title && $('#addresource  #title').val().trim() == '') {
-				$('#title').val(response.title);
+			function gotoFile(){
+				var reqIDVar = new Date();
+				var gurl = "<c:url value="/learning/addfile.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
+				$.ajaxSetup({ cache: true });
+				$("#addresource").load(gurl, function() {
+					$("#itemType").val("2");
+					$("#mode").val("${mode}");
+					$("#sessionMapID").val("${sessionMapID}");
+				});
 			}
 
-			iframelyCallback(0, response);
-			$('#addresource #preview-panel').removeClass('hidden');
-		}
-	    
-		function gotoFile(){
-		    var reqIDVar = new Date();
-		    var gurl = "<c:url value="/learning/addfile.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
-		    $.ajaxSetup({ cache: true });
-	        $("#addresource").load(gurl, function() {
-	        	$("#itemType").val("2");
-				$("#mode").val("${mode}");
-				$("#sessionMapID").val("${sessionMapID}");
-	        });
-		}		
-		
-		function cancel(){
-			$('.btn-disable-on-submit').prop('disabled', false);
-			$("#addresource").html('');
-		}		
-		
-		function checkNew(){
-			document.location.href = '<c:url value="/learning/start.do"/>?mode=${mode}&toolSessionID=${toolSessionID}&reqID='
-									 + new Date().getTime();				
- 		    return false;
-		}
-		
-		function finishSession(){
-			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
-		}
-		
-		function continueReflect(){
-			$('.btn-disable-on-submit').prop('disabled', true);
-			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
-		}
-		
-		function hideItem(itemUid) {
-			if(confirm("<fmt:message key='${delConfirmMsgKey}'/>")){
-		        $.ajax({
-		        	url: '<c:url value="/learning/hideItem.do"/>',
-		            data: 'sessionMapID=${sessionMapID}&itemUid=' + itemUid,
-		            cache : false,
-					async: false,
-		            success: function () {
-		            	checkNew();
-		            }
-		       	});
+			function cancel(){
+				$('.btn-disable-on-submit').prop('disabled', false);
+				$("#addresource").html('');
 			}
-		}
-	</script>
-</lams:head>
-<body class="stripes">
 
+			function checkNew(){
+				document.location.href = '<c:url value="/learning/start.do"/>?mode=${mode}&toolSessionID=${toolSessionID}&reqID='
+						+ new Date().getTime();
+				return false;
+			}
+
+			function finishSession(){
+				document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
+			}
+
+			function continueReflect(){
+				$('.btn-disable-on-submit').prop('disabled', true);
+				document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
+			}
+
+			function hideItem(itemUid) {
+				if(confirm("<fmt:message key='${delConfirmMsgKey}'/>")){
+					$.ajax({
+						url: '<c:url value="/learning/hideItem.do"/>',
+						data: 'sessionMapID=${sessionMapID}&itemUid=' + itemUid,
+						cache : false,
+						async: false,
+						success: function () {
+							checkNew();
+						}
+					});
+				}
+			}
+		</script>
+	</lams:head>
+	<body class="stripes">
+
 	<lams:Page type="learner" title="${resource.title}">
-	
+
 		<!--  Warnings -->
 		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher' and (resource.allowAddFiles or resource.allowAddUrls) }">
 			<lams:Alert type="danger" id="warn-lock" close="false">
 				<c:choose>
 					<c:when test="${sessionMap.userFinished}">
-						<fmt:message key="message.activityLocked" /> 
+						<fmt:message key="message.activityLocked" />
 					</c:when>
 					<c:otherwise>
 						<fmt:message key="message.warnLockOnFinish" />
 					</c:otherwise>
 				</c:choose>
 			</lams:Alert>
 		</c:if>
-	
+
 		<c:if test="${resource.miniViewResourceNumber > 0}">
 			<lams:Alert type="info" id="warn-numResources" close="false">${resource.miniViewNumberStr}</lams:Alert>
 		</c:if>
@@ -307,41 +306,41 @@
 				<div class="btn-group pull-right">
 					<c:if test="${mode != 'teacher'}">
 						<a href="#" onclick="javascript:return checkNew()" type="button" class="btn btn-xs btn-default">
-						<i class="fa fa-xm fa-refresh"></i> <fmt:message key="label.check.for.new" /></a>
+							<i class="fa fa-xm fa-refresh"></i> <fmt:message key="label.check.for.new" /></a>
 					</c:if>
 					<c:if test="${not finishedLock}">
 						<c:choose>
 							<c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
 								<a href="#" onclick="javascript:gotoURL()" type="button" class="btn btn-xs btn-default">
-								<i class="fa fa-xm fa-plus"></i> <fmt:message key="label.authoring.basic.resource.url.input" /></a>
+									<i class="fa fa-xm fa-plus"></i> <fmt:message key="label.authoring.basic.resource.url.input" /></a>
 								<a href="#" onclick="javascript:gotoFile()" type="button" class="btn btn-xs btn-default">
-								<i class="fa fa-xm fa-plus"></i> <fmt:message key="label.authoring.basic.resource.file.input" /></a>
+									<i class="fa fa-xm fa-plus"></i> <fmt:message key="label.authoring.basic.resource.file.input" /></a>
 							</c:when>
-	
+
 							<c:when test="${resource.allowAddFiles && !resource.allowAddUrls}">
 								<a href="#" onclick="javascript:gotoFile()" type="button" class="btn btn-xs btn-default">
-								<i class="fa fa-xm fa-plus"></i> <fmt:message key="label.authoring.basic.resource.file.input" /></a>
+									<i class="fa fa-xm fa-plus"></i> <fmt:message key="label.authoring.basic.resource.file.input" /></a>
 							</c:when>
-	
+
 							<c:when test="${!resource.allowAddFiles && resource.allowAddUrls}">
 								<a href="#" onclick="javascript:gotoURL()" type="button" class="btn btn-xs btn-default">
-								<i class="fa fa-xm fa-plus"></i> <fmt:message key="label.authoring.basic.resource.url.input" /></a>
+									<i class="fa fa-xm fa-plus"></i> <fmt:message key="label.authoring.basic.resource.url.input" /></a>
 							</c:when>
 						</c:choose>
 					</c:if>
 				</div>
 				<!--  End panel button bar -->
-			</div> 
+			</div>
 
 			<c:forEach var="item" items="${sessionMap.resourceList}">
-			    <div class="item-panel panel panel-default" >
-			        <div class="panel-heading" id="heading${item.uid}">
+				<div class="item-panel panel panel-default" >
+					<div class="panel-heading" id="heading${item.uid}">
 			        	<span class="panel-title collapsable-icon-left">
-				        	<a class="collapsed" role="button" data-toggle="collapse" href="#collapse${item.uid}" 
-									aria-expanded="false" aria-controls="collapse${item.uid}" >
+				        	<a class="collapsed" role="button" data-toggle="collapse" href="#collapse${item.uid}"
+							   aria-expanded="false" aria-controls="collapse${item.uid}" >
 								<c:out value="${item.title}" escapeXml="true"/>
 								<c:if test="${!item.createByAuthor && item.createBy != null}">
-										(<c:out value="${item.createBy.firstName} ${item.createBy.lastName}" escapeXml="true"/>)
+									(<c:out value="${item.createBy.firstName} ${item.createBy.lastName}" escapeXml="true"/>)
 								</c:if>
 							</a>
 						</span>
@@ -353,25 +352,25 @@
 								<c:when test="${not finishedLock}">
 									<i class="fa fa-check-circle icon-complete hidden" style="font-size: 1.5em;color: green;" title='<fmt:message key="label.completed" />'></i>
 									<button type="button" onClick="javascript:completeItem(${item.uid})"
-										   class="complete-item-button btn btn-xs btn-default">
+											class="complete-item-button btn btn-xs btn-default">
 										<fmt:message key='label.finish' />
 									</button>
 								</c:when>
 							</c:choose>
-							
-							
+
+
 							<c:if test="${not finishedLock && !item.createByAuthor && userID == item.createBy.userId}">
 								<i class="fa fa-trash delete-item-button" style="color: red;"
 								   title="<fmt:message key="label.delete" />"
 								   onclick="hideItem(${item.uid})"></i>
 							</c:if>
 						</div>
-			        </div>
-			        
-			        <div id="collapse${item.uid}" data-item-uid="${item.uid}" class="item-collapse panel-collapse collapse"
-			        	 role="tabpanel" aria-labelledby="heading${item.uid}"></div>
+					</div>
+
+					<div id="collapse${item.uid}" data-item-uid="${item.uid}" class="item-collapse panel-collapse collapse"
+						 role="tabpanel" aria-labelledby="heading${item.uid}"></div>
 				</div>
-			</c:forEach>	
+			</c:forEach>
 		</div>
 		<!--  End Resources to View -->
 
@@ -391,18 +390,18 @@
 					</div>
 
 					<c:choose>
-					<c:when test="${empty sessionMap.reflectEntry}">
-						<p>
-							<em> 
-								<fmt:message key="message.no.reflection.available" />
-							</em>
-						</p>
-					</c:when>
-					<c:otherwise>
-						<p>
-							<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
-						</p>
-					</c:otherwise>
+						<c:when test="${empty sessionMap.reflectEntry}">
+							<p>
+								<em>
+									<fmt:message key="message.no.reflection.available" />
+								</em>
+							</p>
+						</c:when>
+						<c:otherwise>
+							<p>
+								<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
+							</p>
+						</c:otherwise>
 					</c:choose>
 
 					<c:if test="${mode != 'teacher'}">
@@ -416,38 +415,38 @@
 		<!-- End Reflection -->
 
 		<c:if test="${mode != 'teacher' && sessionMap.hasCompletedMinNumber}">
-				<c:choose>
-					<c:when
+			<c:choose>
+				<c:when
 						test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
-						<button name="FinishButton"
+					<button name="FinishButton"
 							onclick="return continueReflect()" class="btn btn-default voffset5 pull-right btn-disable-on-submit">
-							<fmt:message key="label.continue" />
-						</button>
-					</c:when>
-					<c:otherwise>
-						<button type="submit" id="finishButton" class="btn btn-primary btn-disable-on-submit voffset5 pull-right na">
+						<fmt:message key="label.continue" />
+					</button>
+				</c:when>
+				<c:otherwise>
+					<button type="submit" id="finishButton" class="btn btn-primary btn-disable-on-submit voffset5 pull-right na">
 							<span class="nextActivity">
 								<c:choose>
-				 					<c:when test="${sessionMap.isLastActivity}">
-				 						<fmt:message key="label.submit" />
-				 					</c:when>
-				 					<c:otherwise>
-				 		 				<fmt:message key="label.finished" />
-				 					</c:otherwise>
-				 				</c:choose>
+									<c:when test="${sessionMap.isLastActivity}">
+										<fmt:message key="label.submit" />
+									</c:when>
+									<c:otherwise>
+										<fmt:message key="label.finished" />
+									</c:otherwise>
+								</c:choose>
 							</span>
-						</button>
-					</c:otherwise>
-				</c:choose>
+					</button>
+				</c:otherwise>
+			</c:choose>
 			</div>
 		</c:if>
 
-	<!--closes content-->
+		<!--closes content-->
 
-	<div id="footer">
-	</div>
-	<!--closes footer-->
+		<div id="footer">
+		</div>
+		<!--closes footer-->
 
 	</lams:Page>
-</body>
-</lams:html>
+	</body>
+</lams:html>
\ No newline at end of file