Index: lams_central/conf/language/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/language/Attic/ApplicationResources.properties,v diff -u -r1.10 -r1.11 --- lams_central/conf/language/ApplicationResources.properties 22 Jun 2006 07:11:58 -0000 1.10 +++ lams_central/conf/language/ApplicationResources.properties 23 Jun 2006 08:01:09 -0000 1.11 @@ -1,7 +1,57 @@ # CVS ID: $Id$ -error.authorisation=You are not authorised to do this. +# General label for username +label.username=Username +# General label for password +label.password=Password +# General authorisation (security) error +error.authorisation=You are not authorised to do this. +# Heading of general error +heading.general.error=Error +# General error when an appropriate window cannot be opened. Line 1 of 3. +error.general.1=Sorry, there as been an error. +# General error when an appropriate window cannot be opened. Line 2 of 3. +error.general.2=There is a problem processing this request. Close the browser window and try again. +# General error when an appropriate window cannot be opened. Line 3 of 3. +error.general.3=If the problem persists please contact your system administrator or the technical forums on http://lamscommunity.org/. + +# Change Password screen - new passwords do not match error.newpassword.mismatch=Your new passwords don't match each other. +# Change Password change screen - old password was not entered correctly error.oldpassword.mismatch=Your old password is not correct. +# Change Password screen - page heading +heading.password.change.screen=Change Password +# Change Password screen - Old Password +label.password.old.password=Old Password +# Change Password screen - New Password +label.password.new.password=New Password +# Change Password screen - Confirm New Password +label.password.confirm.new.password=Confirm New Password +# Password Changed screen - page heading +heading.password.changed.screen=Password Changed +# Password Changed screen - password changed okay +msg.password.changed=Your password has been changed. + +# Login error message +error.login=Sorry, that username or password is not known. Please try again. +# Login button +button.login=Login + +# Link to the user guide +label.user.guide=[HELP] +# Message displayed as the main page is loading. +msg.loading=Loading... +# LAMS Version shown on login and main page +msg.LAMS.version=Version 2.0 +# Short copyright message shown on the login and main pages +msg.LAMS.copyright.short=2002-2006 LAMS Foundation. +# Long copyright message shown on the login and main pages +msg.LAMS.copyright.long=LAMS™ © 2002-2006 LAMS Foundation.\nAll rights reserved.\n\nLAMS is a trademark of LAMS Foundation.\nDistribution of this software is prohibited. + +# Save button text +button.save=Save +# Cancel button text +button.cancel=Cancel + # Invalid data sent from Flash to server. invalid.wddx.packet=Invalid Object in WDDX packet. Error was {0}. no.such.learningdesign.exist=No Learning Design with learning_design_id of:{0} exists. @@ -32,10 +82,25 @@ rename.resource.error.miss.vaue=renameResource(Long resourceID,Integer newName, String resourceType, Integer userID) requires a value for resourceID, targetFolderID, resourceType and userID. rename.resource.unspport=LAMS does not support renaming a file via the workspace interface. folder.already.exist=A folder with given name '{0}' already exists. -can.not.rename.root.folder=Cannot rename the ROOT folder. organisations=Organisations folders=Folders +# Title used for any misc LAMS screen such as the password change screen +title.lams=LAMS +title.login.window=Login - LAMS :: Learning Activity Management System +title.system.admin.window=System Admin:: LAMS +msg.loading.system.admin.window=Loading System Administration Environment. +title.admin.window=Admin:: LAMS +msg.loading.admin.window=Loading Administration Environment. +title.add.lesson.window=Add Lesson:: LAMS +msg.loading.add.lesson.window=Loading Add Lesson Wizard. +title.monitor.lesson.window=Monitor Lesson:: LAMS +msg.loading.monitor.lesson.window=Loading Lesson Monitoring Environment. +title.learner.window=Learner:: LAMS +msg.loading.learner.window=Loading Learner Environment. +title.change.password.window=LAMS :: Change Password +title.password.changed.window=LAMS :: Password Changed +title.error.window=LAMS :: Error authoring.msg.save.success=Congratulation, your content saved successfully! label.authoring.close=Close @@ -56,7 +121,9 @@ index.dummymonitor = Dummy Monitor -############# Since by 20 June 2006 ############# +# Import and Export related + + title.import.result=Import tool content result title.import=Import tool content title.import.instruction=Please choose learning design zip file and import. Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java,v diff -u -r1.12 -r1.13 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 20 Jun 2006 05:22:44 -0000 1.12 +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 23 Jun 2006 08:01:09 -0000 1.13 @@ -101,7 +101,7 @@ } } catch (Exception e) { - e.printStackTrace(); + log.error("Failed to load sysadmin",e); return mapping.findForward("error"); } } @@ -130,7 +130,7 @@ } } catch (Exception e) { - e.printStackTrace(); + log.error("Failed to load learner",e); return mapping.findForward("error"); } } @@ -157,7 +157,7 @@ } } catch (Exception e) { - e.printStackTrace(); + log.error("Failed to load author",e); return mapping.findForward("error"); } } @@ -186,7 +186,7 @@ return mapping.findForward("monitorLesson"); } } catch (Exception e) { - e.printStackTrace(); + log.error("Failed to load monitor lesson",e); return mapping.findForward("error"); } } @@ -222,7 +222,7 @@ } } catch (Exception e) { - e.printStackTrace(); + log.error("Failed to load add lesson",e); return mapping.findForward("error"); } } Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java,v diff -u -r1.31 -r1.32 --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java 22 Jun 2006 23:04:18 -0000 1.31 +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java 23 Jun 2006 08:01:10 -0000 1.32 @@ -1255,10 +1255,7 @@ FlashMessage.ERROR); }else flashMessage = FlashMessage.getUserNotAuthorized(MSG_KEY_RENAME,userID); - }else - flashMessage = new FlashMessage(MSG_KEY_RENAME, - messageService.getMessage("can.not.rename.root.folder"), - FlashMessage.ERROR); + } }else flashMessage = FlashMessage.getNoSuchWorkspaceFolderExsists(MSG_KEY_RENAME,workspaceFolderID); }catch(UserException ue){ Index: lams_central/web/addLesson.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/addLesson.jsp,v diff -u -r1.1 -r1.2 --- lams_central/web/addLesson.jsp 25 May 2006 01:01:50 -0000 1.1 +++ lams_central/web/addLesson.jsp 23 Jun 2006 08:01:09 -0000 1.2 @@ -1,15 +1,18 @@ +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> <%@ taglib uri="tags-lams" prefix="lams" %> -<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-core" prefix="c" %>
-&classID=Loading Learner Environment.
- + +Loading Administration Environment.
- + +