sugoi-mail 0.3.0 → 0.3.2

data/app/views/account/welcome.rhtml

@@ -1,3 +1,3 @@
 <%= render :file => "mailinglist/list", :use_full_path => true %>
-<%= render :file => "root_admin/list_users", :use_full_path => true %>
-<%= render :file => "mailinglist/list_mailinglist_classes", :use_full_path => true %>
+<%= render :file => "admin/list_users", :use_full_path => true %>
+<%= render :file => "mailinglist_class/list", :use_full_path => true %>

data/app/views/{root_admin → admin}/_form.rhtml

@@ -1,6 +1,6 @@
-<%= error_messages_for 'root_admin' %>
+<%= error_messages_for 'admin' %>
 
-<!--[form:root_admin]-->
+<!--[form:admin]-->
 <p>
     <label for="admin_user_signup_login">Login</label>
     <br/>
@@ -18,4 +18,4 @@
     <input type="submit" value="Save" />
 </p>
 
-<!--[eoform:root_admin]-->
+<!--[eoform:admin]-->

data/app/views/{root_admin → admin}/list_users.rhtml

@@ -16,14 +16,14 @@
 			<% for column in User.content_columns %>
 				<% if column.human_name != "Password"%>
 					<% if column.human_name == "Login" %>
-						<td><%= link_to user.send(column.name), :controller => "root_admin", :action => 'show', :id => user %></td>
+						<td><%= link_to user.send(column.name), :controller => "admin", :action => 'show', :id => user %></td>
 					<% else %>
 						<td><%=h user.send(column.name) %></td>
 					<% end %>
 				<% end %>
 			<% end %>
-			<td><%= link_to 'Edit', :controller => "root_admin", :action => 'edit', :id => user %></td>
-			<td><%= link_to_image "remove.gif", { :controller => "root_admin", :action => 'remove', :id => user }, :post => true, :confirm => 'Are you sure you want to remove this user?' %></td>
+			<td><%= link_to 'Edit', :controller => "admin", :action => 'edit', :id => user %></td>
+			<td><%= link_to_image "remove.gif", { :controller => "admin", :action => 'remove', :id => user }, :post => true, :confirm => 'Are you sure you want to remove this user?' %></td>
 			
 			</tr>
 		<% end %>

data/app/views/layouts/application.rhtml

@@ -22,7 +22,7 @@
 <!-- Main Content Panel -->
 
 <div id="content">
-    <%= flash[:notice] %>
+    <div id="flash" ><%= flash[:notice] %></div>
     <%= @content_for_layout %>
 </div>
 

data/app/views/mailinglist/edit.rhtml

@@ -11,6 +11,6 @@
       <%= submit_tag 'Add' %>
 <%= end_form_tag %>
 <br/><br/>
-<%= button_to 'Delete This Mailing List', { :action => 'remove', :id => @mailinglist }, :confirm => 'Are you sure you want to destroy this mailinglist?' %>
+<%= button_to 'Delete', { :action => 'remove', :id => @mailinglist }, :confirm => 'Are you sure you want to remove this mailinglist?' %>
 
 <br>

data/app/views/mailinglist_class/_form.rhtml

@@ -0,0 +1,31 @@
+<!--[form:mailinglist_class]-->
+    <%
+        #MLClass settings through checkboxes, & explanations..
+      %> 
+    <table class='checklist'>
+        <tr><td style="width: 120px;"> 
+            <label for="mailinglist_class_name">Class Name: </label>
+        </td><td>
+            <% if editable then %>
+                <%= text_field('mailinglist_class', 'name', { :class => 'textbox'}) %>
+            <% else %>
+                <%=@mailinglist_class.name%>
+            <% end %>
+        </td></tr>       
+        <tr><td> 
+            <label for="mailinglist_class_description" > Description: </label>
+        </td><td>
+             <% if editable then %>
+                <%= text_field('mailinglist_class', 'description', { :class => 'textbox'}) %>
+            <% else %>
+                <%=@mailinglist_class.description%>
+            <% end %>
+        </td></tr>
+        <% MailinglistClass.get_param_names.each do |param| %>
+            <%=render :partial => 'form_option', :locals => { :editable => editable, :param => param }%>
+        <%end%>
+    </table> 
+   </p>
+
+<!--[eoform:mailinglist_class]-->
+

data/app/views/mailinglist_class/_form_option.rhtml

@@ -0,0 +1,14 @@
+       <tr><td>
+            <% if editable then %>
+                <%= check_box 'mailinglist_class', param, { :disabled => false }, true, false %>
+            <% else %>
+                <%= check_box 'mailinglist_class', param, { :disabled => true }, true, false %>
+            <% end %>
+ 
+            <label for="mailinglist_class_<%=param%>">
+                <%=param.to_s.capitalize%>
+            </label>
+        </td><td class='help'>
+            <%=MailinglistClass.get_param_description(param, true)%>
+        </td></tr>
+

data/app/views/mailinglist_class/_new_form.rhtml

@@ -0,0 +1,16 @@
+<!--[form:mailinglist]-->
+<table class='mainTable'>
+    <tr><td>
+        <label for="mailinglist_class_name">Mailinglist Class Name</label>
+    </td><td>
+        <%= text_field 'mailinglist_class', 'name', { :class => 'textbox' }  %>
+    </td></tr>
+    <tr><td>
+        <label for="mailinglist_class_description">Description:</label>
+	</td><td>
+        <%= text_field 'mailinglist_class', 'description', { :class => 'textbox' } %>
+    </td></tr>
+</table>
+<br/>
+<br/>
+<!--[eoform:mailinglist]-->

data/app/views/mailinglist_class/edit.rhtml

@@ -0,0 +1,15 @@
+<%= error_messages_for 'mailinglist_class' %>
+
+<h2>Edit ML-Class: <%= @mailinglist_class.name %></h2>
+
+<%= start_form_tag :action => 'edit', :id => @mailinglist_class %>
+  <%=render :partial => 'form', :locals => { :editable => true  } %>
+  <br/>
+<%= submit_tag 'Save Changes', { :class => 'button' } %>
+<%= end_form_tag %>
+
+<%= button_to 'Delete mlClass', { :action => 'remove', :id => @mailinglist_class }, :confirm => 'Are you sure you want to remove this mailinglist class?' , :class => 'button' %>
+
+
+<br>
+

data/app/views/{mailinglist/list_mailinglist_classes.rhtml → mailinglist_class/list.rhtml}

@@ -9,10 +9,11 @@
   
 <% for mailinglist_class in @mailinglist_classes %>
   <tr>
-   <td><%= link_to mailinglist_class.name, :controller => "mailinglist", :action => 'show', :id => mailinglist_class %></td>
+   <td><%= link_to mailinglist_class.name, :controller => "mailinglist_class", :action => 'show', :id => mailinglist_class.id %></td>
+
 	<td><%=h mailinglist_class.description %></td>
-   <td><%= link_to 'Edit', :controller => "mailinglist", :action => 'edit', :id => mailinglist_class %></td>
-   <td><%= link_to_image "remove.gif", { :controller => "mailinglist", :action => 'remove', :id => mailinglist_class }, :post => true, :confirm => 'Are you sure you want to remove this mailinglist?' %>
+   <td><%= link_to 'Edit', :controller => "mailinglist_class", :action => 'edit', :id => mailinglist_class %></td>
+   <td><%= link_to_image "remove.gif", { :controller => "mailinglist_class", :action => 'remove', :id => mailinglist_class.id }, :post => true, :confirm => 'Are you sure you want to remove this mailinglist?' %>
   </tr>
 <% end %>
-</table>
+</table>

data/app/views/mailinglist_class/new.rhtml

@@ -0,0 +1,10 @@
+<%= error_messages_for 'mailinglist_class' %>
+
+<h2>New Mailing List Class</h2>
+
+<%= start_form_tag :controller => 'mailinglist_class', :action => 'new' %>
+
+  <%=render :partial => 'form', :locals => { :editable => true  } %>
+
+  <%= submit_tag 'Save' %>
+<%= end_form_tag %>

data/app/views/mailinglist_class/show.rhtml

@@ -0,0 +1,9 @@
+<%= error_messages_for 'mailinglist_class' %>
+
+<h2>ML-Class: <%= @mailinglist_class.name %></h2>
+
+<%=render :partial => 'form', :locals => { :editable => false  } %>
+<br/>
+                                                                            
+                                                                          
+                

data/app/views/navigation/_nav_module.rhtml

@@ -7,8 +7,8 @@
             <br/>
             <br/>
             <div class="link"><%= link_to "New Mailing List", :controller => "mailinglist", :action => "new" %></div><br/>
-            <div class="link"><%= link_to "New User", :controller => "root_admin", :action => "admin_user_new" %></div><br/>
-            <div class="link"><%= link_to "New Mailing List Class", :controller => "mailinglist", :action => "new_mailinglist_class" %></div><br/>
+            <div class="link"><%= link_to "New User", :controller => "admin", :action => "admin_user_new" %></div><br/>
+            <div class="link"><%= link_to "New Mailing List Class", :controller => "mailinglist_class", :action => "new" %></div><br/>
             <div class="link"><%= link_to "Logout", :controller => "account", :action => "logout"%></div>  
             </div>
         <% end %>
@@ -22,11 +22,11 @@
         <% if @action_name == "list_admin_messages" %>
             <div class="link"><%= link_to "New Admin Message", :action => "new_admin_message" %></div><br/>
             <div class="link"><%= link_to "Back", controller.request.env["HTTP_REFERER"] %></div><br/>
-            <% elsif @action_name == "edit_admin_message" %>
+        <% elsif @action_name == "edit_admin_message" %>
             <div class="link"><%= link_to "Back", controller.request.env["HTTP_REFERER"] %></div><br/>
-             <% elsif @action_name == "new_admin_message" %>
+        <% elsif @action_name == "new_admin_message" %>
             <div class="link"><%= link_to "Back", controller.request.env["HTTP_REFERER"] %></div><br/>
-            <% elsif @action_name == 'show' %>
+        <% elsif @action_name == 'show' %>
             <div class="link"><%= link_to "Edit Mailing List", :action => 'edit', :id => @mailinglist %></div><br/>
             <div class="link"><%= link_to "Back", :controller => "account", :action => "welcome" %></div><br/>
         <% end %>
@@ -41,21 +41,21 @@
             <% if @action_name == "list" %>
                 <div class="link"><%= link_to "New Mailing List", :action => "new" %></div><br/>
                 <div class="link"><%= link_to "Back", :controller => "account", :action => "welcome" %></div><br/>
-                <% elsif @action_name == "edit" %>
+            <% elsif @action_name == "edit" %>
                 <div class="link"><%= link_to "Back", controller.request.env["HTTP_REFERER"] %></div><br/>
-                 <% elsif @action_name == "new_mailinglist_class" %>
+            <% elsif @action_name == "new_mailinglist_class" %>
                 <div class="link"><%= link_to "Back", controller.request.env["HTTP_REFERER"] %></div><br/>
-                <% elsif @action_name == "new" %>
+            <% elsif @action_name == "new" %>
                 <div class="link"><%= link_to "Back", controller.request.env["HTTP_REFERER"] %></div><br/>
             <% elsif @action_name == 'show' %>
                 <div class="link"><%= link_to "Edit Mailing List", :action => 'edit', :id => @mailinglist %></div><br/>
                 <div class="link"><%= link_to "List Admin Messages", :controller => "mail_admin", :action => "list_admin_messages", :id => @mailinglist %></div><br/>
-            <div class="link"><%= link_to "Back", :controller => "account", :action => "welcome" %></div><br/>
+                <div class="link"><%= link_to "Back", :controller => "account", :action => "welcome" %></div><br/>
             <% end %>
         <div class="link"><%= link_to "Logout", :controller => "account", :action => "logout"%></div>
     <% end %>
 
-    <% if @controller_name == 'root_admin' %>
+    <% if @controller_name == 'admin' %>
         <div id="navbar">
         <br/>
         <br/>
@@ -63,11 +63,11 @@
             <% if @action_name == "list_users" %>
                 <div class="link"><%= link_to "New User", :action => "admin_user_new" %></div><br/>
                 <div class="link"><%= link_to "Back", :controller => 'account', :action => 'welcome' %></div><br/>
-                <% elsif @action_name == "edit" %>
+            <% elsif @action_name == "edit" %>
                 <div class="link"><%= link_to "Back", controller.request.env["HTTP_REFERER"] %></div><br/>
-                <% elsif @action_name == "admin_user_new" %>
+            <% elsif @action_name == "admin_user_new" %>
                 <div class="link"><%= link_to "Back", :controller => "account", :action => "welcome" %></div><br/>
-                <% elsif @action_name == 'show' %>
+            <% elsif @action_name == 'show' %>
                 <div class="link"><%= link_to "Edit Mailing List", :action => 'edit', :id => @mailinglist %></div><br/>
                 <div class="link"><%= link_to "Back", :action => 'list' %></div><br/>
             <% end %>

data/app/views/navigation/_root_add_address_module.rhtml

@@ -1,3 +1,3 @@
 
-<div class="link"><%= link_to "Back", :controller => "root_admin", :action => "edit_mailinglist"%></div><br/>
+<div class="link"><%= link_to "Back", :controller => "admin", :action => "edit_mailinglist"%></div><br/>
 <div class="link"><%= link_to "Logout", :controller => "account", :action => "logout"%></div>

data/app/views/navigation/_root_add_mailinglist_module.rhtml

@@ -1,3 +1,3 @@
 
-<div class="link"><%= link_to "Back", :controller => "root_admin", :action => "list_mailinglists"%></div><br/>
+<div class="link"><%= link_to "Back", :controller => "admin", :action => "list_mailinglists"%></div><br/>
 <div class="link"><%= link_to "Logout", :controller => "account", :action => "logout"%></div>

data/app/views/navigation/_root_add_user_module.rhtml

@@ -1,3 +1,3 @@
 
-<div class="link"><%= link_to "Back", :controller => "root_admin", :action => "list_users"%></div><br/>
+<div class="link"><%= link_to "Back", :controller => "admin", :action => "list_users"%></div><br/>
 <div class="link"><%= link_to "Logout", :controller => "account", :action => "logout"%></div>

data/app/views/navigation/_root_change_user_password_module.rhtml

@@ -1,3 +1,3 @@
 
-<div class="link"><%= link_to "Back", :controller => "root_admin", :action => "show_user"%></div><br/>
+<div class="link"><%= link_to "Back", :controller => "admin", :action => "show_user"%></div><br/>
 <div class="link"><%= link_to "Logout", :controller => "account", :action => "logout"%></div>

data/app/views/navigation/_root_edit_address_module.rhtml

@@ -1,13 +1,13 @@
 <!-- I don't think they need links because when you edit it should just popup something. At most, they will need a cancel button if that's how I implement it (with the editing in the content panel and "cancel" + "logout" in the navbar
-<div class="link"><%= link_to "Add User", :controller => "root_admin", :action => "list_mailinglists" %></div><br/>
+<div class="link"><%= link_to "Add User", :controller => "admin", :action => "list_mailinglists" %></div><br/>
 
 <!-- Change these to link_to_if to establish condition that they are clickable only -->
 <!-- if a user is selected in the main panel. They should display regardless, but   -->
 <!-- be greyed out or something. 
-<div class="link"><%= link_to "Remove User", :controller => "root_admin", :action => "list_users" %></div><br/>
-<div class="link"><%= link_to "Edit User's Forwarding List", :controller => "root_admin", :action => "list_mailinglists" %></div><br/>
-<div class="link"><%= link_to "Change User's Password", :controller => "root_admin", :action => "list_users" %></div><br/>
+<div class="link"><%= link_to "Remove User", :controller => "admin", :action => "list_users" %></div><br/>
+<div class="link"><%= link_to "Edit User's Forwarding List", :controller => "admin", :action => "list_mailinglists" %></div><br/>
+<div class="link"><%= link_to "Change User's Password", :controller => "admin", :action => "list_users" %></div><br/>
 <!-- End conditional links 
 -->
-<div class="link"><%= link_to "Back", :controller => "root_admin", :action => "show_address"%></div><br/>
+<div class="link"><%= link_to "Back", :controller => "admin", :action => "show_address"%></div><br/>
 <div class="link"><%= link_to "Logout", :controller => "account", :action => "logout"%></div>

data/app/views/navigation/_root_edit_mailinglist_module.rhtml

@@ -1,12 +1,12 @@
-<div class="link"><%= link_to "Remove This Mailing List", :controller => "root_admin", :action => "remove_mailinglist" %></div><br/>
+<div class="link"><%= link_to "Remove This Mailing List", :controller => "admin", :action => "remove_mailinglist" %></div><br/>
 
 <!-- Change these to link_to_if to establish condition that they are clickable only -->
 <!-- if a user is selected in the main panel. They should display regardless, but   -->
 <!-- be greyed out or something. -->
-<div class="link"><%= link_to "Add Address", :controller => "root_admin", :action => "add_address" %></div><br/>
-<div class="link"><%= link_to "Remove Address", :controller => "root_admin", :action => "remove_address" %></div><br/>
-<div class="link"><%= link_to "Edit Address", :controller => "root_admin", :action => "edit_address" %></div><br/>
+<div class="link"><%= link_to "Add Address", :controller => "admin", :action => "add_address" %></div><br/>
+<div class="link"><%= link_to "Remove Address", :controller => "admin", :action => "remove_address" %></div><br/>
+<div class="link"><%= link_to "Edit Address", :controller => "admin", :action => "edit_address" %></div><br/>
 <!-- End conditional links -->
 
-<div class="link"><%= link_to "Back", :controller => "root_admin", :action => "list_mailinglists"%></div><br/>
+<div class="link"><%= link_to "Back", :controller => "admin", :action => "list_mailinglists"%></div><br/>
 <div class="link"><%= link_to "Logout", :controller => "account", :action => "logout"%></div>

data/app/views/navigation/_root_edit_user_list_module.rhtml

@@ -1,3 +1,3 @@
 
-<div class="link"><%= link_to "Back", :controller => "root_admin", :action => "show_user"%></div><br/>
+<div class="link"><%= link_to "Back", :controller => "admin", :action => "show_user"%></div><br/>
 <div class="link"><%= link_to "Logout", :controller => "account", :action => "logout"%></div>

data/app/views/navigation/_root_edit_user_module.rhtml

@@ -1,10 +1,10 @@
 <!-- Change these to link_to_if to establish condition that they are clickable only -->
 <!-- if a user is selected in the main panel. They should display regardless, but   -->
 <!-- be greyed out or something. -->
-<div class="link"><%= link_to "Remove User", :controller => "root_admin", :action => "list_users" %></div><br/>
-<div class="link"><%= link_to "Edit User's Forwarding List", :controller => "root_admin", :action => "list_mailinglists" %></div><br/>
-<div class="link"><%= link_to "Change User's Password", :controller => "root_admin", :action => "list_users" %></div><br/>
+<div class="link"><%= link_to "Remove User", :controller => "admin", :action => "list_users" %></div><br/>
+<div class="link"><%= link_to "Edit User's Forwarding List", :controller => "admin", :action => "list_mailinglists" %></div><br/>
+<div class="link"><%= link_to "Change User's Password", :controller => "admin", :action => "list_users" %></div><br/>
 <!-- End conditional links -->
 
-<div class="link"><%= link_to "Back", :controller => "root_admin", :action => "list_users"%></div><br/>
+<div class="link"><%= link_to "Back", :controller => "admin", :action => "list_users"%></div><br/>
 <div class="link"><%= link_to "Logout", :controller => "account", :action => "logout"%></div>

data/app/views/navigation/_root_index_module.rhtml

@@ -1,4 +1,4 @@
-<div class="link"><%= link_to "Mailing Lists", :controller => "root_admin", :action => "list_mailinglists" %></div><br/>
-<div class="link"><%= link_to "Users", :controller => "root_admin", :action => "list_users" %></div><br/>
+<div class="link"><%= link_to "Mailing Lists", :controller => "admin", :action => "list_mailinglists" %></div><br/>
+<div class="link"><%= link_to "Users", :controller => "admin", :action => "list_users" %></div><br/>
 
 <div class="link"><%= link_to "Logout", :controller => "account", :action => "logout"%></div>

data/app/views/navigation/_root_list_addresses_module.rhtml

@@ -1,11 +1,11 @@
-<div class="link"><%= link_to "Add Address", :controller => "root_admin", :action => "add_address" %></div><br/>
+<div class="link"><%= link_to "Add Address", :controller => "admin", :action => "add_address" %></div><br/>
 
 <!-- Change these to link_to_if to establish condition that they are clickable only -->
 <!-- if a user is selected in the main panel. They should display regardless, but   -->
 <!-- be greyed out or something. -->
-<div class="link"><%= link_to "Remove Address", :controller => "root_admin", :action => "remove_address" %></div><br/>
-<div class="link"><%= link_to "Edit Address", :controller => "root_admin", :action => "edit_address" %></div><br/>
+<div class="link"><%= link_to "Remove Address", :controller => "admin", :action => "remove_address" %></div><br/>
+<div class="link"><%= link_to "Edit Address", :controller => "admin", :action => "edit_address" %></div><br/>
 <!-- End conditional links -->
 
-<div class="link"><%= link_to "Back", :controller => "root_admin", :action => "list_mailinglists"%></div><br/>
+<div class="link"><%= link_to "Back", :controller => "admin", :action => "list_mailinglists"%></div><br/>
 <div class="link"><%= link_to "Logout", :controller => "account", :action => "logout"%></div>

data/app/views/navigation/_root_list_mailinglists_module.rhtml

@@ -1,10 +1,10 @@
-<div class="link"><%= link_to "Add Mailing List", :controller => "root_admin", :action => "add_mailinglist" %></div><br/>
+<div class="link"><%= link_to "Add Mailing List", :controller => "admin", :action => "add_mailinglist" %></div><br/>
 
 <!-- Change these to link_to_if to establish condition that they are clickable only -->
 <!-- if a user is selected in the main panel. They should display regardless, but   -->
 <!-- be greyed out or something. -->
-<div class="link"><%= link_to "Remove Mailing List", :controller => "root_admin", :action => "remove_mailinglist" %></div><br/>
-<div class="link"><%= link_to "Edit Mailing List", :controller => "root_admin", :action => "edit_mailinglist" %></div><br/>
+<div class="link"><%= link_to "Remove Mailing List", :controller => "admin", :action => "remove_mailinglist" %></div><br/>
+<div class="link"><%= link_to "Edit Mailing List", :controller => "admin", :action => "edit_mailinglist" %></div><br/>
 <!-- End conditional links -->
 
 <div class="link"><%= link_to "Back", :controller => "account", :action => "welcome"%></div><br/>

data/app/views/navigation/_root_list_users_module.rhtml

@@ -1,11 +1,11 @@
-<div class="link"><%= link_to "Add User", :controller => "root_admin", :action => "add_user" %></div><br/>
+<div class="link"><%= link_to "Add User", :controller => "admin", :action => "add_user" %></div><br/>
 
 <!-- Change these to link_to_if to establish condition that they are clickable only -->
 <!-- if a user is selected in the main panel. They should display regardless, but   -->
 <!-- be greyed out or something. -->
-<div class="link"><%= link_to "Remove User", :controller => "root_admin", :action => "remove_user" %></div><br/>
-<div class="link"><%= link_to "Edit User's Forwarding List", :controller => "root_admin", :action => "edit_user_list" %></div><br/>
-<div class="link"><%= link_to "Change User's Password", :controller => "root_admin", :action => "change_user_password" %></div><br/>
+<div class="link"><%= link_to "Remove User", :controller => "admin", :action => "remove_user" %></div><br/>
+<div class="link"><%= link_to "Edit User's Forwarding List", :controller => "admin", :action => "edit_user_list" %></div><br/>
+<div class="link"><%= link_to "Change User's Password", :controller => "admin", :action => "change_user_password" %></div><br/>
 <!-- End conditional links -->
 
 <div class="link"><%= link_to "Back", :controller => "account", :action => "welcome"%></div><br/>

data/app/views/navigation/_root_remove_address_module.rhtml

@@ -1,11 +1,11 @@
-<% if false %><div class="link"><%= link_to "Add User", :controller => "root_admin", :action => "list_mailinglists" %></div><br/><% end %>
+<% if false %><div class="link"><%= link_to "Add User", :controller => "admin", :action => "list_mailinglists" %></div><br/><% end %>
 <% if false %><% end %>
 <% if false %><!-- Change these to link_to_if to establish condition that they are clickable only --><% end %>
 <% if false %><!-- if a user is selected in the main panel. They should display regardless, but   --><% end %>
 <% if false %><!-- be greyed out or something. --><% end %>
-<% if false %><div class="link"><%= link_to "Remove User", :controller => "root_admin", :action => "list_users" %></div><br/><% end %>
-<% if false %><div class="link"><%= link_to "Edit User's Forwarding List", :controller => "root_admin", :action => "list_mailinglists" %></div><br/><% end %>
-<% if false %><div class="link"><%= link_to "Change User's Password", :controller => "root_admin", :action => "list_users" %></div><br/><% end %>
+<% if false %><div class="link"><%= link_to "Remove User", :controller => "admin", :action => "list_users" %></div><br/><% end %>
+<% if false %><div class="link"><%= link_to "Edit User's Forwarding List", :controller => "admin", :action => "list_mailinglists" %></div><br/><% end %>
+<% if false %><div class="link"><%= link_to "Change User's Password", :controller => "admin", :action => "list_users" %></div><br/><% end %>
 <% if false %><!-- End conditional links --><% end %>
 <% if false %><% end %>
 <% if false %><div class="link"><%= link_to "Back", :controller => "account", :action => "welcome"%></div><br/><% end %>

data/app/views/navigation/_root_remove_mailinglist_module.rhtml

@@ -1,11 +1,11 @@
-<% if false %><div class="link"><%= link_to "Add User", :controller => "root_admin", :action => "list_mailinglists" %></div><br/><% end %>
+<% if false %><div class="link"><%= link_to "Add User", :controller => "admin", :action => "list_mailinglists" %></div><br/><% end %>
 <% if false %><% end %>
 <% if false %><!-- Change these to link_to_if to establish condition that they are clickable only --><% end %>
 <% if false %><!-- if a user is selected in the main panel. They should display regardless, but   --><% end %>
 <% if false %><!-- be greyed out or something. --><% end %>
-<% if false %><div class="link"><%= link_to "Remove User", :controller => "root_admin", :action => "list_users" %></div><br/><% end %>
-<% if false %><div class="link"><%= link_to "Edit User's Forwarding List", :controller => "root_admin", :action => "list_mailinglists" %></div><br/><% end %>
-<% if false %><div class="link"><%= link_to "Change User's Password", :controller => "root_admin", :action => "list_users" %></div><br/><% end %>
+<% if false %><div class="link"><%= link_to "Remove User", :controller => "admin", :action => "list_users" %></div><br/><% end %>
+<% if false %><div class="link"><%= link_to "Edit User's Forwarding List", :controller => "admin", :action => "list_mailinglists" %></div><br/><% end %>
+<% if false %><div class="link"><%= link_to "Change User's Password", :controller => "admin", :action => "list_users" %></div><br/><% end %>
 <% if false %><!-- End conditional links --><% end %>
 <% if false %><% end %>
 <% if false %><div class="link"><%= link_to "Back", :controller => "account", :action => "welcome"%></div><br/><% end %>