Index: lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rf09024eafcaf818a4358a0257bbd82d2efcf56d5 -r8b6dcc5904e996594d3bf75d4f67a7292234717d
--- lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision f09024eafcaf818a4358a0257bbd82d2efcf56d5)
+++ lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 8b6dcc5904e996594d3bf75d4f67a7292234717d)
@@ -117,5 +117,6 @@
 label.video.is.hidden  =This video is hidden.
 output.desc.learner.number.viewed.videos  =Number of videos viewed by user
 output.desc.learner.number.uploaded.videos  =Number of videos uploaded by user
+label.list.of.videos  =List of videos
 
 #======= End labels: Exported 113 labels for en AU =====
Index: lams_tool_kaltura/web/WEB-INF/urlrewrite.xml
===================================================================
diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r8b6dcc5904e996594d3bf75d4f67a7292234717d
--- lams_tool_kaltura/web/WEB-INF/urlrewrite.xml	(.../urlrewrite.xml)	(revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b)
+++ lams_tool_kaltura/web/WEB-INF/urlrewrite.xml	(.../urlrewrite.xml)	(revision 8b6dcc5904e996594d3bf75d4f67a7292234717d)
@@ -21,6 +21,16 @@
     	<from>^/layouts/learningLayout.jsp$</from>
         <to>/layouts/mobileLearningLayout.jsp</to>
     </rule>
-
+    
+    <rule>
+        <note>
+            Handles the exceptional case of /pages/learning/commentlist.jsp which doens't use tiles.
+        </note>
+        <condition name="user-agent" next="or">.*(android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino).*?i</condition>
+    	<condition name="user-agent">^(1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\\-(n|u)|c55\\/|capi|ccwa|cdm\\-|cell|chtm|cldc|cmd\\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\\-s|devi|dica|dmob|do(c|p)o|ds(12|\\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\\-|_)|g1 u|g560|gene|gf\\-5|g\\-mo|go(\\.w|od)|gr(ad|un)|haie|hcit|hd\\-(m|p|t)|hei\\-|hi(pt|ta)|hp( i|ip)|hs\\-c|ht(c(\\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\\-(20|go|ma)|i230|iac( |\\-|\\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\\/)|klon|kpt |kwc\\-|kyo(c|k)|le(no|xi)|lg( g|\\/(k|l|u)|50|54|e\\-|e\\/|\\-[a-w])|libw|lynx|m1\\-w|m3ga|m50\\/|ma(te|ui|xo)|mc(01|21|ca)|m\\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\\-2|po(ck|rt|se)|prox|psio|pt\\-g|qa\\-a|qc(07|12|21|32|60|\\-[2-7]|i\\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\\-|oo|p\\-)|sdk\\/|se(c(\\-|0|1)|47|mc|nd|ri)|sgh\\-|shar|sie(\\-|m)|sk\\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\\-|v\\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\\-|tdg\\-|tel(i|m)|tim\\-|t\\-mo|to(pl|sh)|ts(70|m\\-|m3|m5)|tx\\-9|up(\\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\\-|2|g)|yas\\-|your|zeto|zte\\-).*?i</condition>
+        <from>^/pages/learning/commentlist.jsp$</from>
+        <to>/pages/learning/mobile/commentlist.jsp</to>
+    </rule>
+ 
 </urlrewrite>
 
Index: lams_tool_kaltura/web/pages/learning/learning.jsp
===================================================================
diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r8b6dcc5904e996594d3bf75d4f67a7292234717d
--- lams_tool_kaltura/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b)
+++ lams_tool_kaltura/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8b6dcc5904e996594d3bf75d4f67a7292234717d)
@@ -54,9 +54,10 @@
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
 <script type="text/javascript" src="includes/javascript/instantedit.js"></script>
 <script type="text/javascript">
+	//var for thickbox.js
 	var tb_pathToImage = "<lams:LAMSURL/>images/loadingAnimation.gif";
+	//var for jquery.jRating.js
 	var pathToImageFolder = "<lams:LAMSURL/>images/css/";
-	
 	//var for instantedit.js
 	var urlBase = '<c:url value="/monitoring.do"/>';
 </script>
@@ -343,44 +344,44 @@
 	
 	<div id="player-bottombar">
 		
-	<%--"Check for new" and "Add new image" buttons---------------%>
+		<%--"Check for new" and "Add new image" buttons---------------%>
 	
-	<div id="add-new-item">
-		<c:if test="${sessionMap.isAllowUpload && (not finishedLock)}">
-			<a href="<c:url value='/pages/learning/uploaditem.jsp'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&height=570&width=740&modal=true" class="button-add-item thickbox">  
-				<fmt:message key="label.learning.add.new.image" />
-			</a>
-		</c:if>
-		
-		<c:if test="${sessionMap.isAllowUpload}">
-			<a href="#nogo" onclick="return checkNew()" class="button check_for_new space-left" style="visibility: hidden;"> 
-				<fmt:message key="label.check.for.new" /> 
-			</a>
-		</c:if>
-		
-		<c:if test="${sessionMap.isGroupMonitoring}">
-			<fmt:message key="label.mark" />
-			 
-			<c:choose>
-				<c:when test="${item.mark == null}">
-					<c:set var="itemMark" value="0"/>	
-				</c:when>
-				<c:otherwise>
-					<c:set var="itemMark" value="${item.mark}"/>			
-				</c:otherwise>
-			</c:choose>
-			<span id="itemMark">${itemMark}</span>
+		<div id="add-new-item">
+			<c:if test="${sessionMap.isAllowUpload && (not finishedLock)}">
+				<a href="<c:url value='/pages/learning/uploaditem.jsp'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&height=570&width=740&modal=true" class="button-add-item thickbox">  
+					<fmt:message key="label.learning.add.new.image" />
+				</a>
+			</c:if>
 			
-			<sup><a href="javascript:;" id="editItemMark"><fmt:message key="label.mark.edit" /></a></sup>
-		</c:if>
-	</div>
+			<c:if test="${sessionMap.isAllowUpload}">
+				<a href="#nogo" onclick="return checkNew()" class="button check_for_new space-left" style="visibility: hidden;"> 
+					<fmt:message key="label.check.for.new" /> 
+				</a>
+			</c:if>
+			
+			<c:if test="${sessionMap.isGroupMonitoring}">
+				<fmt:message key="label.mark" />
+				 
+				<c:choose>
+					<c:when test="${item.mark == null}">
+						<c:set var="itemMark" value="0"/>	
+					</c:when>
+					<c:otherwise>
+						<c:set var="itemMark" value="${item.mark}"/>			
+					</c:otherwise>
+				</c:choose>
+				<span id="itemMark">${itemMark}</span>
+				
+				<sup><a href="javascript:;" id="editItemMark"><fmt:message key="label.mark.edit" /></a></sup>
+			</c:if>
+		</div>
 	
-	<!--  Rating stars -->
+		<!--  Rating stars -->
 	
-	<c:if test="${kaltura.allowRatings && (item.uid != -1)}">
-		<%@ include file="/pages/learning/ratingStars.jsp"%>
-	</c:if>
-</div>
+		<c:if test="${kaltura.allowRatings && (item.uid != -1)}">
+			<%@ include file="/pages/learning/ratingStars.jsp"%>
+		</c:if>
+	</div>
 	    	
     <%--Comments area----------------------------------------------%>	
     	
Index: lams_tool_kaltura/web/pages/learning/mobile/commentlist.jsp
===================================================================
diff -u
--- lams_tool_kaltura/web/pages/learning/mobile/commentlist.jsp	(revision 0)
+++ lams_tool_kaltura/web/pages/learning/mobile/commentlist.jsp	(revision 8b6dcc5904e996594d3bf75d4f67a7292234717d)
@@ -0,0 +1,41 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="comments" value="${sessionMap.item.groupComments}" />
+<c:set var="mode" value="${sessionMap.mode}" />
+<c:set var="item" value="${sessionMap.item}" />
+<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
+
+<%@ include file="/common/messages.jsp"%>
+
+<table cellspacing="0" class="alternative-color" id="comments-table">
+	<c:forEach var="comment" items="${comments}">
+		
+			<tr>
+				<td id="comment${comment.uid}" <c:if test="${comment.hidden}"> class="item-hidden" </c:if>>
+					<c:out value="${comment.comment}" escapeXml="false" />
+					
+					<div class="comment-by">
+						<fmt:message key="label.learning.by" />
+						${comment.createBy.loginName}
+								-				
+						<lams:Date value="${comment.createDate}" />
+					
+					</div>
+				</td>
+			</tr>
+		
+	</c:forEach>
+</table>
+
+<c:if test="${(mode != 'teacher') && !finishedLock}">
+	<div >
+		<lams:STRUTS-textarea property="comment" rows="3" cols="53" styleId="comment-textarea" style="margin-right:10px;" value=""/>		
+		
+		<div>
+			<html:button property="commentButton" onclick="javascript:addNewComment(document.getElementById('comment__lamshidden').value);">
+				<fmt:message key="label.learning.post.comment" />
+			</html:button>
+		</div>
+	</div>
+</c:if>
Index: lams_tool_kaltura/web/pages/learning/mobile/defineLater.jsp
===================================================================
diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r8b6dcc5904e996594d3bf75d4f67a7292234717d
--- lams_tool_kaltura/web/pages/learning/mobile/defineLater.jsp	(.../defineLater.jsp)	(revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b)
+++ lams_tool_kaltura/web/pages/learning/mobile/defineLater.jsp	(.../defineLater.jsp)	(revision 8b6dcc5904e996594d3bf75d4f67a7292234717d)
@@ -5,15 +5,14 @@
 		<fmt:message key="activity.title" />
 	</h1>
 </div>
-
+	
 <div data-role="content">
 	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
 </div>
-	
+		
 <div data-role="footer" data-theme="b">
 	<h2>&nbsp;</h2>
 </div>
 
 
 
-
Index: lams_tool_kaltura/web/pages/learning/mobile/learning.jsp
===================================================================
diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r8b6dcc5904e996594d3bf75d4f67a7292234717d
--- lams_tool_kaltura/web/pages/learning/mobile/learning.jsp	(.../learning.jsp)	(revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b)
+++ lams_tool_kaltura/web/pages/learning/mobile/learning.jsp	(.../learning.jsp)	(revision 8b6dcc5904e996594d3bf75d4f67a7292234717d)
@@ -16,48 +16,141 @@
 <c:set var="mode" value="${sessionMap.mode}" />
 <c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
 <c:set var="kaltura" value="${sessionMap.kaltura}" />
+<c:set var="item" value="${sessionMap.item}" />
+<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 
+<link href="<lams:LAMSURL/>css/jquery.jRating.css" rel="stylesheet" type="text/css" media="screen"/>
+
+<style media="screen,projection" type="text/css">
+	#player-block {margin-top: 25px; clear: both; display: inline-block;  position: relative; width: 85%;}
+	#player-wrap {clear: both; margin-bottom: 20px; background: black; position: absolute; top: 0; bottom: 0; left: 0; right: 0;}
+	#dummy {padding-top: 75%;} /* 4:3 aspect ratio. I.e. padding-top:75% gives the box of the dummy element a height that is 75% of the aforementioned width*/
+	#player-bottombar {width: 85%;}
+	.rating-stars-div {float: right; margin-bottom: 10px; min-height: 50px; padding-right: 10px;}
+	.rating-stars-caption { text-align: left; padding-left: 20px; }
+	.rating-stars-disabled-small {padding: 5px 5px;}
+	#accordion { padding: 65px 0 20px;}
+	#comments-area {margin-top:10px; margin-bottom: 30px;}
+	#comments-table {border-spacing: 10px; margin-bottom: 0; margin-top: 0;}
+	.comment-by {font-size: .9166em; color: #8E8E8E; margin-top: 3px;}
+	.comment-by-text {color: #8E8E8E;}
+	.item-hidden {background: #FFB3B3!important;}
+
+	#player-sidebar {width: 100%; }
+	#player-sidebar ul {list-style: none outside none; }
+	#player-sidebar ul li {padding: 5px 0 15px 5px; clear: both; margin-bottom: 20px; }
+	#player-sidebar ul li a .review-item-link { background: transparent; border-bottom: none; -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; -webkit-transition: background .15s ease-in-out; position: relative; overflow: hidden; color: #333; zoom: 1;}
+	.thumb-wrap {float: left; margin: 0 8px 0 0; position: relative; display: inline-block;	background: transparent; }
+	.duration {padding: 0 4px; font-weight: bold; font-size: 11px; moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; background-color: black; color: white!important; height: 14px; line-height: 14px; opacity: 0.75; display: inline-block; vertical-align: top; zoom: 1; right: 2px; bottom: 2px; position: absolute;}
+	.thumb-title {width: auto; font-size: 18px; font-weight: bold; line-height: 18px; max-height: 36px; color: #333; display: block; margin-bottom: 4px; overflow: hidden; cursor: pointer;}
+	.thumb-stat {display: block; font-size: 14px; color: #666; line-height: 1.4em; max-height: 1.4em; height: 1.4em; white-space: nowrap; overflow: hidden;}
+	.thumb-text {color: #666;}
+</style>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
 <script type="text/javascript">
-<!--
-	var mode = "${mode}";
+	//var for jquery.jRating.js
+	var pathToImageFolder = "<lams:LAMSURL/>images/css/";
+</script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.jRating.js"></script>
 
-	function disableFinishButton() {
-		document.getElementById("finishButton").disabled = true;
-	}
+<script type="text/javascript" src="includes/javascript/swfobject.js"></script>
+<script type="text/javascript" src="http://cdnbakmi.kaltura.com/html5/html5lib/v1.6.10.4/mwEmbedLoader.php"></script>
 
-	function validateForm() {
+<script type="text/javascript">
+	<!--
+	//Kaltura settings
+	//kaltura server 
+	var KALTURA_SERVER = "${KALTURA_SERVER}";
+	//your actual parner id
+	var PARTNER_ID = "${PARTNER_ID}";
+	//your actual subparner id
+	var SUB_PARTNER_ID = "${SUB_PARTNER_ID}";
+	//your actual user secret
+	var USER_SECRET = "${USER_SECRET}";
+	//ui_conf_id of Kaltura Contribution Wizard(KCW)
+	var KCW_UI_CONF_ID = "${KCW_UI_CONF_ID}";
+	//ui_conf_id of Kaltura Dynamic Player(KDP)
+	var KDP_UI_CONF_ID = "${KDP_UI_CONF_ID}";
 	
-		// Validates that there's input from the user. 
-		
-		// disables the Finish button to avoid double submittion 
-		disableFinishButton();
-
- 		if (mode == "learner") {
-			// if this is learner mode, then we add this validation see (LDEV-1319)
-		
-			if (document.learningForm.entryText.value == "") {
-				
-				// if the input is blank, then we further inquire to make sure it is correct
-				if (confirm("<fmt:message>message.learner.blank.input</fmt:message>"))  {
-					// if correct, submit form
-					return true;
-				} else {
-					// otherwise, focus on the text area
-					document.learningForm.entryText.focus();
-					document.getElementById("finishButton").disabled = false;
-					return false;      
-				}
-			} else {
-				// there was something on the form, so submit the form
-				return true;
+	//enable HTML5 support
+	mw.setConfig("Kaltura.ServiceUrl" , KALTURA_SERVER );
+	mw.setConfig("Kaltura.CdnUrl" , KALTURA_SERVER );
+	mw.setConfig("Kaltura.ServiceBase", "/api_v3/index.php?service=");
+	mw.setConfig("EmbedPlayer.EnableIframeApi", true );
+	mw.setConfig("EmbedPlayer.UseFlashOnAndroid", false );
+	mw.setConfig("Kaltura.UseAppleAdaptive", false );
+	mw.setConfig("EmbedPlayer.AttributionButton", false );
+	mw.setConfig("EmbedPlayer.OverlayControls", false ); 
+	
+	var params = {
+		allowscriptaccess: "always",
+		allownetworking: "all",
+		allowfullscreen: "true",
+		wmode: "opaque"
+	};	
+	var flashVars = {
+		entryId:  "${item.entryId}"
+	};	
+	swfobject.embedSWF(KALTURA_SERVER + '/kwidget/wid/_' + PARTNER_ID + '/uiconf_id/' + KDP_UI_CONF_ID, "kplayer", "100%", "100%", "9.0.0", "includes/expressInstall.swf", flashVars, params);
+	
+	function checkNew(){
+		document.location.href = '<c:url value="/learning.do"/>?dispatch=viewItem&sessionMapID=${sessionMapID}&itemUid=${item.uid}';
+		return false;
+	}
+	
+	function finishActivity(){
+		$('#finishButton').prop('disabled', true);
+		document.location.href ='<c:url value="/learning.do"/>?dispatch=finishActivity&sessionMapID=${sessionMapID}';
+		return false;
+	}
+	
+	function continueReflect(){
+		document.location.href='<c:url value="/learning.do"/>?dispatch=newReflection&sessionMapID=${sessionMapID}';
+	}
+	
+	function addNewComment(comment){
+		$("#comments-area").load(
+			"<c:url value="/learning.do"/>",
+			{
+				dispatch: "commentItem",
+				itemUid: ${item.uid}, 
+				comment: comment,
+				sessionMapID: "${sessionMapID}"
+			},
+			function(data) {
+				$("#comments-area").trigger( "create" );
 			}
-		}
+			
+		);
 	}
-         function submitForm(methodName){
-                var f = document.getElementById('messageForm');
-                f.submit();
-        }
--->
+	
+	$(document).bind('pageinit', function(){
+		$(".rating-stars").jRating({
+		    phpPath : "<c:url value='/learning.do'/>?dispatch=rateItem&sessionMapID=${sessionMapID}",
+		    rateMax : 5,
+		    decimalLength : 1,
+			onSuccess : function(data, itemUid){
+			    $("#averageRating" + itemUid).html(data.averageRating);
+			    $("#numberOfVotes" + itemUid).html(data.numberOfVotes);
+			},
+			onError : function(){
+			    jError('Error submitting rating, please retry');
+			}
+		});
+	    $(".rating-stars-disabled").jRating({
+	    	rateMax : 5,
+	    	isDisabled : true
+		});
+	    $(".rating-stars-disabled-small").jRating({
+	    	rateMax : 5,
+	    	type: 'small',
+	    	isDisabled : true
+		});
+	
+	});
+	
+	-->
 </script>
 
 <div data-role="header" data-theme="b" data-nobackbtn="true">
@@ -66,64 +159,189 @@
 	</h1>
 </div>
 
-<html:form action="/learning" method="post" onsubmit="return validateForm();" styleId="messageForm">
-	<div data-role="content">
-		<p>
-			${kaltura.instructions}
-		</p>
+<div data-role="content">
+
+	<p>
+		${kaltura.instructions}
+	</p>
+
+	<c:if test="${not empty sessionMap.submissionDeadline}">
+		 <div class="info">
+		 	<fmt:message key="authoring.info.teacher.set.restriction" >
+		 		<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
+		 	</fmt:message>
+		 </div>
+	</c:if>
+
+	<c:if test="${kaltura.lockOnFinished and mode == 'learner'}">
+		<div class="info">
+			<c:choose>
+				<c:when test="${sessionMap.userFinished}">
+					<fmt:message key="message.activityLocked" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="message.warnLockOnFinish" />
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</c:if>
 	
-		<c:if test="${not empty sessionMap.submissionDeadline}">
-			 <div class="info">
-			 	<fmt:message key="authoring.info.teacher.set.restriction" >
-			 		<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
-			 	</fmt:message>
-			 </div>
-		</c:if>
+	<div id="player-block">
+		<div id="dummy"></div>
 	
-		<c:if test="${kaltura.lockOnFinished and mode == 'learner'}">
-			<div class="info">
-				<c:choose>
-					<c:when test="${sessionMap.finishedActivity}">
-						<fmt:message key="message.activityLocked" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="message.warnLockOnFinish" />
-					</c:otherwise>
-				</c:choose>
+		<div id="player-wrap">
+		    
+			<div id="kplayer">
+				<object height="100%" width="100%">
+					<embed height="100%" type="application/x-shockwave-flash" width="100%" src="#"></embed>
+				</object>
 			</div>
-		</c:if>
+				
+		</div>
+		
+
+	</div>
 	
-		<html:hidden property="dispatch" value="finishActivity" />
-		<html:hidden property="toolSessionID" />
+	<div id="player-bottombar">
+	
+		<!--  Rating stars -->
+	
+		<c:if test="${kaltura.allowRatings && (item.uid != -1)}">
+			<%@ include file="/pages/learning/mobile/ratingStars.jsp"%>
+		</c:if>
+	</div>
+	    	
+    <%--Comments area----------------------------------------------%>	
+    
+    <div data-role="collapsible-set" id="accordion">
 
-		<c:set var="lrnForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+		<c:if test="${kaltura.allowComments && (item.uid != -1)}">
+			<div data-role="collapsible" data-collapsed="false">
+				<h3><fmt:message key="label.learning.comments" /></h3>
+				    
+			    <div id="comments-area">
+			    	<%@ include file="/pages/learning/mobile/commentlist.jsp"%>
+			    </div>
+			</div>
+		 </c:if>
+		
+		<c:if test="${not empty sessionMap.items}">
+			<div data-role="collapsible" <c:if test="${!kaltura.allowComments || (item.uid == -1)}">data-collapsed="false"</c:if>>
+				<h3><fmt:message key="label.list.of.videos" /></h3>
+				
+				<div id="player-sidebar">
+				    <ul>
+				    	<c:forEach var="previewItem" items="${sessionMap.items}" varStatus="status">
+				    		<li id="previewItem${previewItem.uid}" <c:if test="${previewItem.hidden}"> class="item-hidden" </c:if>>
+				    			<a href="<c:url value='/learning.do'/>?dispatch=viewItem&sessionMapID=${sessionMapID}&itemUid=${previewItem.uid}" class="review-item-link">
+				    				<span class="thumb-wrap">
+								        <img src="http://cdnbakmi.kaltura.com/p/${PARTNER_ID}/sp/${SUB_PARTNER_ID}/thumbnail/entry_id/${previewItem.entryId}/version/100001/width/150!/height/100!" height="100" width="150" alt="Video">
+								        <em></em>
+								        <span class="duration">
+								        	<fmt:formatDate value="${previewItem.durationDate}" pattern="m:ss" />
+										</span>
+								    </span>
+								    <span class="thumb-title">${previewItem.title}</span>
+								    
+								    <span class="thumb-stat">
+								    	<c:choose>
+											<c:when test="${empty previewItem.createdBy}">
+												<c:set var="videoAuthor" >
+													<fmt:message key="label.uploaded.by.instructor" />
+												</c:set>
+											</c:when>
+											<c:otherwise>
+												<c:set var="videoAuthor" >
+													${previewItem.createdBy.firstName} ${previewItem.createdBy.lastName}
+												</c:set>
+											</c:otherwise>
+										</c:choose>
+										
+								        <fmt:message key="label.uploaded.by" >
+								        	<fmt:param>${videoAuthor}</fmt:param>
+								        </fmt:message>
+								    </span>
+								    
+								    <c:if test="${kaltura.allowRatings}">
+									    <span class="thumb-stat">
+									    	<span style="float: left;"><fmt:message key="label.rating" /></span>
+									        <div class="rating-stars-disabled-small" id="${previewItem.averageRatingDto.rating}_00${previewItem.uid}"></div>
+										</span>
+									</c:if>
+								    
+								    <c:if test="${kaltura.allowComments && (not empty previewItem.groupComments)}">
+									    <span class="thumb-stat">
+									        <fmt:message key="label.number.of.comments" >
+									        	<fmt:param>${fn:length(previewItem.groupComments)}</fmt:param>
+									    	</fmt:message>
+										</span>
+									</c:if>
+								</a>
+								
+				    		</li>
+				    	</c:forEach>
+					</ul>
+				</div>
+				
+			</div>
+		</c:if>
+	</div>
+    	
 
-		<c:choose>
-			<c:when test="${sessionMap.contentEditable}">
-				<html:textarea cols="60" rows="8" property="entryText" styleClass="text-area"></html:textarea>
-			</c:when>
 
-			<c:otherwise>
-				<lams:out value="${lrnForm.entryText}" />
-			</c:otherwise>
-		</c:choose>
+	<%--Reflection--------------------------------------------------%>
 
-	
-	</div>
+	<c:if test="${sessionMap.userFinished && sessionMap.reflectOn && !sessionMap.isGroupMonitoring}">
+		<div class="small-space-top">
+			<h2>
+				${sessionMap.reflectInstructions}
+			</h2>
 
-	<div data-role="footer" data-theme="b" class="ui-bar">
-		<c:choose>
-			<c:when test="${contentEditable}">
-				<span class="ui-finishbtn-right">
-					<a href="#nogo" id="finishButton" onclick="submitForm('finish')" data-role="button" data-icon="arrow-r" data-theme="b">
-						<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
-					</a>
-				</span>
-			</c:when>
+			<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:choose>
+
+			<c:if test="${mode != 'teacher'}">
+				<html:button property="FinishButton" onclick="return continueReflect()" styleClass="button">
+					<fmt:message key="label.edit" />
+				</html:button>
+			</c:if>
+		</div>
+	</c:if>
+</div>
+
+<div data-role="footer" data-theme="b" class="ui-bar">
+	<c:choose>
+		<c:when test="${mode != 'teacher'}">
+			<span class="ui-finishbtn-right">
+				<c:choose>
+					<c:when	test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
+						<button name="FinishButton" onclick="return continueReflect()" data-icon="arrow-r" data-theme="b">
+							<fmt:message key="label.continue" />
+						</button>
+					</c:when>
+					<c:otherwise>
+						<a href="#nogo" id="finishButton" onclick="return finishActivity()" data-role="button" data-icon="arrow-r" data-theme="b">
+							<span class="nextActivity"><fmt:message key="button.finish" /></span>
+						</a>
+					</c:otherwise>
+				</c:choose>
+			</span>
+		</c:when>
 	
-			<c:otherwise>
-				<h2>&nbsp;</h2>
-			</c:otherwise>
-		</c:choose>
-	</div>
-</html:form>
+		<c:otherwise>
+			<h2>&nbsp;</h2>
+		</c:otherwise>
+	</c:choose>
+</div>
Index: lams_tool_kaltura/web/pages/learning/mobile/notebook.jsp
===================================================================
diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r8b6dcc5904e996594d3bf75d4f67a7292234717d
--- lams_tool_kaltura/web/pages/learning/mobile/notebook.jsp	(.../notebook.jsp)	(revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b)
+++ lams_tool_kaltura/web/pages/learning/mobile/notebook.jsp	(.../notebook.jsp)	(revision 8b6dcc5904e996594d3bf75d4f67a7292234717d)
@@ -19,29 +19,29 @@
 		${kaltura.title}
 	</h1>
 </div>
-
+	
 <div data-role="content">
 	<html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 		<html:hidden property="userID" />
 		<html:hidden property="sessionMapID" />
-
-
+	
+	
 		<%@ include file="/common/messages.jsp"%>
-
+	
 		<p>
 			<lams:out value="${kaltura.reflectInstructions}" />
 		</p>
-
+	
 		<html:textarea cols="60" rows="8" property="entryText" styleClass="text-area" />
-
+	
 		<div class="space-bottom-top align-right">
 			<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
 				<span class="nextActivity"><fmt:message key="button.finish" /></span>
 			</html:link>
 		</div>
 	</html:form>
 </div>
-	
+		
 <div data-role="footer" data-theme="b">
 	<h2>&nbsp;</h2>
 </div>
Index: lams_tool_kaltura/web/pages/learning/mobile/ratingStars.jsp
===================================================================
diff -u
--- lams_tool_kaltura/web/pages/learning/mobile/ratingStars.jsp	(revision 0)
+++ lams_tool_kaltura/web/pages/learning/mobile/ratingStars.jsp	(revision 8b6dcc5904e996594d3bf75d4f67a7292234717d)
@@ -0,0 +1,28 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:choose>
+	<c:when test='${(mode == "teacher") || sessionMap.isUserItemAuthor || finishedLock}'>
+		<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
+	</c:when>
+	<c:otherwise>
+		<c:set var="ratingStarsClass" value="rating-stars"/>
+	</c:otherwise>
+</c:choose>
+
+<div class="rating-stars-div">
+	<div class="${ratingStarsClass}" id="${item.averageRatingDto.rating}_${item.uid}"></div>
+	
+	<div class="rating-stars-caption">
+		
+		<fmt:message key="label.learning.number.of.votes" >
+			<fmt:param>
+				<span id="averageRating${item.uid}">
+					<fmt:formatNumber value="${item.averageRatingDto.rating}" type="number" maxFractionDigits="1" />
+				</span>
+			</fmt:param>
+			<fmt:param>
+				<span id="numberOfVotes${item.uid}">${item.averageRatingDto.numberOfVotes}</span>
+			</fmt:param>
+		</fmt:message>
+			
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_kaltura/web/pages/learning/mobile/runOffline.jsp
===================================================================
diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r8b6dcc5904e996594d3bf75d4f67a7292234717d
--- lams_tool_kaltura/web/pages/learning/mobile/runOffline.jsp	(.../runOffline.jsp)	(revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b)
+++ lams_tool_kaltura/web/pages/learning/mobile/runOffline.jsp	(.../runOffline.jsp)	(revision 8b6dcc5904e996594d3bf75d4f67a7292234717d)
@@ -23,7 +23,7 @@
 		${kaltura.title}
 	</h1>
 </div>
-
+	
 <div data-role="content">
 	<c:choose>
 		<c:when test="${empty sessionMap.submissionDeadline}">
@@ -40,11 +40,11 @@
 		</c:otherwise>		
 	</c:choose>
 </div>
-
-
+	
+	
 <div data-role="footer" data-theme="b" class="ui-bar">
 	<span class="ui-finishbtn-right">
-	
+		
 		<c:if test="${mode == 'learner' || mode == 'author'}">
 			<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 				<html:hidden property="dispatch" value="finishActivity" />
@@ -55,11 +55,10 @@
 				</a>
 			</html:form>
 		</c:if>
-		
+			
 	</span>
 </div>
 
-