Index: lams_tool_nb/web/defineLater.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/defineLater.jsp,v diff -u -r1.3 -r1.3.14.1 --- lams_tool_nb/web/defineLater.jsp 27 Oct 2006 08:29:51 -0000 1.3 +++ lams_tool_nb/web/defineLater.jsp 23 Feb 2016 14:28:05 -0000 1.3.14.1 @@ -1,8 +1,7 @@ <%@ include file="/includes/taglibs.jsp"%> - -
-

- -

- -
+ + + + + + \ No newline at end of file Index: lams_tool_nb/web/error.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/error.jsp,v diff -u -r1.4 -r1.4.2.1 --- lams_tool_nb/web/error.jsp 27 Jul 2013 07:53:07 -0000 1.4 +++ lams_tool_nb/web/error.jsp 23 Feb 2016 14:28:05 -0000 1.4.2.1 @@ -1,5 +1,4 @@ - + <%@ page language="java" isErrorPage="true" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> <%@ taglib uri="tags-lams" prefix="lams"%> @@ -11,7 +10,7 @@ <%-- Catch JSP Servlet Exception --%> <% -if (exception != null) { + if (exception != null) { %> <%=exception.getMessage()%> @@ -20,7 +19,7 @@ <%=exception.getClass().getName()%> <% - java.io.ByteArrayOutputStream bos = new java.io.ByteArrayOutputStream(); + java.io.ByteArrayOutputStream bos = new java.io.ByteArrayOutputStream(); java.io.PrintStream os = new java.io.PrintStream(bos); exception.printStackTrace(os); String stack = new String(bos.toByteArray()); @@ -29,41 +28,48 @@ <%=stack%> <% -} else if ((Exception) request.getAttribute("javax.servlet.error.exception") != null) { + } else if ((Exception) request + .getAttribute("javax.servlet.error.exception") != null) { %> - <%=((Exception) request.getAttribute("javax.servlet.error.exception")).getMessage()%> + <%=((Exception) request + .getAttribute("javax.servlet.error.exception")) + .getMessage()%> - <%=((Exception) request.getAttribute("javax.servlet.error.exception")).getMessage() - .getClass().getName()%> + <%=((Exception) request + .getAttribute("javax.servlet.error.exception")) + .getMessage().getClass().getName()%> <% - java.io.ByteArrayOutputStream bos = new java.io.ByteArrayOutputStream(); + java.io.ByteArrayOutputStream bos = new java.io.ByteArrayOutputStream(); java.io.PrintStream os = new java.io.PrintStream(bos); - ((Exception) request.getAttribute("javax.servlet.error.exception")).printStackTrace(os); + ((Exception) request + .getAttribute("javax.servlet.error.exception")) + .printStackTrace(os); String stack = new String(bos.toByteArray()); %> <%=stack%> <% -} + } %> -
- - - -
- + + Index: lams_tool_nb/web/learnerContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/learnerContent.jsp,v diff -u -r1.31.2.1 -r1.31.2.2 --- lams_tool_nb/web/learnerContent.jsp 12 Jan 2016 12:24:33 -0000 1.31.2.1 +++ lams_tool_nb/web/learnerContent.jsp 23 Feb 2016 14:28:05 -0000 1.31.2.2 @@ -9,26 +9,20 @@ finishButton.disabled = true; } } - function submitForm(methodName){ + function submitForm(methodName) { var f = document.getElementById('learnerForm'); var m = document.getElementById('methodVar'); - m.value=methodName + m.value = methodName f.submit(); } -
- -

- -

- -

+ +

-

+
- + @@ -41,68 +35,61 @@ -
-

- -

+
+ +
+
-

- - -

- + - -

- -

+ - -
- + -
- - - - - - - - + + + - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + - -
+ + + Index: lams_tool_nb/web/reflect.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/reflect.jsp,v diff -u -r1.12.2.1 -r1.12.2.2 --- lams_tool_nb/web/reflect.jsp 12 Jan 2016 12:24:33 -0000 1.12.2.1 +++ lams_tool_nb/web/reflect.jsp 23 Feb 2016 14:28:05 -0000 1.12.2.2 @@ -5,47 +5,58 @@ function disableFinishButton() { document.getElementById("finishButton").disabled = true; } - function submitForm(methodName){ + function submitForm(methodName) { var f = document.getElementById('learnerForm'); f.submit(); } - -
-

- -

+ - -

- - - -
+
+
+ +
+ + + - - - - - - - - - - - - + + + + + + + + + + +
- + - - - - - -
+ +
+
+ + + +
+
+ + + + + + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tags/Alert.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/WEB-INF/tags/DefineLater.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/DefineLater.tag,v diff -u -r1.3 -r1.3.14.1 --- lams_tool_nb/web/WEB-INF/tags/DefineLater.tag 27 Oct 2006 02:39:31 -0000 1.3 +++ lams_tool_nb/web/WEB-INF/tags/DefineLater.tag 23 Feb 2016 14:28:06 -0000 1.3.14.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_nb/web/WEB-INF/tags/Page.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2.2.2 -r1.2.2.3 --- lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld 12 Jan 2016 12:24:33 -0000 1.2.2.2 +++ lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld 23 Feb 2016 14:28:06 -0000 1.2.2.3 @@ -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_nb/web/template/learnerTemplate.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/template/learnerTemplate.jsp,v diff -u -r1.6.12.1 -r1.6.12.2 --- lams_tool_nb/web/template/learnerTemplate.jsp 18 Jan 2016 03:27:18 -0000 1.6.12.1 +++ lams_tool_nb/web/template/learnerTemplate.jsp 23 Feb 2016 14:28:06 -0000 1.6.12.2 @@ -1,20 +1,15 @@ - - + <%@ include file="/includes/taglibs.jsp"%> - - - - <fmt:message key="activity.title"/> +