Index: lams_learning/conf/language/ApplicationResources.properties
===================================================================
diff -u -ra7766445094c16b343aa56dc1f73fd3051cef1db -r66f147e9d94ea10fa2c2cea70a78d6479096ddc7
--- lams_learning/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision a7766445094c16b343aa56dc1f73fd3051cef1db)
+++ lams_learning/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 66f147e9d94ea10fa2c2cea70a78d6479096ddc7)
@@ -1,6 +1,6 @@
# CVS ID: $Id$
# Language strings for the Progress Engine related classes and screens. Mostly error messages.
-
+learner.title=Learner :: LAMS
message.activity.loading=The next task is loading. Please wait....
message.lesson.finished=Congratulations, you have finished.
message.lesson.finishedCont=You have now completed your learning activity. Please log out or select a new session from the Available Sessions Panel
@@ -13,16 +13,20 @@
label.activity.options.choose=Choose
label.activity.finish=Finish
-## Export Portfolio Functionality
+# Export Portfolio internal system error
error.system.exportPortfolio=An internal error has occurred with the Export Portfolio Functionality. If reporting this error, please report: {0}
+# Export Portfolio system error in the learner module
error.system.learner=An internal error has occurred with the Learner Environment. If reporting this error, please report: {0}
+# Export Portfolio internal system error
error.system.export=A system exception has occured and the portfolio could not be generated. Please contact Lams International technical support.
+# Export Portfolio Page is missing
error.message.404=The page you have requested can not be found.
-
# HTML used to create main export page. The lesson name is inserted at {0} and the list of activities are inserted at {1}
export.html.mainPage=Export Portfolio Export Portfolio Lesson: {0} Activities {1}
# HTML used to create main export page when an portfolio is not available due to system constraints.
export.html.exportFailed=Export Portfolio Export Portfolio Failed This sequence does not support portfolio exports
# HTML used to create the export portfolio activity page when an activity does not support export portfolio (stops it being just a blank page)
export.html.exportNotSupported=Export Portfolio Unsupported Export Portfolio for this activity is unsupported
+#monitor.title=Staff :: LAMS
+
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
===================================================================
diff -u -rcdb910b6cd3de106725e2c22ded380c5c0fab650 -r66f147e9d94ea10fa2c2cea70a78d6479096ddc7
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java (.../DummyLearnerAction.java) (revision cdb910b6cd3de106725e2c22ded380c5c0fab650)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java (.../DummyLearnerAction.java) (revision 66f147e9d94ea10fa2c2cea70a78d6479096ddc7)
@@ -29,7 +29,6 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
import org.apache.log4j.Logger;
import org.apache.struts.action.ActionForm;
@@ -40,10 +39,7 @@
import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
import org.lamsfoundation.lams.lesson.dto.LessonDTO;
import org.lamsfoundation.lams.usermanagement.User;
-import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
import org.lamsfoundation.lams.web.action.LamsDispatchAction;
-import org.lamsfoundation.lams.web.session.SessionManager;
-import org.lamsfoundation.lams.web.util.AttributeNames;
/**
@@ -60,7 +56,7 @@
* type="org.lamsfoundation.lams.learning.service.LearnerServiceException"
* path=".systemError"
* handler="org.lamsfoundation.lams.learning.util.CustomStrutsExceptionHandler"
- * @struts:action-forward name="controlActivity" path="/controlBottomFrame.jsp"
+ * @struts:action-forward name="controlActivity" path="/dummyControlBottomFrame.jsp"
*
* ----------------XDoclet Tags--------------------
*
Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rfc085e0eda6c46d659c5b98f9ee9e29f495af042 -r66f147e9d94ea10fa2c2cea70a78d6479096ddc7
--- lams_learning/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
+++ lams_learning/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 66f147e9d94ea10fa2c2cea70a78d6479096ddc7)
@@ -122,7 +122,7 @@
/>
- Learner :: LAMS
-
-
+ Available Lessons
- [Flash component goes here]
-
+ lams_learning.swf?userID=
+
+
+
+
+
+
Index: lams_learning/web/controlFrame.jsp
===================================================================
diff -u -rcdb910b6cd3de106725e2c22ded380c5c0fab650 -r66f147e9d94ea10fa2c2cea70a78d6479096ddc7
--- lams_learning/web/controlFrame.jsp (.../controlFrame.jsp) (revision cdb910b6cd3de106725e2c22ded380c5c0fab650)
+++ lams_learning/web/controlFrame.jsp (.../controlFrame.jsp) (revision 66f147e9d94ea10fa2c2cea70a78d6479096ddc7)
@@ -19,7 +19,7 @@
http://www.gnu.org/licenses/gpl.txt
--%>
-<%@ page language="java"%>
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
<%@ taglib uri="tags-bean" prefix="bean"%>
<%@ taglib uri="tags-html" prefix="html"%>
<%@ taglib uri="tags-tiles" prefix="tiles"%>
@@ -31,15 +31,14 @@
- Learner :: LAMS
+ <fmt:message key="learner.title"/>
<![CDATA[
Index: lams_learning/web/controlTopFrame.jsp
===================================================================
diff -u -rcdb910b6cd3de106725e2c22ded380c5c0fab650 -r66f147e9d94ea10fa2c2cea70a78d6479096ddc7
--- lams_learning/web/controlTopFrame.jsp (.../controlTopFrame.jsp) (revision cdb910b6cd3de106725e2c22ded380c5c0fab650)
+++ lams_learning/web/controlTopFrame.jsp (.../controlTopFrame.jsp) (revision 66f147e9d94ea10fa2c2cea70a78d6479096ddc7)
@@ -19,7 +19,7 @@
http://www.gnu.org/licenses/gpl.txt
--%>
-<%@ page language="java"%>
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
<%@ taglib uri="tags-html" prefix="html"%>
<%@ taglib uri="tags-core" prefix="c"%>
<%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -29,7 +29,7 @@
<html:html locale="true" xhtml="true">
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="<lams:LAMSURL/>/css/default.css" rel="stylesheet" type="text/css"/>
<title>Learner :: LAMS</title>
</head>
Index: lams_learning/web/dummyControlBottomFrame.jsp
===================================================================
diff -u
--- lams_learning/web/dummyControlBottomFrame.jsp (revision 0)
+++ lams_learning/web/dummyControlBottomFrame.jsp (revision 66f147e9d94ea10fa2c2cea70a78d6479096ddc7)
@@ -0,0 +1,84 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<html:html locale="true" xhtml="true">
+
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <link href="<lams:LAMSURL/>/css/default.css" rel="stylesheet" type="text/css"/>
+ <title>Learner :: LAMS</title>
+ <script language="JavaScript" type="text/JavaScript">
+ <!--
+
+ var thePopUp = null;
+
+ function openPopUp(args){
+ if(thePopUp && thePopUp.open && !thePopUp.closed){
+ thePopUp.focus();
+ }else{
+ //alert('opening:'+args);
+ thePopUp = window.open(args,"learnerPop","HEIGHT=400,WIDTH=550,resizable,scrollbars");
+ }
+ }
+
+ //-->
+ </script>
+
+ </head>
+ <body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+
+ <H2>Flash Interface</H2>
+ <p>Switch to the <A HREF="controlBottomFrame.jsp">Flash interface<a/> (under development).</p>
+
+ <h2>Available Lessons</H2>
+ <table width="100%" border="0" cellspacing="2" cellpadding="2" summary="This table is being used for layout purposes only">
+ <TR><TD><A HREF="<lams:WebAppURL/>dummylearner.do?method=getActiveLessons">Refresh List</A></TD></TR>
+ <c:forEach var="lesson" items="${lessons}">
+ <c:if test="${lesson.lessonStateID<6}">
+ <TR><TD>
+ <STRONG><c:out value="${lesson.lessonName}"/></STRONG>
+ <c:choose>
+ <c:when test="${lesson.lessonStateID==1}">[Created]</c:when>
+ <c:when test="${lesson.lessonStateID==2}">[Scheduled]</c:when>
+ <c:when test="${lesson.lessonStateID==3}">[Started]</c:when>
+ <c:when test="${lesson.lessonStateID==4}">[Suspended]</c:when>
+ <c:when test="${lesson.lessonStateID==5}">[Finished]</c:when>
+ </c:choose>
+ <c:if test="${lesson.lessonDescription}">
+ <BR><c:out value="${lesson.lessonDescription}"/>
+ </c:if>
+ <BR><A HREF="<lams:WebAppURL/>learner.do?method=joinLesson&userId=<lams:user property="userID"/>&lessonId=<c:out value="${lesson.lessonID}"/>" target="contentFrame">Participate</A>
+ <BR><A HREF=javascript:openPopUp('<lams:WebAppURL/>exportWaitingPage.jsp?mode=learner&lessonID=<c:out value="${lesson.lessonID}"/>');>Export Portfolio</A>
+ </TD></TR>
+ <TR><TD><HR></TD></TR>
+ </c:if>
+ </c:forEach>
+ </table>
+
+ </body>
+</html:html>
Index: lams_learning/web/dummyControlFrame.jsp
===================================================================
diff -u
--- lams_learning/web/dummyControlFrame.jsp (revision 0)
+++ lams_learning/web/dummyControlFrame.jsp (revision 66f147e9d94ea10fa2c2cea70a78d6479096ddc7)
@@ -0,0 +1,50 @@
+<%--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-tiles" prefix="tiles"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<html:html locale="true" xhtml="true">
+
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <lams:css/>
+ <title><fmt:message key="learner.title"/></title>
+ </head>
+
+ <frameset rows="40,*" cols="*" framespacing="0" frameborder="NO" border="0">
+ <frame src="controlTopFrame.jsp" name="topFrame" scrolling="NO" noresize >
+ <frame src="dummylearner.do?method=getActiveLessons" name="bottomFrame" scrolling="YES">
+ </frameset>
+
+ <noframes>
+ <body>
+ <fmt:message key="message.activity.parallel.noFrames" />
+ </body>
+ ]]>
+
+
Index: lams_learning/web/exportWaitingPage.jsp
===================================================================
diff -u -rcdb910b6cd3de106725e2c22ded380c5c0fab650 -r66f147e9d94ea10fa2c2cea70a78d6479096ddc7
--- lams_learning/web/exportWaitingPage.jsp (.../exportWaitingPage.jsp) (revision cdb910b6cd3de106725e2c22ded380c5c0fab650)
+++ lams_learning/web/exportWaitingPage.jsp (.../exportWaitingPage.jsp) (revision 66f147e9d94ea10fa2c2cea70a78d6479096ddc7)
@@ -19,6 +19,7 @@
http://www.gnu.org/licenses/gpl.txt
--%>
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
<%@ taglib uri="tags-core" prefix="c" %>
<%@ taglib uri="tags-fmt" prefix="fmt" %>
<%@ taglib uri="tags-logic" prefix="logic" %>
@@ -43,6 +44,7 @@
Generating Export
+