Index: lams_admin/web/import/importexcel.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/import/importexcel.jsp,v
diff -u -r1.5 -r1.5.2.1
--- lams_admin/web/import/importexcel.jsp	29 Nov 2006 01:56:52 -0000	1.5
+++ lams_admin/web/import/importexcel.jsp	12 Mar 2007 00:40:39 -0000	1.5.2.1
@@ -1,21 +1,29 @@
 <%@ include file="/taglibs.jsp"%>
-<%@ page import="org.lamsfoundation.lams.admin.util.IUserImportFileParser" %>
+<%@ page import="org.lamsfoundation.lams.admin.service.IImportService" %>
 
 <h2>
 	<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
 	: <fmt:message key="admin.user.import" />
 </h2>
 
-<lams:help page="<%= IUserImportFileParser.IMPORT_HELP_PAGE %>"/>
+<lams:help page="<%= IImportService.IMPORT_HELP_PAGE %>"/>
 
 <p>&nbsp;</p>
 
 <p><fmt:message key="msg.import.intro"/></p>
 <p>
-<fmt:message key="label.notes"/>:<br/>
 <ul>
-<li><fmt:message key="msg.import.1"/></li>
-<li><fmt:message key="msg.import.2"/></li>
+	<li>
+		<fmt:message key="msg.import.1"/>
+	</li>
+	<li>
+		<fmt:message key="msg.import.2"/>
+		<ul><li><p><a href="file/lams_users_template.xls">lams_users_template.xls</a></p></li></ul>
+	</li>
+	<li>
+		<fmt:message key="msg.import.3"/>
+		<ul><li><p><a href="file/lams_roles_template.xls">lams_roles_template.xls</a></p></li></ul>
+	</li>
 </ul>
 </p>
 <p><fmt:message key="msg.import.conclusion"/></p>
@@ -25,11 +33,7 @@
 
 <table>
 	<tr>
-		<td colspan="2">
-			<fmt:message key="label.download.template" /> <a href="file/lams_users_template.xls"><fmt:message key="label.spreadsheet" /></a>
-		</td>
-	<tr>
-		<td><fmt:message key="label.excel.spreadsheet" />:</td>
+		<td align="right"><fmt:message key="label.excel.spreadsheet" />:&nbsp;</td>
 		<td><html:file property="file" /></td>
 	</tr>
 </table>