From 2a043f5971f0ef3a376be2a62b74e1e787c37919 Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 6 May 2011 14:54:32 +0000
Subject: [PATCH] NIHVIVO-2279 First stab at UserAccountsListController

---
 productMods/WEB-INF/web.xml                            | 10 ++++++++++
 .../body/siteAdmin/siteAdmin-siteConfiguration.ftl     |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index aa62d193..d8d7f257 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -838,6 +838,7 @@
     <url-pattern>/addRestriction</url-pattern>
   </servlet-mapping>
 
+<!-- TODO This should go away as soon as the new UserAccounts are fully implemented. jblake -->
   <servlet>
     <servlet-name>UsersListingController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.UsersListingController</servlet-class>
@@ -847,6 +848,15 @@
     <url-pattern>/listUsers</url-pattern>
   </servlet-mapping>
 
+  <servlet>
+    <servlet-name>UserAccountsList</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsListController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>UserAccountsList</servlet-name>
+    <url-pattern>/listUserAccounts</url-pattern>
+  </servlet-mapping>
+
   <servlet>
     <servlet-name>StatementChangeListingController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.jena.StatementChangeListingController</servlet-class>
diff --git a/productMods/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl b/productMods/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
index 9d9b309e..b8f58a36 100644
--- a/productMods/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
+++ b/productMods/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
@@ -22,10 +22,15 @@
                 <li><a href="${siteConfig.urls.tabs}">Tab management</a></li>
             </#if>
    
+            <#-- TODO This goes away when the UserAccounts are fully implemented - jblake -->
             <#if siteConfig.urls.users??>
                 <li><a href="${siteConfig.urls.users}">User accounts</a></li>  
             </#if>
             
+            <#if siteConfig.urls.userList??>
+                <li><a href="${siteConfig.urls.userList}">Manage user accounts</a> (work in progress)</li>  
+            </#if>
+            
         </ul>
     </div>
 </#if>