Index: lams_admin/conf/language/ApplicationResources.properties =================================================================== diff -u -rf7b4f8c0c3dfb50695ae6b02244c0667de42eb1a -r82ab50b131666456fc4216aa121c295f84c47a11 --- lams_admin/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision f7b4f8c0c3dfb50695ae6b02244c0667de42eb1a) +++ lams_admin/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 82ab50b131666456fc4216aa121c295f84c47a11) @@ -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 =================================================================== diff -u -r0892350e28ca67031ad97e624f167dccd6272871 -r82ab50b131666456fc4216aa121c295f84c47a11 --- lams_admin/src/java/org/lamsfoundation/lams/admin/util/IUserImportFileParser.java (.../IUserImportFileParser.java) (revision 0892350e28ca67031ad97e624f167dccd6272871) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/util/IUserImportFileParser.java (.../IUserImportFileParser.java) (revision 82ab50b131666456fc4216aa121c295f84c47a11) @@ -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 =================================================================== diff -u -rd32ad084559609b1bf57bfe096a7e8634bf0f265 -r82ab50b131666456fc4216aa121c295f84c47a11 --- lams_admin/web/import/importexcel.jsp (.../importexcel.jsp) (revision d32ad084559609b1bf57bfe096a7e8634bf0f265) +++ lams_admin/web/import/importexcel.jsp (.../importexcel.jsp) (revision 82ab50b131666456fc4216aa121c295f84c47a11) @@ -1,12 +1,25 @@ <%@ include file="/taglibs.jsp"%> +<%@ page import="org.lamsfoundation.lams.admin.util.IUserImportFileParser" %>

:

+ +

 

+

+

+:
+

+

+

+ @@ -19,10 +32,10 @@ : - -   - - +

+   + +

\ No newline at end of file