Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java =================================================================== diff -u -r1454b2fd27486dd14b1ccf172b96df61a0b0d355 -r440554bb4a9a414c6e3e676a93de72de3298951c --- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision 1454b2fd27486dd14b1ccf172b96df61a0b0d355) +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -35,24 +35,21 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.actions.DispatchAction; - -import org.springframework.web.context.support.WebApplicationContextUtils; -import org.springframework.web.context.WebApplicationContext; - +import org.lamsfoundation.lams.usermanagement.Organisation; +import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.UserManagementService; -import org.lamsfoundation.lams.web.PasswordChangeActionForm; +import org.lamsfoundation.lams.usermanagement.util.AdminPreparer; +import org.lamsfoundation.lams.util.Configuration; +import org.lamsfoundation.lams.util.ConfigurationKeys; +import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.HttpSessionManager; -import org.lamsfoundation.lams.usermanagement.Role; -import org.lamsfoundation.lams.usermanagement.Organisation; -import org.lamsfoundation.lams.usermanagement.util.AdminPreparer; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; -import org.lamsfoundation.lams.util.Configuration; -import org.lamsfoundation.lams.util.ConfigurationKeys; - /** * this is an action where all lams client environments launch. * initial configuration of the individual environment setting is done here. @@ -64,7 +61,8 @@ * @struts:action-forward name="admin" path="/admin.jsp" * @struts:action-forward name="learner" path="/learner.jsp" * @struts:action-forward name="author" path="/author.jsp" - * @struts:action-forward name="staff" path="/staff.jsp" + * @struts:action-forward name="monitorLesson" path="/monitorLesson.jsp" + * @struts:action-forward name="addLesson" path="/addLesson.jsp" * @struts:action-forward name="error" path=".error" * @struts:action-forward name="passwordChange" path=".passwordChange" * @@ -157,24 +155,18 @@ try { log.debug("request learner"); - int orgId = new Integer(req.getParameter("orgId")).intValue(); + Long lessonId = WebUtil.readLongParam(req, AttributeNames.PARAM_LESSON_ID); UserDTO user = getUser(); if ( user == null ) { log.error("admin: User missing from session. "); return mapping.findForward("error"); - } else if ( isUserInRole(user.getUserID(),orgId,Role.LEARNER) ) { - log.debug("user is learner"); - + } else { + // TODO check that the user is in the learner group for the lesson String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL); - req.setAttribute("serverUrl", serverUrl); + req.setAttribute(AttributeNames.PARAM_LESSON_ID,lessonId); return mapping.findForward("learner"); } - else - { - log.error("User "+user.getLogin()+" tried to get learner screen but isn't learner in organisation: "+orgId); - return mapping.findForward("error"); - } } catch (Exception e) { e.printStackTrace(); @@ -192,25 +184,16 @@ try { log.debug("request author"); - int orgId = new Integer(req.getParameter("orgId")).intValue(); UserDTO user = getUser(); if ( user == null ) { log.error("admin: User missing from session. "); return mapping.findForward("error"); - } else if ( isUserInRole(user.getUserID(),orgId,Role.AUTHOR) ) - { - log.debug("user is author"); - + } else { + // todo check user really does have authoring permission in some organisation. String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL); - req.setAttribute("serverUrl", serverUrl); return mapping.findForward("author"); } - else - { - log.error("User "+user.getLogin()+" tried to get author screen but isn't author in organisation: "+orgId); - return mapping.findForward("error"); - } } catch (Exception e) { e.printStackTrace(); @@ -220,59 +203,67 @@ /** - * request for staff environment + * request for monitor environment */ - public ActionForward staff(ActionMapping mapping, ActionForm form, + public ActionForward monitorLesson(ActionMapping mapping, ActionForm form, HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException { try { - log.debug("request staff"); - int orgId = new Integer(req.getParameter("orgId")).intValue(); + log.debug("request monitorLesson"); + int lessonId = WebUtil.readIntParam(req, AttributeNames.PARAM_LESSON_ID); UserDTO user = getUser(); if ( user == null ) { log.error("admin: User missing from session. "); return mapping.findForward("error"); - } else if (isUserInRole(user.getUserID(), orgId, Role.STAFF) || isUserInRole(user.getUserID(), orgId, Role.TEACHER)) { + } else { + // TODO check that the user is in the staff group for the lesson log.debug("user is staff"); - - String serverUrl = Configuration - .get(ConfigurationKeys.SERVER_URL); - + String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL); req.setAttribute("serverUrl", serverUrl); - return mapping.findForward("staff"); - } else { - log.error("User "+ user.getLogin() + " tried to get staff screen but isn't staff in organisation: " + orgId); - return mapping.findForward("error"); + req.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId); + return mapping.findForward("monitorLesson"); } - } catch (Exception e) { e.printStackTrace(); return mapping.findForward("error"); } } /** - * Loads up the user password change form - * @return screen reference name - "passwordChange" + * request for add lesson wizard */ - public ActionForward passwordChange( - ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - throws IOException, ServletException { + public ActionForward addLesson(ActionMapping mapping, ActionForm form, + HttpServletRequest req, HttpServletResponse res) + throws IOException, ServletException { - String login = request.getRemoteUser(); + try { + log.debug("request addLesson"); + Integer courseId = WebUtil.readIntParam(req, AttributeNames.PARAM_COURSE_ID, false); + Integer classId = WebUtil.readIntParam(req, AttributeNames.PARAM_CLASS_ID, true); + UserDTO user = getUser(); + if ( user == null ) { + log.error("admin: User missing from session. "); + return mapping.findForward("error"); + } else { + Integer orgId = classId != null ? classId : courseId; + if (isUserInRole(user.getUserID(), orgId, Role.STAFF) || isUserInRole(user.getUserID(), orgId, Role.TEACHER)) { + log.debug("user is staff"); + String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL); + req.setAttribute("serverUrl", serverUrl); + req.setAttribute(AttributeNames.PARAM_COURSE_ID, courseId); + req.setAttribute(AttributeNames.PARAM_CLASS_ID, classId); + return mapping.findForward("addLesson"); + } else { + log.error("User "+ user.getLogin() + " tried to get staff screen but isn't staff in organisation: " + orgId); + return mapping.findForward("error"); + } + } - PasswordChangeActionForm newForm = new PasswordChangeActionForm(); - newForm.setLogin(login); - - request.getSession(true).setAttribute( - PasswordChangeActionForm.formName, - newForm); - - return mapping.findForward("passwordChange"); + } catch (Exception e) { + e.printStackTrace(); + return mapping.findForward("error"); + } } } \ No newline at end of file Index: lams_central/web/WEB-INF/lams.tld =================================================================== diff -u -r48551771119f5d11f8e78d0608788e2d15ab3589 -r440554bb4a9a414c6e3e676a93de72de3298951c --- lams_central/web/WEB-INF/lams.tld (.../lams.tld) (revision 48551771119f5d11f8e78d0608788e2d15ab3589) +++ lams_central/web/WEB-INF/lams.tld (.../lams.tld) (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -278,5 +278,9 @@ AuthoringButton /WEB-INF/tags/AuthoringButton.tag + + headItems + /WEB-INF/tags/headItems.tag + Index: lams_central/web/WEB-INF/struts/struts-config.xml =================================================================== diff -u -ra7766445094c16b343aa56dc1f73fd3051cef1db -r440554bb4a9a414c6e3e676a93de72de3298951c --- lams_central/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision a7766445094c16b343aa56dc1f73fd3051cef1db) +++ lams_central/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -90,11 +90,16 @@ redirect="false" /> + +<%@ taglib uri="tags-core" prefix="c"%> + + + +&classID="/> + +Learner:: LAMS + + + +

Loading Learner Environment.

+ + + Index: lams_central/web/css/default.css =================================================================== diff -u -r48551771119f5d11f8e78d0608788e2d15ab3589 -r440554bb4a9a414c6e3e676a93de72de3298951c --- lams_central/web/css/default.css (.../default.css) (revision 48551771119f5d11f8e78d0608788e2d15ab3589) +++ lams_central/web/css/default.css (.../default.css) (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -242,5 +242,4 @@ text-decoration:none; text-align: center; background-color:#B4C8FE; - width: 80px; } \ No newline at end of file Index: lams_central/web/includes/javascript/openUrls.js =================================================================== diff -u -r1454b2fd27486dd14b1ccf172b96df61a0b0d355 -r440554bb4a9a414c6e3e676a93de72de3298951c --- lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 1454b2fd27486dd14b1ccf172b96df61a0b0d355) +++ lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -9,7 +9,8 @@ var authorWin = null; var learnWin = null; - var teachWin = null; + var monitorLessonWin = null; + var addLessonWin = null; var adminWin = null; var sysadminWin = null; @@ -33,49 +34,73 @@ } } - function openStaff( orgId ) + function openMonitorLesson( lessonID ) { if(isMac) { if(belowMinRes) { - teachWin = window.open('home.do?method=staff&orgId='+orgId,'tWindow','width=796,height=575,resizable,scrollbars'); + monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+lessonID,'mWindow','width=796,height=575,resizable,scrollbars'); } else { - // teachWin = window.open('home.do?method=staff&orgId='+orgId,'tWindow','width=779,height=575'); - teachWin = window.open('home.do?method=staff&orgId='+orgId,'tWindow','width=779,height=575,resizable,scrollbars'); + monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+lessonID,'mWindow','width=779,height=575,resizable,scrollbars'); } } else { - if(teachWin && teachWin.open && !teachWin.closed) + if(monitorLessonWin && monitorLessonWin.open && !monitorLessonWin.closed) { - teachWin.focus(); + monitorLessonWin.focus(); } else { - // teachWin = window.open('home.do?method=staff&orgId='+orgId,'tWindow','width=779,height=575,resizable'); - teachWin = window.open('home.do?method=staff&orgId='+orgId,'tWindow','width=779,height=575,resizable,resizable,scrollbars'); + monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+lessonID,'mWindow','width=779,height=575,resizable,resizable,scrollbars'); } } } - function openLearner( orgId ) + function openAddLesson( courseID, classID ) { if(isMac) { - learnWin = window.open('home.do?method=learner&orgId='+orgId,'lWindow','width=796,height=570,resizable,status=yes'); + if(belowMinRes) + { + addLessonWin = window.open('home.do?method=addLesson&courseID='+courseID+'&classID='+classID,'alWindow','width=796,height=575,resizable,scrollbars'); + } + else + { + addLessonWin = window.open('home.do?method=addLesson&courseID='+courseID+'&classID='+classID,'alWindow','width=779,height=575,resizable,scrollbars'); + } } else { + if(addLessonWin && addLessonWin.open && !addLessonWin.closed) + { + addLessonWin.focus(); + } + else + { + addLessonWin = window.open('home.do?method=addLesson&courseID='+courseID+'&classID='+classID,'alWindow','width=779,height=575,resizable,resizable,scrollbars'); + } + } + } + + function openLearner( lessonId ) + { + if(isMac) + { + learnWin = window.open('home.do?method=learner&lessonID='+lessonId,'lWindow','width=796,height=570,resizable,status=yes'); + } + else + { if(learnWin && learnWin.open && !learnWin.closed ) { learnWin.focus(); } else { - learnWin = window.open('home.do?method=learner&orgId='+orgId,'lWindow','width=796,height=570,resizable,status=yes'); + learnWin = window.open('home.do?method=learner&lessonID='+lessonId,'lWindow','width=796,height=570,resizable,status=yes'); } } } Index: lams_central/web/indexContent.jsp =================================================================== diff -u -r1454b2fd27486dd14b1ccf172b96df61a0b0d355 -r440554bb4a9a414c6e3e676a93de72de3298951c --- lams_central/web/indexContent.jsp (.../indexContent.jsp) (revision 1454b2fd27486dd14b1ccf172b96df61a0b0d355) +++ lams_central/web/indexContent.jsp (.../indexContent.jsp) (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -5,20 +5,19 @@ <%@ page import="org.lamsfoundation.lams.usermanagement.service.UserManagementService" %> <%@ page import="org.lamsfoundation.lams.usermanagement.Role" %> <%@ page import="org.lamsfoundation.lams.usermanagement.User" %> +<%@ page import="org.lamsfoundation.lams.lesson.Lesson" %> <%@ page import="org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO" %> +<%@ page import="org.apache.commons.collections.functors.WhileClosure" %> + <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> - - - - - +
-
spacer.gif
+ <%String login = request.getRemoteUser(); WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(request.getSession().getServletContext()); UserManagementService service = (UserManagementService)ctx.getBean("userManagementServiceTarget"); @@ -28,98 +27,121 @@ in but we didn't get the username. Try closing your browser and starting again.

<%}%> - + + + + + + +
+ - - + + + + + <%orgDTO = service.getOrganisationsForUserByRole(user,null); + if(orgDTO!=null){ + Vector courses = orgDTO.getNodes(); + Iterator courseIter = courses.iterator(); + while ( courseIter.hasNext() ) { + + OrganisationDTO course = (OrganisationDTO)courseIter.next();%> + + + + + <% List lessons = service.getMonitorLessonsFromOrganisation(user.getUserId(),course.getOrganisationID()); + Iterator lessonIterator = lessons.iterator(); + while ( lessonIterator.hasNext() ) { + Lesson lesson = (Lesson) lessonIterator.next(); + %> + + + <% } + } %> + <% List lessons = service.getLearnerLessonsFromOrganisation(user.getUserId(),course.getOrganisationID()); + Iterator lessonIterator = lessons.iterator(); + while ( lessonIterator.hasNext() ) { + Lesson lesson = (Lesson) lessonIterator.next(); + %> + + + <% } %> + + <% + Vector classes = course.getNodes(); + Iterator classIter = classes.iterator(); + while ( classIter.hasNext() ) { + OrganisationDTO courseClass = (OrganisationDTO)classIter.next(); %> + + + + + <% lessons = service.getMonitorLessonsFromOrganisation(user.getUserId(),courseClass.getOrganisationID()); + lessonIterator = lessons.iterator(); + while ( lessonIterator.hasNext() ) { + Lesson lesson = (Lesson) lessonIterator.next(); + %> + + + <% } + + } %> + <% lessons = service.getLearnerLessonsFromOrganisation(user.getUserId(),courseClass.getOrganisationID()); + lessonIterator = lessons.iterator(); + while ( lessonIterator.hasNext() ) { + Lesson lesson = (Lesson) lessonIterator.next(); + %> + + + <% } %> + <% }%> + <% } %> + <%}%> +
+

Welcome <%=user.getFirstName()%>

-

- You are logged into LAMS.Please choose a workspace from the buttons on the right or - Change Password here. -

- 		- - - <% ArrayList roleList = new ArrayList(); - roleList.add(Role.SYSADMIN); - OrganisationDTO orgDTO = service.getOrganisationsForUserByRole(user,roleList); - if(orgDTO!=null){%> - - - - <%}%> - <%orgDTO = service.getOrganisationsForUserByRole(user,null); - if(orgDTO!=null){ - Vector courses = orgDTO.getNodes(); - Iterator courseIter = courses.iterator(); - while ( courseIter.hasNext() ) { - - OrganisationDTO course = (OrganisationDTO)courseIter.next();%> - - - - - - - - <% - Vector classes = course.getNodes(); - Iterator classIter = classes.iterator(); - while ( classIter.hasNext() ) { - OrganisationDTO courseClass = (OrganisationDTO)classIter.next(); %> - - - - - - - <% }%> - <% } %> - <%}%> -
- -
Course: <%=course.getName()%>: - <% Vector roleNames = course.getRoleNames(); - if ( roleNames.contains(Role.AUTHOR) ) {%> - - <% } %> - - <% if ( roleNames.contains(Role.STAFF) || roleNames.contains(Role.TEACHER) ) {%> - - <% } %> - - <% if ( roleNames.contains(Role.LEARNER) ) {%> - - <% } %> -
Class: <%=courseClass.getName()%>: - <% Vector classRoleNames = courseClass.getRoleNames(); - if ( classRoleNames.contains(Role.AUTHOR) ) {%> - - <% } %> - - <% if ( classRoleNames.contains(Role.STAFF) || classRoleNames.contains(Role.TEACHER) ) {%> - - <% } %> - - <% if ( classRoleNames.contains(Role.LEARNER) ) {%> - - <% } %> -
-
+ + <% ArrayList roleList = new ArrayList(); + roleList.add(Role.SYSADMIN); + OrganisationDTO orgDTO = service.getOrganisationsForUserByRole(user,roleList); + if(orgDTO!=null){%> + + <%}%> + + <% roleList.clear(); + roleList.add(Role.AUTHOR); + orgDTO = service.getOrganisationsForUserByRole(user,roleList); + if(orgDTO!=null){%> + + <%} + roleList.clear(); + roleList.add(Role.STAFF); + roleList.add(Role.TEACHER); + orgDTO = service.getOrganisationsForUserByRole(user,roleList); + if(orgDTO!=null){%> + Dummy Monitoring Screen + <%} + roleList.clear(); + roleList.add(Role.LEARNER); + orgDTO = service.getOrganisationsForUserByRole(user,roleList); + if(orgDTO!=null){%> + Dummy Learning Screen + <%}%> +
Course: <%=course.getName()%>: + <% Vector roleNames = course.getRoleNames(); + if ( roleNames.contains(Role.STAFF) || roleNames.contains(Role.TEACHER) ) {%> + +
Lesson: <%=lesson.getLessonName()%>
Lesson: <%=lesson.getLessonName()%>
Class: <%=courseClass.getName()%>: + <% Vector classRoleNames = course.getRoleNames(); + if ( classRoleNames.contains(Role.STAFF) || classRoleNames.contains(Role.TEACHER) ) {%> + +
Lesson: <%=lesson.getLessonName()%>
Lesson: <%=lesson.getLessonName()%>
+
+ @@ -135,12 +157,9 @@ \nAll rights reserved. \n\nLAMS is a trademark of LAMS Foundation. \nDistribution of this software is prohibited.');" - class="lightNoteLink">© 2002-2004 LAMS Foundation. + class="lightNoteLink">© 2002-2006 LAMS Foundation. -
launch_page_graphic.jpg
- This copy of LAMS™ is authorised for use by the registered users only. - Version 1.1
Index: lams_central/web/learner.jsp =================================================================== diff -u -r80eeae8575a7a43e688d8e360ca6fc181f1893e4 -r440554bb4a9a414c6e3e676a93de72de3298951c --- lams_central/web/learner.jsp (.../learner.jsp) (revision 80eeae8575a7a43e688d8e360ca6fc181f1893e4) +++ lams_central/web/learner.jsp (.../learner.jsp) (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -1,8 +1,9 @@ <%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="tags-core" prefix="c"%> - +"> Learner:: LAMS Index: lams_central/web/monitorLesson.jsp =================================================================== diff -u --- lams_central/web/monitorLesson.jsp (revision 0) +++ lams_central/web/monitorLesson.jsp (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -0,0 +1,15 @@ +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="tags-core" prefix="c"%> + + + +"/> + +Learner:: LAMS + + + +

Loading Learner Environment.

+ + + Fisheye: Tag 440554bb4a9a414c6e3e676a93de72de3298951c refers to a dead (removed) revision in file `lams_central/web/staff.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/template.jsp =================================================================== diff -u -r25ac272ffb5be9e7f0c2b97201de33727a617750 -r440554bb4a9a414c6e3e676a93de72de3298951c --- lams_central/web/template.jsp (.../template.jsp) (revision 25ac272ffb5be9e7f0c2b97201de33727a617750) +++ lams_central/web/template.jsp (.../template.jsp) (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -1,6 +1,7 @@ <%@ taglib uri="tags-tiles" prefix="tiles" %> <%@ taglib uri="tags-html" prefix="html" %> +<%@ taglib uri="tags-lams" prefix="lams" %> @@ -10,8 +11,10 @@ - + + + Index: lams_learning/web/controlFrame.jsp =================================================================== diff -u -rc4ae13c5cf9b354e82ff4ad72f67d801992b9f14 -r440554bb4a9a414c6e3e676a93de72de3298951c --- lams_learning/web/controlFrame.jsp (.../controlFrame.jsp) (revision c4ae13c5cf9b354e82ff4ad72f67d801992b9f14) +++ lams_learning/web/controlFrame.jsp (.../controlFrame.jsp) (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ String languageDate = Configuration.getDictionaryDateForLanguage(serverLanguage); %> - lams_learner.swf?userID=&serverURL=&build=<%=clientVersion%>&lang=<%=serverLanguage%>&date=<%=languageDate%>&theme= + lams_learner.swf?userID=&serverURL=&build=<%=clientVersion%>&lang=<%=serverLanguage%>&date=<%=languageDate%>&theme=&lessonID= Index: lams_learning/web/dummyControlFrame.jsp =================================================================== diff -u -rd7f6d24c8dfca6c792f78c91c18ffc9278dfa451 -r440554bb4a9a414c6e3e676a93de72de3298951c --- lams_learning/web/dummyControlFrame.jsp (.../dummyControlFrame.jsp) (revision d7f6d24c8dfca6c792f78c91c18ffc9278dfa451) +++ lams_learning/web/dummyControlFrame.jsp (.../dummyControlFrame.jsp) (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -52,9 +52,6 @@ -

Flash Interface

-

Switch to the Flash interface (under development).

-

Available Lessons

Index: lams_learning/web/dummymain.jsp =================================================================== diff -u --- lams_learning/web/dummymain.jsp (revision 0) +++ lams_learning/web/dummymain.jsp (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -0,0 +1,48 @@ +<%-- +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-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + + + + + <fmt:message key="learner.title"/> + + + + " name="controlFrame" scrolling="YES"> + + + + + <body> + <fmt:message key="message.activity.parallel.noFrames" /> + </body> + + + Index: lams_learning/web/main.jsp =================================================================== diff -u -r66f147e9d94ea10fa2c2cea70a78d6479096ddc7 -r440554bb4a9a414c6e3e676a93de72de3298951c --- lams_learning/web/main.jsp (.../main.jsp) (revision 66f147e9d94ea10fa2c2cea70a78d6479096ddc7) +++ lams_learning/web/main.jsp (.../main.jsp) (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -35,7 +35,7 @@ - + " name="controlFrame" scrolling="YES"> Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java =================================================================== diff -u -rdf403b3f55f75d3ed5a4e53b8ac259343120ae5f -r440554bb4a9a414c6e3e676a93de72de3298951c --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision df403b3f55f75d3ed5a4e53b8ac259343120ae5f) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -209,14 +209,15 @@ /** * This method returns a string representing a list of all lessons * for the current user. See getAllLessons(). + * TODO Remove getAllLessonsWDDX, getAllLessons when the dummy interface is not needed * * @return String The requested list of Lessons in wddx format * @throws IOException */ public String getAllLessonsWDDX(Integer userID) throws IOException; /** - * This method returns a list of all available Lessons. This is all the lessons + * This method returns a list of all available Lessons. This is all the lessons * created by the current user and all the lessons for which the user is in the * staff group. It does not return removed lessons. * Index: lams_monitoring/web/WEB-INF/web.xml =================================================================== diff -u -rad683fcaeabe83c702b599c5c866bb7d30cd7191 -r440554bb4a9a414c6e3e676a93de72de3298951c --- lams_monitoring/web/WEB-INF/web.xml (.../web.xml) (revision ad683fcaeabe83c702b599c5c866bb7d30cd7191) +++ lams_monitoring/web/WEB-INF/web.xml (.../web.xml) (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -73,8 +73,8 @@ - createLesson - org.lamsfoundation.lams.monitoring.web.CreateLessionServlet + createLessonClass + org.lamsfoundation.lams.monitoring.web.CreateLessonServlet @@ -110,8 +110,8 @@ /monitoring/performChosenGrouping - createLesson - /monitoring/createLesson + createLessonClass + /createLessonClass Index: lams_monitoring/web/addLesson.jsp =================================================================== diff -u --- lams_monitoring/web/addLesson.jsp (revision 0) +++ lams_monitoring/web/addLesson.jsp (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -0,0 +1,79 @@ +<%-- +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" %> +<%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %> +<%@ page import="org.lamsfoundation.lams.themes.dto.CSSThemeBriefDTO" %> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + + + + + <fmt:message key="monitor.title"/> + + + + +<% +String clientVersion = Configuration.get(ConfigurationKeys.MONITOR_CLIENT_VERSION); +String serverLanguage = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); +String languageDate = Configuration.getDictionaryDateForLanguage(serverLanguage); +%> + +<%-- courseID and classID are passed in as request parameters by addLesson.jsp in lams_central. --%> +lams_wizard.swf?userID=&serverURL=&build=<%=clientVersion%>&lang=<%=serverLanguage%>&date=<%=languageDate%>&theme=&courseID=&classID= + + + + + + + + "/> + + + + " + quality="high" + scale="noscale" + bgcolor="#B3B7C8" + width="100%" + height="100%" + swliveconnect=true + id="monitoring" + name="monitoring" + align="" + type="application/x-shockwave-flash" + pluginspage="http://www.macromedia.com/go/getflashplayer" /> + + + + \ No newline at end of file Index: lams_monitoring/web/dummyControlFrame.jsp =================================================================== diff -u -r5b215ed05d720a4cb7edc7f412dc2e234eef304f -r440554bb4a9a414c6e3e676a93de72de3298951c --- lams_monitoring/web/dummyControlFrame.jsp (.../dummyControlFrame.jsp) (revision 5b215ed05d720a4cb7edc7f412dc2e234eef304f) +++ lams_monitoring/web/dummyControlFrame.jsp (.../dummyControlFrame.jsp) (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -39,9 +39,6 @@ -

Flash Interface

-

Switch to the Flash interface (under development).

-

Select a lesson

Note: If you archive a lesson, it can no longer be accessed. This is a temporary restriction.

Fisheye: Tag 440554bb4a9a414c6e3e676a93de72de3298951c refers to a dead (removed) revision in file `lams_monitoring/web/monitor.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_monitoring/web/monitorLesson.jsp =================================================================== diff -u --- lams_monitoring/web/monitorLesson.jsp (revision 0) +++ lams_monitoring/web/monitorLesson.jsp (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -0,0 +1,79 @@ +<%-- +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" %> +<%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %> +<%@ page import="org.lamsfoundation.lams.themes.dto.CSSThemeBriefDTO" %> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + + + + + <fmt:message key="monitor.title"/> + + + + +<% +String clientVersion = Configuration.get(ConfigurationKeys.MONITOR_CLIENT_VERSION); +String serverLanguage = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); +String languageDate = Configuration.getDictionaryDateForLanguage(serverLanguage); +%> + +<%-- lessonID is passed in as request parameters by addLesson.jsp in lams_central. --%> +lams_monitoring.swf?userID=&serverURL=&build=<%=clientVersion%>&lang=<%=serverLanguage%>&date=<%=languageDate%>&theme=&lessonID= + + + + + + + + "/> + + + + " + quality="high" + scale="noscale" + bgcolor="#B3B7C8" + width="100%" + height="100%" + swliveconnect=true + id="monitoring" + name="monitoring" + align="" + type="application/x-shockwave-flash" + pluginspage="http://www.macromedia.com/go/getflashplayer" /> + + + + \ No newline at end of file
Refresh List