Index: lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.7.2.3 -r1.7.2.4
--- lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties	3 Jun 2016 08:58:43 -0000	1.7.2.3
+++ lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties	30 Jun 2016 01:26:42 -0000	1.7.2.4
@@ -17,7 +17,7 @@
 label.authoring.basic.instructions  =Instructions:
 label.authoring.basic.video  =Video:
 advanced.lockOnFinished  =Lock when finished
-advanced.allowSeeingOtherUsersRecordings  =Allow leaners to see each other  recordings
+advanced.allowSeeingOtherUsersRecordings  =Allow learners to see each other  recordings
 advanced.allowComments  =Allow comments
 advanced.allowRatings  =Allow ratings
 instructions.onlineInstructions  =Online Instructions:
@@ -118,4 +118,6 @@
 label.reflections  =Notebook Entries
 message.no.reflection.available =No notebook entry was added.
 label.monitoring.summary.no.session  =No Session Available
+label.video.options=Video Options
+label.activity.completion=End of Activity
 #======= End labels: Exported 113 labels for en AU =====
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/AdvancedAccordian.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/Arrow.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag	3 Jun 2016 08:58:43 -0000	1.3.2.2
+++ lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag	30 Jun 2016 01:26:41 -0000	1.3.2.3
@@ -24,8 +24,8 @@
 	<c:set var="toolbarSet" value="Default" />
 </c:if>
 
-<c:if test="${fn:containsIgnoreCase(method,'replace')}">
-	<c:set var="toolbarSet">${toolbarSet}Replace</c:set>
+<c:if test="${fn:containsIgnoreCase(method,'Inline')}">
+	<c:set var="toolbarSet">${toolbarSet}Inline</c:set>
 </c:if>
 
 <c:if test="${empty displayExpanded}">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/Comments.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/CommentsAuthor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_kaltura/web/WEB-INF/tags/Date.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tags/Date.tag,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_kaltura/web/WEB-INF/tags/Date.tag	6 May 2014 19:58:56 -0000	1.2
+++ lams_tool_kaltura/web/WEB-INF/tags/Date.tag	30 Jun 2016 01:26:41 -0000	1.2.2.1
@@ -34,6 +34,7 @@
 <%@ attribute name="value" required="true" rtexprvalue="true" type="java.util.Date" %>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="timeago" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-core" prefix="c" %>
@@ -42,6 +43,10 @@
 	<c:set var="type" value="both" scope="request"/>
 </c:if>
 
+<c:if test="${not empty timeago}">
+	<time class="timeago" datetime="<fmt:formatDate value='${value}' timeZone="GMT" pattern="yyyy-MM-dd'T'HH:mm:ss.S'Z'"/>">
+</c:if>
+	
 <c:choose>
 	<c:when test="${style=='short'}">
 		<fmt:formatDate value="${value}" type="${type}" dateStyle="short" timeStyle="short" />
@@ -53,3 +58,7 @@
 		<fmt:formatDate value="${value}" type="${type}" dateStyle="long" timeStyle="medium" />
 	</c:otherwise>
 </c:choose>
+
+<c:if test="${not empty timeago}">
+	</time>
+</c:if>
\ No newline at end of file
Index: lams_tool_kaltura/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_kaltura/web/WEB-INF/tags/Page.tag	3 Jun 2016 08:58:43 -0000	1.1.2.2
+++ lams_tool_kaltura/web/WEB-INF/tags/Page.tag	30 Jun 2016 01:26:41 -0000	1.1.2.3
@@ -24,7 +24,7 @@
 						<div class="panel-title panel-${type}-title">
 							<c:out value="${title}" escapeXml="true" />
 							<c:if test="${not empty titleHelpURL}">
-								<a style="float: right" href="${titleHelpURL}" target="_new"><span class="help" style="margin: 0px"></span></a>
+								<span class="pull-right">${titleHelpURL}</span>
 							</c:if>
 						</div>
 						<c:if test="${not empty headingContent}">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/RestrictedUsageAccordian.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/SimplePanel.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/TabBodyArea.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/TabBodys.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.4 -r1.3.2.5
--- lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld	3 Jun 2016 08:58:43 -0000	1.3.2.4
+++ lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld	30 Jun 2016 01:26:42 -0000	1.3.2.5
@@ -426,15 +426,15 @@
    	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
-   	</tag-file>
+   	</tag-file>   
    	<tag-file>
        <name>AuthoringRatingCriteria</name>
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>   	
+   	</tag-file>    		
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
@@ -467,10 +467,14 @@
        <name>AdvancedAccordian</name>
        <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
    	</tag-file>  
-   	<tag-file>   		
+   	<tag-file>
    		<name>RestrictedUsageAccordian</name>
    		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
+   	</tag-file>
    	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
Index: lams_tool_kaltura/web/pages/authoring/advanced.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/authoring/advanced.jsp,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_tool_kaltura/web/pages/authoring/advanced.jsp	3 Jun 2016 08:58:43 -0000	1.3.2.2
+++ lams_tool_kaltura/web/pages/authoring/advanced.jsp	30 Jun 2016 01:26:42 -0000	1.3.2.3
@@ -28,61 +28,68 @@
 
 <!-- ========== Advanced Tab ========== -->
 
-<div class="checkbox">
-	<label for="lock-on-finished">
-		<html:checkbox property="lockOnFinished" styleId="lock-on-finished"/>
-		<fmt:message key="advanced.lockOnFinished" />
-	</label>
-</div>
+<lams:SimplePanel titleKey="label.video.options">
 
-<div class="checkbox">
-	<label for="allowContributeVideos">
-		<html:checkbox property="allowContributeVideos" styleId="allowContributeVideos"/>
-		<fmt:message key="advanced.allowContributeVideos" />
-	</label>
-</div>
+	<div class="checkbox">
+		<label for="allowContributeVideos">
+			<html:checkbox property="allowContributeVideos" styleId="allowContributeVideos"/>
+			<fmt:message key="advanced.allowContributeVideos" />
+		</label>
+	</div>
+	
+	<div class="checkbox loffset20">
+		<label for="allowSeeingOtherUsersRecordings">
+			<html:checkbox property="allowSeeingOtherUsersRecordings" styleId="allowSeeingOtherUsersRecordings"/>
+			<fmt:message key="advanced.allowSeeingOtherUsersRecordings" />
+		</label>
+	</div>
+	
+	<div class="form-inline form-group loffset20">
+		<label for="learner-contribution-limit">
+			<fmt:message key="advanced.learnerContributionLimit" />&nbsp;
+			<html:select property="learnerContributionLimit" styleId="learner-contribution-limit" styleClass="form-control input-sm">
+			<html:option value="-1"><fmt:message key="advanced.unlimited" /></html:option>
+			<html:option value="1">1</html:option>
+			<html:option value="2">2</html:option>
+			<html:option value="3">3</html:option>
+			<html:option value="4">4</html:option>
+			<html:option value="5">5</html:option>
+			<html:option value="6">6</html:option>
+			<html:option value="7">7</html:option>
+			<html:option value="8">8</html:option>
+			<html:option value="9">9</html:option>
+			<html:option value="10">10</html:option>
+		</html:select>
+		
+		</label>
+	</div>
+	
+	<div class="checkbox">
+		<label for="allow-comments">
+			<html:checkbox property="allowComments" styleId="allow-comments"/>
+			<fmt:message key="advanced.allowComments" />
+		</label>
+	</div>
+	
+	<div class="checkbox">
+		<label for="allow-ratings">
+			<html:checkbox property="allowRatings" styleId="allow-ratings"/>
+			<fmt:message key="advanced.allowRatings" />
+		</label>
+	</div>
 
-<div class="checkbox loffset20">
-	<label for="allowSeeingOtherUsersRecordings">
-		<html:checkbox property="allowSeeingOtherUsersRecordings" styleId="allowSeeingOtherUsersRecordings"/>
-		<fmt:message key="advanced.allowSeeingOtherUsersRecordings" />
-	</label>
-</div>
+</lams:SimplePanel>
 
-<div class="form-inline form-group loffset20">
-	<html:select property="learnerContributionLimit" styleId="learner-contribution-limit" styleClass="form-control input-sm">
-		<html:option value="-1"><fmt:message key="advanced.unlimited" /></html:option>
-		<html:option value="1">1</html:option>
-		<html:option value="2">2</html:option>
-		<html:option value="3">3</html:option>
-		<html:option value="4">4</html:option>
-		<html:option value="5">5</html:option>
-		<html:option value="6">6</html:option>
-		<html:option value="7">7</html:option>
-		<html:option value="8">8</html:option>
-		<html:option value="9">9</html:option>
-		<html:option value="10">10</html:option>
-	</html:select>
-	<label for="learner-contribution-limit">
-		&nbsp;<fmt:message key="advanced.learnerContributionLimit" />
-	</label>
-</div>
+<lams:SimplePanel titleKey="label.activity.completion">
 
 <div class="checkbox">
-	<label for="allow-comments">
-		<html:checkbox property="allowComments" styleId="allow-comments"/>
-		<fmt:message key="advanced.allowComments" />
+	<label for="lock-on-finished">
+		<html:checkbox property="lockOnFinished" styleId="lock-on-finished"/>
+		<fmt:message key="advanced.lockOnFinished" />
 	</label>
 </div>
 
 <div class="checkbox">
-	<label for="allow-ratings">
-		<html:checkbox property="allowRatings" styleId="allow-ratings"/>
-		<fmt:message key="advanced.allowRatings" />
-	</label>
-</div>
-
-<div class="checkbox">
 	<label for="reflect-on-activity">
 		<html:checkbox property="reflectOnActivity" styleId="reflect-on-activity" />
 		<fmt:message key="advanced.reflectOnActivity" />
@@ -92,3 +99,5 @@
 <div class="form-group">
 	<html:textarea property="reflectInstructions" styleId="reflect-instructions" styleClass="form-control" rows="3"	/>
 </div>
+
+</lams:SimplePanel>
\ No newline at end of file