Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/Alert.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/AuthoringRatingCriteria.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_kaltura/web/WEB-INF/tags/DefineLater.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tags/DefineLater.tag,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_kaltura/web/WEB-INF/tags/DefineLater.tag 20 Jan 2014 15:38:24 -0000 1.3 +++ lams_tool_kaltura/web/WEB-INF/tags/DefineLater.tag 18 Mar 2016 18:45:05 -0000 1.3.2.1 @@ -1,6 +1,6 @@ <% - /**************************************************************** + /**************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ @@ -49,10 +49,18 @@ -

- -

-
- +
+
+
+ +
+
+
+
+ +
+
\ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/Page.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/Rating.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/TSTable.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.2 -r1.3.2.3 --- lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld 24 Feb 2016 12:35:22 -0000 1.3.2.2 +++ lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld 18 Mar 2016 18:45:06 -0000 1.3.2.3 @@ -418,6 +418,14 @@ AuthoringButton /WEB-INF/tags/AuthoringButton.tag + + + AuthoringRatingCriteria + /WEB-INF/tags/AuthoringRatingCriteria.tag + + + Rating + /WEB-INF/tags/Rating.tag headItems @@ -432,6 +440,18 @@ /WEB-INF/tags/DefineLater.tag + TSTable + /WEB-INF/tags/TSTable.tag + + + Alert + /WEB-INF/tags/Alert.tag + + + Page + /WEB-INF/tags/Page.tag + + ImgButtonWrapper /WEB-INF/tags/ImgButtonWrapper.tag Index: lams_tool_kaltura/web/common/learnerheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/common/learnerheader.jsp,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_kaltura/web/common/learnerheader.jsp 16 Apr 2015 14:47:57 -0000 1.1.2.1 +++ lams_tool_kaltura/web/common/learnerheader.jsp 18 Mar 2016 18:45:05 -0000 1.1.2.2 @@ -12,6 +12,8 @@ - + + + Index: lams_tool_kaltura/web/common/message.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/common/message.jsp,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_kaltura/web/common/message.jsp 15 Nov 2012 14:39:30 -0000 1.1 +++ lams_tool_kaltura/web/common/message.jsp 18 Mar 2016 18:45:05 -0000 1.1.2.1 @@ -1,5 +1,5 @@ <%@ include file="/common/taglibs.jsp"%> -

+ ${requestScope.message}; -

+ Index: lams_tool_kaltura/web/layouts/defaultLayout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/layouts/defaultLayout.jsp,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_kaltura/web/layouts/defaultLayout.jsp 26 Feb 2016 07:17:39 -0000 1.1.2.1 +++ lams_tool_kaltura/web/layouts/defaultLayout.jsp 18 Mar 2016 18:45:05 -0000 1.1.2.2 @@ -1,6 +1,4 @@ - - <%@ include file="/common/taglibs.jsp"%> Index: lams_tool_kaltura/web/layouts/learningLayout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/layouts/learningLayout.jsp,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_kaltura/web/layouts/learningLayout.jsp 26 Feb 2016 07:17:39 -0000 1.1.2.1 +++ lams_tool_kaltura/web/layouts/learningLayout.jsp 18 Mar 2016 18:45:05 -0000 1.1.2.2 @@ -1,13 +1,9 @@ - - <%@ include file="/common/taglibs.jsp"%> - - + Index: lams_tool_kaltura/web/layouts/mobileLearningLayout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/layouts/mobileLearningLayout.jsp,v diff -u -r1.2.2.1 -r1.2.2.2 --- lams_tool_kaltura/web/layouts/mobileLearningLayout.jsp 26 Feb 2016 07:17:39 -0000 1.2.2.1 +++ lams_tool_kaltura/web/layouts/mobileLearningLayout.jsp 18 Mar 2016 18:45:05 -0000 1.2.2.2 @@ -1,6 +1,4 @@ - - <%@ include file="/common/taglibs.jsp"%> Index: lams_tool_kaltura/web/layouts/tabLayout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/layouts/tabLayout.jsp,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_kaltura/web/layouts/tabLayout.jsp 9 Feb 2016 18:53:23 -0000 1.1.2.1 +++ lams_tool_kaltura/web/layouts/tabLayout.jsp 18 Mar 2016 18:45:05 -0000 1.1.2.2 @@ -1,5 +1,4 @@ - <%@ include file="/common/taglibs.jsp"%> 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 -r1.3.2.1 --- lams_tool_kaltura/web/pages/authoring/advanced.jsp 15 May 2013 11:13:05 -0000 1.3 +++ lams_tool_kaltura/web/pages/authoring/advanced.jsp 18 Mar 2016 18:45:05 -0000 1.3.2.1 @@ -1,5 +1,4 @@ <%@ include file="/common/taglibs.jsp"%> - -

Index: lams_tool_kaltura/web/pages/authoring/authoring.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/authoring/authoring.jsp,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_kaltura/web/pages/authoring/authoring.jsp 17 Jan 2014 22:04:38 -0000 1.2 +++ lams_tool_kaltura/web/pages/authoring/authoring.jsp 18 Mar 2016 18:45:05 -0000 1.2.2.1 @@ -1,5 +1,4 @@ <%@ include file="/common/taglibs.jsp"%> - <%@ page import="org.lamsfoundation.lams.tool.kaltura.util.KalturaConstants"%> Index: lams_tool_kaltura/web/pages/authoring/basic.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/authoring/basic.jsp,v diff -u -r1.8 -r1.8.2.1 --- lams_tool_kaltura/web/pages/authoring/basic.jsp 11 Jun 2013 09:56:33 -0000 1.8 +++ lams_tool_kaltura/web/pages/authoring/basic.jsp 18 Mar 2016 18:45:05 -0000 1.8.2.1 @@ -1,5 +1,4 @@ <%@ include file="/common/taglibs.jsp"%> - <%@ page import="org.lamsfoundation.lams.util.Configuration" %> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> Index: lams_tool_kaltura/web/pages/authoring/pedagogicalPlannerForm.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/authoring/pedagogicalPlannerForm.jsp,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_kaltura/web/pages/authoring/pedagogicalPlannerForm.jsp 26 Feb 2016 07:17:39 -0000 1.1.2.1 +++ lams_tool_kaltura/web/pages/authoring/pedagogicalPlannerForm.jsp 18 Mar 2016 18:45:05 -0000 1.1.2.2 @@ -1,7 +1,6 @@ - - <%@ include file="/common/taglibs.jsp"%> + Index: lams_tool_kaltura/web/pages/authoring/preview.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/authoring/preview.jsp,v diff -u -r1.3.2.1 -r1.3.2.2 --- lams_tool_kaltura/web/pages/authoring/preview.jsp 9 Feb 2016 18:53:24 -0000 1.3.2.1 +++ lams_tool_kaltura/web/pages/authoring/preview.jsp 18 Mar 2016 18:45:05 -0000 1.3.2.2 @@ -1,27 +1,23 @@ - <%@ include file="/common/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.util.Configuration" %> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> - <%=Configuration.get(ConfigurationKeys.KALTURA_SERVER)%> - <%=Configuration.get(ConfigurationKeys.KALTURA_PARTNER_ID)%> - <%=Configuration.get(ConfigurationKeys.KALTURA_SUB_PARTNER_ID)%> - <%=Configuration.get(ConfigurationKeys.KALTURA_USER_SECRET)%> - <%=Configuration.get(ConfigurationKeys.KALTURA_KCW_UI_CONF_ID)%> - <%=Configuration.get(ConfigurationKeys.KALTURA_KDP_UI_CONF_ID)%> +<%=Configuration.get(ConfigurationKeys.KALTURA_SERVER)%> +<%=Configuration.get(ConfigurationKeys.KALTURA_PARTNER_ID)%> +<%=Configuration.get(ConfigurationKeys.KALTURA_SUB_PARTNER_ID)%> +<%=Configuration.get(ConfigurationKeys.KALTURA_USER_SECRET)%> +<%=Configuration.get(ConfigurationKeys.KALTURA_KCW_UI_CONF_ID)%> +<%=Configuration.get(ConfigurationKeys.KALTURA_KDP_UI_CONF_ID)%> - - - -

-

- -

+ -
-
-
- - + -
+ - -
Index: lams_tool_kaltura/web/pages/learning/commentlist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/learning/commentlist.jsp,v diff -u -r1.4 -r1.4.2.1 --- lams_tool_kaltura/web/pages/learning/commentlist.jsp 2 Jun 2014 21:42:17 -0000 1.4 +++ lams_tool_kaltura/web/pages/learning/commentlist.jsp 18 Mar 2016 18:45:05 -0000 1.4.2.1 @@ -9,61 +9,68 @@ <%@ include file="/common/messages.jsp"%> - -
- -
-
- - - +
+
+ + + + + + + - - + + + + - - - -
+ +
class="item-hidden" > - - -
- - - - - - -
- - -
- - - - - - - - - - - - - - - - - +
class="item-hidden" > + +
+ + + - +
- -
+ + +
+ + + + + + + + + + + + + + + + + + +
+
+ + + + + + +
- + -
- +
+
Index: lams_tool_kaltura/web/pages/learning/defineLater.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/learning/defineLater.jsp,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_kaltura/web/pages/learning/defineLater.jsp 15 Nov 2012 14:39:31 -0000 1.1 +++ lams_tool_kaltura/web/pages/learning/defineLater.jsp 18 Mar 2016 18:45:05 -0000 1.1.2.1 @@ -1,11 +1,11 @@ <%@ include file="/common/taglibs.jsp"%> -
-

- -

+ + + + -
+ Index: lams_tool_kaltura/web/pages/learning/finish.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/learning/finish.jsp,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_kaltura/web/pages/learning/finish.jsp 15 Nov 2012 14:39:31 -0000 1.1 +++ lams_tool_kaltura/web/pages/learning/finish.jsp 18 Mar 2016 18:45:05 -0000 1.1.2.1 @@ -1,5 +1,3 @@ Index: lams_tool_kaltura/web/pages/learning/learning.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/learning/learning.jsp,v diff -u -r1.11 -r1.11.2.1 --- lams_tool_kaltura/web/pages/learning/learning.jsp 3 Jul 2014 16:48:40 -0000 1.11 +++ lams_tool_kaltura/web/pages/learning/learning.jsp 18 Mar 2016 18:45:05 -0000 1.11.2.1 @@ -23,18 +23,16 @@ - -
-

- -

+ -

+

-

+
-
+ -
+
-
+ @@ -238,15 +232,15 @@ -
+
-
-
- -
+
-
+
+
+ +
@@ -255,172 +249,172 @@ + + +
+ + <%--"Check for new" and "Add new image" buttons---------------%> + +
+ + + + + + + + + + + + + + + + + + ${itemMark} + + + +
+ + + + + <%@ include file="/pages/learning/ratingStars.jsp"%> + +
+ + <%--Comments area----------------------------------------------%> + + +
+ <%@ include file="/pages/learning/commentlist.jsp"%> +
+
-
-
+ + - - - - -
- - <%--"Check for new" and "Add new image" buttons---------------%> - -
- - - - - - - - - - - - - - - - - - ${itemMark} - - - -
- - - - - <%@ include file="/pages/learning/ratingStars.jsp"%> - -
- - <%--Comments area----------------------------------------------%> - - -
- <%@ include file="/pages/learning/commentlist.jsp"%> -
-
+ + + + <%--Reflection--------------------------------------------------%> -
-

- -

- - - -

- - - -

-
- -

- -

-
-
- - - - - - +
+
+
+ +
+ +
+ + + + + + + + + + +
+ + + + + + +
<%--Bottom buttons-------------------------------------------%> -
+
- + - - + + @@ -436,4 +430,4 @@
-
+ Index: lams_tool_kaltura/web/pages/learning/notebook.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/learning/notebook.jsp,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_kaltura/web/pages/learning/notebook.jsp 27 Mar 2014 22:27:38 -0000 1.3 +++ lams_tool_kaltura/web/pages/learning/notebook.jsp 18 Mar 2016 18:45:05 -0000 1.3.2.1 @@ -8,43 +8,42 @@ function disableFinishButton() { document.getElementById("finishButton").disabled = true; } - function submitForm(methodName){ + function submitForm(methodName) { var f = document.getElementById('messageForm'); f.submit(); } + $(document).ready(function() { + document.getElementById("focused").focus(); + }); -
-

- -

+ <%@ include file="/common/messages.jsp"%> -

+

-

+
- + -
- - - - - - - - - - - - -
-
+ + + + + + + + + + + + + +
Index: lams_tool_kaltura/web/pages/learning/submissionDeadline.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/learning/submissionDeadline.jsp,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_kaltura/web/pages/learning/submissionDeadline.jsp 27 Mar 2014 22:27:38 -0000 1.2 +++ lams_tool_kaltura/web/pages/learning/submissionDeadline.jsp 18 Mar 2016 18:45:05 -0000 1.2.2.1 @@ -12,43 +12,38 @@ function disableFinishButton() { document.getElementById("finishButton").disabled = true; } - function submitForm(methodName){ + function submitForm(methodName) { var f = document.getElementById('messageForm'); f.submit(); } -
-

- -

+ -
+ -
+ -
- - - - - - - - - - - - -
+ + + + + + + + + + + +
-
+ Index: lams_tool_kaltura/web/pages/learning/uploaditem.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/pages/learning/uploaditem.jsp,v diff -u -r1.6.2.1 -r1.6.2.2 --- lams_tool_kaltura/web/pages/learning/uploaditem.jsp 9 Feb 2016 18:53:23 -0000 1.6.2.1 +++ lams_tool_kaltura/web/pages/learning/uploaditem.jsp 18 Mar 2016 18:45:05 -0000 1.6.2.2 @@ -19,7 +19,6 @@ + + + -
- -
- -
+ -
+
-
- - - - - -
-
+ + + +
- -