Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/tags/Alert.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/web/WEB-INF/tags/DefineLater.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tags/DefineLater.tag,v diff -u -r1.3 -r1.3.18.1 --- lams_tool_lamc/web/WEB-INF/tags/DefineLater.tag 27 Oct 2006 02:39:33 -0000 1.3 +++ lams_tool_lamc/web/WEB-INF/tags/DefineLater.tag 23 Feb 2016 14:46:50 -0000 1.3.18.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_lamc/web/WEB-INF/tags/Page.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2.2.1 -r1.2.2.2 --- lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld 4 Aug 2014 14:00:20 -0000 1.2.2.1 +++ lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld 23 Feb 2016 14:46:50 -0000 1.2.2.2 @@ -440,6 +440,14 @@ /WEB-INF/tags/DefineLater.tag + Alert + /WEB-INF/tags/Alert.tag + + + Page + /WEB-INF/tags/Page.tag + + ImgButtonWrapper /WEB-INF/tags/ImgButtonWrapper.tag Index: lams_tool_lamc/web/learning/AnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/AnswersContent.jsp,v diff -u -r1.36.2.4 -r1.36.2.5 --- lams_tool_lamc/web/learning/AnswersContent.jsp 4 May 2015 17:01:25 -0000 1.36.2.4 +++ lams_tool_lamc/web/learning/AnswersContent.jsp 23 Feb 2016 14:46:50 -0000 1.36.2.5 @@ -1,164 +1,181 @@ - - + <%@ include file="/common/taglibs.jsp"%> - - - - - - - - - - + + + + + + <fmt:message key="activity.title" /> - - +div.growlUI { + background: url(check48.png) no-repeat 10px 10px +} + +div.growlUI h1, div.growlUI h2 { + color: white; + padding: 5px 5px 5px 0px; + text-align: center; +} + + - + + + function submitAllAnswers() { + document.McLearningForm.continueOptionsCombined.value = 1; + doSubmit(); + } + + function doSubmit() { + if (verifyAllQuestionsAnswered()) { + disableContinueButton(); + document.McLearningForm.submit(); + } + } + + function verifyAllQuestionsAnswered() { + // in case oneQuestionPerPage option is ON user has to select 1 answer, and all answers otherwise + var isOneQuestionPerPage = ${mcGeneralLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'}; + var answersRequiredNumber = (isOneQuestionPerPage) ? 1 : ${fn:length(requestScope.learnerAnswersDTOList)}; + + //check each question is answered + if ($(':radio:checked').length == answersRequiredNumber) { + return true; + + } else { + var msg = ""; + alert(msg); + return false; + } + } + + function disableContinueButton() { + var elem = document.getElementById("continueButton"); + if (elem != null) { + elem.disabled = true; + } + } + + if (${!hasEditRight && mode != "teacher"}) { + setInterval("checkLeaderProgress();",60000);// Auto-Refresh every 1 minute for non-leaders + } + + function checkLeaderProgress() { + + $.ajax({ + async: false, + url: '', + data: 'method=checkLeaderProgress&toolSessionID=' + $("#tool-session-id").val(), + dataType: 'json', + type: 'post', + success: function (json) { + if (json.isLeaderResponseFinalized) { + location.reload(); + } + } + }); + } + + -
+ -

- -

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

- - ${sessionMap.groupLeader.fullname} + + + + + + + -

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

+ + ${sessionMap.groupLeader.fullname} + +

+ + + + + + + + + + + +
+ - + Index: lams_tool_lamc/web/learning/CombinedAnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/CombinedAnswersContent.jsp,v diff -u -r1.36 -r1.36.2.1 --- lams_tool_lamc/web/learning/CombinedAnswersContent.jsp 29 Mar 2014 02:16:23 -0000 1.36 +++ lams_tool_lamc/web/learning/CombinedAnswersContent.jsp 23 Feb 2016 14:46:50 -0000 1.36.2.1 @@ -1,104 +1,88 @@ <%@ include file="/common/taglibs.jsp"%> - - - - - - + - + -

- -

+
+
+
+
+ + + + + + + + + + +
${dto.displayOrder}) + +
+ [ + + + ] +
+
+
+ +
+ + + + + + + + + +
+ + + checked="checked"/> + + + + checked="checked" disabled="disabled"> + + + + + <%=Character.toChars(97 + (Integer)pageContext.getAttribute("seqLetter"))%>) + + + + +
+
+ - -
- - - -
- +
+
+
+
- -

- - ( - - ) -

- - -
-
- - ${dto.displayOrder}) - - - - - [ - - - ] - -
-
- - - - - - - - - - - - - - -
- - - checked="checked"> - - - - checked="checked" disabled="disabled"> - - - - - - - <%=Character.toChars(97 + (Integer)pageContext.getAttribute("seqLetter"))%>) - - - - -
- -
- + - - - - - -
+ + + + + Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/IndividualLearnerResults.jsp,v diff -u -r1.57.2.2 -r1.57.2.3 --- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp 9 Feb 2016 18:53:19 -0000 1.57.2.2 +++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp 23 Feb 2016 14:46:50 -0000 1.57.2.3 @@ -1,14 +1,5 @@ - <%@ include file="/common/taglibs.jsp"%> - - - - - - - - @@ -21,192 +12,195 @@ elem.disabled = true; } } - - function submitForm(methodName){ - var f = document.getElementById('Form1'); - f.submit(); - } + + function submitForm(methodName) { + var f = document.getElementById('Form1'); + f.submit(); + } -
+ -

- -

+ + +

+ +

+ - - - - - - - - - - + +

+ +

+ + - - -

- -

- - - -

- -

- - - - -

- - - - -

- - +

- - - - - - - - - - - - - - + + + +

+ -

- -

+

+ - + + + + + -

+ + + + + + +

+

+ +

-
- - ${dto.displayOrder}) - + - - - - +
+ +
+ + + + + - - + + + - +
${dto.displayOrder})
+
+
-

- - - - - images/tick.gif" border="0" class="middle"> + + + + + + + + + + - - images/cross.gif" border="0" class="middle"> - - -

+ + +
-

- - -
- + +
+
+

+ +

+
+
+ +
+
+ +
- +
+ - -

- -

- - - - - - - - - - - -
- - - -
- - - -
- + +

+ +

+ + + + + + + + + + +
+ + + + + + + + + + + + + +

- - - - + + + +

- - + + - + -
- - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + -
+ Index: lams_tool_lamc/web/learning/Notebook.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Notebook.jsp,v diff -u -r1.19.2.1 -r1.19.2.2 --- lams_tool_lamc/web/learning/Notebook.jsp 12 Sep 2014 22:43:46 -0000 1.19.2.1 +++ lams_tool_lamc/web/learning/Notebook.jsp 23 Feb 2016 14:46:50 -0000 1.19.2.2 @@ -1,56 +1,47 @@ - - + <%@ include file="/common/taglibs.jsp"%> - - - - - - - - - <fmt:message key="activity.title" /> - + <fmt:message key="activity.title" /> - - - - - - -
+ -

- -

+
+ +
-

- -

+
+ + + + + + + + + + + - - - - - -
- - - -
+ + + -
- + + + + Index: lams_tool_lamc/web/learning/SimpleLearnerError.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/SimpleLearnerError.jsp,v diff -u -r1.3.2.1 -r1.3.2.2 --- lams_tool_lamc/web/learning/SimpleLearnerError.jsp 12 Sep 2014 22:43:47 -0000 1.3.2.1 +++ lams_tool_lamc/web/learning/SimpleLearnerError.jsp 23 Feb 2016 14:46:50 -0000 1.3.2.2 @@ -1,29 +1,22 @@ - - + <%@ include file="/common/taglibs.jsp"%> - - - - - - - - - <fmt:message key="label.learner.error" /> - + <fmt:message key="label.learner.error" /> + + + + -
-
- <%@ include file="/common/messages.jsp"%> -
+ +
+ <%@ include file="/common/messages.jsp"%>
- + + \ No newline at end of file Index: lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp,v diff -u -r1.34.2.1 -r1.34.2.2 --- lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp 12 Sep 2014 22:43:46 -0000 1.34.2.1 +++ lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp 23 Feb 2016 14:46:50 -0000 1.34.2.2 @@ -1,105 +1,88 @@ <%@ include file="/common/taglibs.jsp"%> - - - - - - - -

- -

- - -
- - - -
- - - - ( ) - - - - + - -
-
- - ${dto.displayOrder}) - - - - - [ - - - ] - -
-
- - - - - - - - -
- checked="checked"> - - - - - <%=Character.toChars(97 + (Integer)pageContext.getAttribute("seqLetter"))%>) - + +
+
+
+
+ + + + + + + + + - - - - - - - -
${dto.displayOrder})
[ ] +
+
+
+ +
+
+ + + + + + + + + + + +
checked="checked" /> + + <%=Character + .toChars(97 + (Integer) pageContext + .getAttribute("seqLetter"))%>) +
+
+
+ +
+
+
-
- - - - - + + + + + - - - - - + + + + + - - - - - + + + + + -

 

-
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v diff -u -r1.69.2.2 -r1.69.2.3 --- lams_tool_lamc/web/learning/ViewAnswers.jsp 9 Feb 2016 18:53:19 -0000 1.69.2.2 +++ lams_tool_lamc/web/learning/ViewAnswers.jsp 23 Feb 2016 14:46:50 -0000 1.69.2.3 @@ -1,23 +1,15 @@ - <%@ include file="/common/taglibs.jsp"%> - - - - - - - - + <fmt:message key="activity.title" /> + setTimeout("refresh();", 30000); + -
-

- -

- -

+ +

-

+

-
+
- -
+ +
    -
    - -
    +
    • -
- -
- - - -
+ -
- - - + + + + Index: lams_tool_lamc/web/learning/defineLater.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/defineLater.jsp,v diff -u -r1.14 -r1.14.2.1 --- lams_tool_lamc/web/learning/defineLater.jsp 17 May 2014 19:54:43 -0000 1.14 +++ lams_tool_lamc/web/learning/defineLater.jsp 23 Feb 2016 14:46:50 -0000 1.14.2.1 @@ -1,29 +1,19 @@ - - + <%@ include file="/common/taglibs.jsp"%> + + + + + <fmt:message key="activity.title" /> + - - - - - - + - - - - - <fmt:message key="activity.title" /> - - - - -
- -
- - - - + + + + + + + Index: lams_tool_lamc/web/learning/submissionDeadline.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/submissionDeadline.jsp,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_tool_lamc/web/learning/submissionDeadline.jsp 9 Feb 2016 18:53:19 -0000 1.1.2.2 +++ lams_tool_lamc/web/learning/submissionDeadline.jsp 23 Feb 2016 14:46:50 -0000 1.1.2.3 @@ -1,30 +1,22 @@ - <%@ include file="/common/taglibs.jsp"%> - - - - - - - - <fmt:message key="activity.title" /> - - + + <fmt:message key="activity.title" /> +