Index: lams_admin/conf/language/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/Attic/ApplicationResources.properties,v diff -u -r1.50 -r1.51 --- lams_admin/conf/language/ApplicationResources.properties 24 Nov 2006 20:14:03 -0000 1.50 +++ lams_admin/conf/language/ApplicationResources.properties 29 Nov 2006 01:56:52 -0000 1.51 @@ -197,6 +197,11 @@ msg.group.organisation_id =The organisation_id of this group is msg.subgroup.organisation_id =The organisation_id of this subgroup is msg.remove.from.subgroups =Removed users will also be removed from subgroups. +label.import = Import +label.notes = Notes +msg.import.intro = Use this screen to bulk import users using an Excel spreadsheet. +msg.import.1 = In the spreadsheet, columns marked with a (*) are mandatory (login, password, first name, last name, and email). +msg.import.2 = If you specify an organisation id to import a user into, you must specify at least one role to apply to that group or subgroup. +msg.import.conclusion = Click the help icon above for more information. - #======= End labels: Exported 191 labels for en AU ===== Index: lams_admin/src/java/org/lamsfoundation/lams/admin/util/IUserImportFileParser.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/util/Attic/IUserImportFileParser.java,v diff -u -r1.5 -r1.6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/util/IUserImportFileParser.java 20 Oct 2006 02:39:39 -0000 1.5 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/util/IUserImportFileParser.java 29 Nov 2006 01:56:52 -0000 1.6 @@ -40,6 +40,7 @@ public interface IUserImportFileParser { public static final String SEPARATOR = "|"; + public static final String IMPORT_HELP_PAGE = "Import+Users"; public List parseSpreadsheet(FormFile file) throws IOException; Index: lams_admin/web/import/importexcel.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/import/importexcel.jsp,v diff -u -r1.4 -r1.5 --- lams_admin/web/import/importexcel.jsp 24 Nov 2006 01:47:31 -0000 1.4 +++ lams_admin/web/import/importexcel.jsp 29 Nov 2006 01:56:52 -0000 1.5 @@ -1,12 +1,25 @@ <%@ include file="/taglibs.jsp"%> +<%@ page import="org.lamsfoundation.lams.admin.util.IUserImportFileParser" %>
+
+
+
+