Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_wiki/web/WEB-INF/tags/Alert.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_wiki/web/WEB-INF/tags/DefineLater.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/web/WEB-INF/tags/DefineLater.tag,v diff -u -r1.1 -r1.1.12.1 --- lams_tool_wiki/web/WEB-INF/tags/DefineLater.tag 8 Oct 2008 05:33:00 -0000 1.1 +++ lams_tool_wiki/web/WEB-INF/tags/DefineLater.tag 23 Feb 2016 19:40:37 -0000 1.1.12.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_wiki/web/WEB-INF/tags/Page.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.3.2.1 -r1.3.2.2 --- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld 4 Aug 2014 14:00:23 -0000 1.3.2.1 +++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld 23 Feb 2016 19:40:37 -0000 1.3.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_wiki/web/common/learnerheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/web/common/learnerheader.jsp,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_wiki/web/common/learnerheader.jsp 25 Nov 2012 20:43:38 -0000 1.3 +++ lams_tool_wiki/web/common/learnerheader.jsp 23 Feb 2016 19:40:37 -0000 1.3.2.1 @@ -16,4 +16,6 @@ + + Index: lams_tool_wiki/web/common/message.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/web/common/message.jsp,v diff -u -r1.1 -r1.1.12.1 --- lams_tool_wiki/web/common/message.jsp 8 Oct 2008 05:33:01 -0000 1.1 +++ lams_tool_wiki/web/common/message.jsp 23 Feb 2016 19:40:37 -0000 1.1.12.1 @@ -1,5 +1,5 @@ <%@ include file="/common/taglibs.jsp"%> -

+ ${requestScope.message}; -

+ \ No newline at end of file Index: lams_tool_wiki/web/pages/learning/defineLater.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/learning/defineLater.jsp,v diff -u -r1.1 -r1.1.12.1 --- lams_tool_wiki/web/pages/learning/defineLater.jsp 8 Oct 2008 05:33:00 -0000 1.1 +++ lams_tool_wiki/web/pages/learning/defineLater.jsp 23 Feb 2016 19:40:37 -0000 1.1.12.1 @@ -1,11 +1,9 @@ <%@ include file="/common/taglibs.jsp"%> -
-

- -

- -
+ + + - - + + + \ No newline at end of file Index: lams_tool_wiki/web/pages/learning/notebook.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/learning/notebook.jsp,v diff -u -r1.6 -r1.6.2.1 --- lams_tool_wiki/web/pages/learning/notebook.jsp 14 Apr 2014 12:57:18 -0000 1.6 +++ lams_tool_wiki/web/pages/learning/notebook.jsp 23 Feb 2016 19:40:37 -0000 1.6.2.1 @@ -4,43 +4,45 @@ function disableFinishButton() { document.getElementById("finishButton").disabled = true; } - function submitForm(methodName){ - var f = document.getElementById('messageForm'); - f.submit(); - } + function submitForm(methodName) { + var f = document.getElementById('messageForm'); + f.submit(); + } -
-

- -

- + - + - -

- -

- +
+ +
+
+ -
+ - - - - - - - - - - - + + + + + + + + +
-
+ + + + + Index: lams_tool_wiki/web/pages/learning/wiki.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/learning/wiki.jsp,v diff -u -r1.25 -r1.25.2.1 --- lams_tool_wiki/web/pages/learning/wiki.jsp 14 Apr 2014 12:57:18 -0000 1.25 +++ lams_tool_wiki/web/pages/learning/wiki.jsp 23 Feb 2016 19:40:37 -0000 1.25.2.1 @@ -1,512 +1,539 @@ <%@ include file="/common/taglibs.jsp"%> -<%@ page import="org.lamsfoundation.lams.tool.wiki.util.WikiConstants"%> - - - - - + function validateForm() { + // Validates that there's input from the user. -
-
- -
- - - - - -

- + // disables the Finish button to avoid double submission + disableFinishButton(); -   + if (mode == "learner") { + // if this is learner mode, then we add this validation see (LDEV-1319) - - - - - - - - - - - - - - - - -
- - -
- - - - "> - - - - -   - "> - - - - - -   - "> - - - - - -   - "> - - - - - -   - "> - - - - - -   - ')" - title="" - > - - - - -   - " - > - - - - -
-
- -
-
-
-
- -
-

${fn:escapeXml(currentWikiPage.title)}

- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -
-
-
- -
-
- - - - - - - - -
-
-
- - -
- -
+ if (document.learningForm.entryText.value == "") { - -   - ${fn:escapeXml(mainWikiPage.title)} - - + // if the input is blank, then we further inquire to make sure it is correct + if (confirm("message.learner.blank.input")) { + // 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; + } + } + } -
- - - <%@ include file="parts/finishButton.jsp"%> - - + --> + + + +
+
+
+
+
+ + ${fn:escapeXml(mainWikiPage.title)} /  + + ${fn:escapeXml(currentWikiPage.title)} + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + ')" + title="" + > + + + + + + " + > + + + + + + +
+
+
+ + + + + + + + + + + + + + - + editorInstance.wikiLinkArray = wikiLinkArray; + }); + + function refreshPage() + { + var url = "/learning.do?mode=${mode}&toolSessionID=${lrnForm.toolSessionID}¤tWikiPageId=${currentWikiPage.uid}" + window.location=url; + } + + --> + + \ No newline at end of file Index: lams_tool_wiki/web/pages/learning/parts/finishButton.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/learning/parts/finishButton.jsp,v diff -u -r1.10 -r1.10.2.1 --- lams_tool_wiki/web/pages/learning/parts/finishButton.jsp 14 Apr 2014 12:57:18 -0000 1.10 +++ lams_tool_wiki/web/pages/learning/parts/finishButton.jsp 23 Feb 2016 19:40:37 -0000 1.10.2.1 @@ -1,83 +1,76 @@ <%@ include file="/common/taglibs.jsp"%> - + -

- - - - + + + + + +

+
+

+ +

+
+
+ + + + - - - - -

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