Index: lams_admin/conf/language/ApplicationResources.properties
===================================================================
diff -u -r2df86f4b4c580702ce5ac576652359b838914583 -r5e7a73abd66a04cf44dfac630322dcfa958a396f
--- lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2df86f4b4c580702ce5ac576652359b838914583)
+++ lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5e7a73abd66a04cf44dfac630322dcfa958a396f)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon Dec 11 19:47:20 GMT 2006 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Dec 05 00:30:12 GMT 2006 
  
 #=================== labels for LAMS Administration =================# 
 
@@ -193,6 +193,7 @@
 admin.register.server.config.build  =Server Build No.
 admin.register.server.config.locale  =Server Language (Locale)
 admin.register.server.config.langdate  =Language Date
+admin.register.server.stats.total.users  =Total # of Users
 label.show.all.users  =Show all users
 msg.group.organisation_id  =The organisation_id of this group is
 msg.subgroup.organisation_id  =The organisation_id of this subgroup is
@@ -207,4 +208,4 @@
 label.results.per.page  =Results per page
 
 
-#======= End labels: Exported 199 labels for en AU =====
+#======= End labels: Exported 198 labels for en AU =====
Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r336014c7cec33723726010231bde33206bda4cb1 -r5e7a73abd66a04cf44dfac630322dcfa958a396f
--- lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 336014c7cec33723726010231bde33206bda4cb1)
+++ lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 5e7a73abd66a04cf44dfac630322dcfa958a396f)
@@ -104,5 +104,7 @@
 	<form-property name="monitorno" type="java.lang.Integer" />
 	<form-property name="managerno" type="java.lang.Integer" />
 	<form-property name="learnerno" type="java.lang.Integer" />
+	<form-property name="authoradminno" type="java.lang.Integer" />
+	<form-property name="userno" type="java.lang.Integer" />
 	<form-property name="public" type="java.lang.Boolean" initial="true" />
 </form-bean>
\ No newline at end of file
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java
===================================================================
diff -u -r2e362eb2427ed96a5acbfbaabe8c0b2c707f8e27 -r5e7a73abd66a04cf44dfac630322dcfa958a396f
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java	(.../RegisterAction.java)	(revision 2e362eb2427ed96a5acbfbaabe8c0b2c707f8e27)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java	(.../RegisterAction.java)	(revision 5e7a73abd66a04cf44dfac630322dcfa958a396f)
@@ -38,6 +38,7 @@
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
@@ -108,6 +109,8 @@
 		registerForm.set("monitorno", service.getCountRoleForSystem(Role.ROLE_MONITOR));
 		registerForm.set("managerno", service.getCountRoleForSystem(Role.ROLE_GROUP_MANAGER));
 		registerForm.set("learnerno", service.getCountRoleForSystem(Role.ROLE_LEARNER));
+		registerForm.set("authoradminno", service.getCountRoleForSystem(Role.ROLE_AUTHOR_ADMIN));
+		registerForm.set("userno", Integer.valueOf(service.findAll(User.class).size()));
 		
 		
 		return mapping.findForward("register");
Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r29551b741b1aec1a353848c10813385d7d72c3c8 -r5e7a73abd66a04cf44dfac630322dcfa958a396f
--- lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 29551b741b1aec1a353848c10813385d7d72c3c8)
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 5e7a73abd66a04cf44dfac630322dcfa958a396f)
@@ -21,6 +21,10 @@
       name="CacheActionForm"
       type="org.lamsfoundation.lams.admin.web.CacheActionForm"
     />
+    <form-bean
+      name="ImportExcelForm"
+      type="org.lamsfoundation.lams.admin.web.ImportExcelForm"
+    />
 
    <form-bean name="OrganisationForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="orgId" type="java.lang.Integer" />
@@ -79,6 +83,8 @@
     <form-property name="sFirstName" type="java.lang.String" />
     <form-property name="sLastName" type="java.lang.String" />
     <form-property name="searched" type="java.lang.Boolean" initial="false" />
+    <form-property name="showAll" type="java.lang.Boolean" initial="false" />
+    <form-property name="resultsSection" type="java.lang.String" />
 </form-bean>
 
 <form-bean name="LoginMaintainForm" type="org.apache.struts.action.DynaActionForm">
@@ -109,6 +115,8 @@
 
 <form-bean name="RegisterForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="sitename" type="java.lang.String" />
+	<form-property name="rname" type="java.lang.String" />
+	<form-property name="remail" type="java.lang.String" />
 	<form-property name="serverurl" type="java.lang.String" />
 	<form-property name="serverversion" type="java.lang.String" />
 	<form-property name="serverbuild" type="java.lang.String" />
@@ -124,9 +132,9 @@
 	<form-property name="monitorno" type="java.lang.Integer" />
 	<form-property name="managerno" type="java.lang.Integer" />
 	<form-property name="learnerno" type="java.lang.Integer" />
+	<form-property name="authoradminno" type="java.lang.Integer" />
+	<form-property name="userno" type="java.lang.Integer" />
 	<form-property name="public" type="java.lang.Boolean" initial="true" />
-	<form-property name="rname" type="java.lang.String" />
-	<form-property name="remail" type="java.lang.String" />
 </form-bean>
   </form-beans>
 
@@ -158,24 +166,17 @@
     >
       <forward
         name="organisation"
-        path=".organisation"
+        path="/organisation.do?method=edit"
         redirect="false"
       />
       <forward
         name="orglist"
         path="/orgmanage.do"
         redirect="false"
       />
-    </action>
-    <action
-      path="/orgmanage"
-      type="org.lamsfoundation.lams.admin.web.OrgManageAction"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="orglist"
-        path=".orglist"
+        name="userlist"
+        path="/usermanage.do"
         redirect="false"
       />
     </action>
@@ -195,6 +196,18 @@
       />
     </action>
     <action
+      path="/orgmanage"
+      type="org.lamsfoundation.lams.admin.web.OrgManageAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="orglist"
+        path=".orglist"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/serverlist"
       type="org.lamsfoundation.lams.admin.web.ServerListAction"
       unknown="false"
@@ -207,6 +220,26 @@
       />
     </action>
     <action
+      path="/importexcelsave"
+      type="org.lamsfoundation.lams.admin.web.ImportExcelSaveAction"
+      name="ImportExcelForm"
+      scope="request"
+      input=".importexcel"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="importresult"
+        path=".importresult"
+        redirect="false"
+      />
+      <forward
+        name="sysadmin"
+        path="/sysadminstart.do"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/usersave"
       type="org.lamsfoundation.lams.admin.web.UserSaveAction"
       name="UserForm"
@@ -252,24 +285,16 @@
       />
     </action>
     <action
-      path="/organisation"
-      type="org.lamsfoundation.lams.admin.web.OrganisationAction"
-      name="OrganisationForm"
-      scope="request"
-      parameter="method"
+      path="/sysadminstart"
+      type="org.lamsfoundation.lams.admin.web.action.SysAdminStartAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="organisation"
-        path=".organisation"
+        name="sysadmin"
+        path=".sysadmin"
         redirect="false"
       />
-      <forward
-        name="orglist"
-        path="/orgmanage.do"
-        redirect="false"
-      />
     </action>
     <action
       path="/userroles"
@@ -292,6 +317,26 @@
       />
     </action>
     <action
+      path="/organisation"
+      type="org.lamsfoundation.lams.admin.web.OrganisationAction"
+      name="OrganisationForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="organisation"
+        path=".organisation"
+        redirect="false"
+      />
+      <forward
+        name="orglist"
+        path="/orgmanage.do"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/config"
       type="org.lamsfoundation.lams.admin.web.ConfigAction"
       name="ConfigForm"
@@ -308,7 +353,7 @@
       />
       <forward
         name="sysadmin"
-        path=".sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
     </action>
@@ -359,7 +404,7 @@
     >
       <forward
         name="sysadmin"
-        path=".sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
       <forward
@@ -421,8 +466,30 @@
         path="/usermanage.do"
         redirect="false"
       />
+      <forward
+        name="userorg"
+        path="/userorg.do"
+        redirect="false"
+      />
     </action>
     <action
+      path="/toolcontentlist"
+      type="org.lamsfoundation.lams.admin.web.ToolContentListAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="toolcontentlist"
+        path=".toolcontentlist"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".error"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/servermaintain"
       type="org.lamsfoundation.lams.admin.web.ServerMaintainAction"
       name="ServerOrgMapForm"
@@ -459,16 +526,35 @@
       />
       <forward
         name="sysadmin"
-        path=".sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
       <forward
+        name="success"
+        path="http://lamscommunity.org/registration"
+        redirect="false"
+      />
+      <forward
         name="error"
         path=".error"
         redirect="false"
       />
     </action>
     <action
+      path="/importexcel"
+      type="org.lamsfoundation.lams.admin.web.ImportExcelAction"
+      name="ImportExcelForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="importexcel"
+        path=".importexcel"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/usermanage"
       type="org.lamsfoundation.lams.admin.web.UserManageAction"
       unknown="false"
@@ -564,10 +650,6 @@
       />
     </action>
 
-       <action
-      path="/sysadminstart"
-      forward=".sysadmin"
-    />
   </action-mappings>
 
    <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
Index: lams_admin/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r767aeb480b6a76d982755e1fd7c7220d2da5c965 -r5e7a73abd66a04cf44dfac630322dcfa958a396f
--- lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 767aeb480b6a76d982755e1fd7c7220d2da5c965)
+++ lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 5e7a73abd66a04cf44dfac630322dcfa958a396f)
@@ -81,13 +81,13 @@
         	window.close();
 		}
     }  				
-</script>				
-<p id="saveCancelButtons" style="text-align: right">
-	<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button">
-		<fmt:message key="${saveButtonLabelKey}" /> 
-	</html:link>
-	<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button">
-		<fmt:message key="${cancelButtonLabelKey}" />
-	</html:link>
+</script>	
+<p id="saveCancelButtons" >
+		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
+			<fmt:message key="${cancelButtonLabelKey}" />
+		</html:link>
+		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button right-buttons space-left">
+			<fmt:message key="${saveButtonLabelKey}" /> 
+		</html:link>
 </p>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_admin/web/register.jsp
===================================================================
diff -u -rd32ad084559609b1bf57bfe096a7e8634bf0f265 -r5e7a73abd66a04cf44dfac630322dcfa958a396f
--- lams_admin/web/register.jsp	(.../register.jsp)	(revision d32ad084559609b1bf57bfe096a7e8634bf0f265)
+++ lams_admin/web/register.jsp	(.../register.jsp)	(revision 5e7a73abd66a04cf44dfac630322dcfa958a396f)
@@ -491,6 +491,24 @@
 					<input type="hidden" name="learnerno" value="<bean:write name="RegisterForm" property="learnerno"/>"/>	
 				</td>
 			</tr>
+			<tr>
+				<td>
+					<fmt:message key="role.AUTHOR.ADMIN"/>
+				</td>
+				<td>
+					<bean:write name="RegisterForm" property="authoradminno"/>
+					<input type="hidden" name="authoradminno" value="<bean:write name="RegisterForm" property="authoradminno"/>"/>	
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="admin.register.server.stats.total.users"/>
+				</td>
+				<td>
+					<bean:write name="RegisterForm" property="userno"/>
+					<input type="hidden" name="userno" value="<bean:write name="RegisterForm" property="userno"/>"/>	
+				</td>
+			</tr>
 	</table>
 	
 	<p align="center">