0
@@ -1,6 +1,16 @@
0
-<li id="<%= user.dom_id %>" class="clear<%= %( deleted) unless user.deleted_at.nil? %><%= %( selected) if @user == user %>">
0
+<li id="<%= user.dom_id %>" class="clear<%= %( deleted) unless user.deleted_at.nil? %><%= %( selected) if @user == user %>" fsdfa>
0
     <%= avatar_for user %>
0
     <h3><%= link_to user.login, :action => 'show', :id => user %></h3>
0
     <%= user.email %>
0
-<%= render :partial => "toggles", :locals => { :user => user } %>
0
+  <% unless user == current_user -%>
0
+    <p>
0
+      <%= check_box_tag user.dom_id(:user_toggle), user.id,  user.deleted_at.nil?, :onclick => "UserForm.toggle(this);" %>
0
+      <strong><label for="<%= user.dom_id(:user_toggle) %>">Allow this user to login</label></strong>
0
+    <% if !user.admin? && admin? -%> |
0
+      <%= check_box_tag user.dom_id(:user_toggle_admin), user.id,  user.site_admin?, :onclick => "UserForm.toggleAdmin(this);" %>
0
+      <strong><label for="<%= user.dom_id(:user_toggle_admin) %>">Site admin?</label></strong>
0
+    <% end -%>
0
+      <%= image_tag 'mephisto/progress.gif', :size => '10x10', :style => 'display:none', :id => "#{user.dom_id}-progress" %>
0
+    </p>
0
+  <% end -%>
0
 </li>
0
\ No newline at end of file

0
@@ -2,6 +2,7 @@ page.call 'Flash.notice', "#{@user.login} was disabled."
0
 page["#{@user.dom_id}-progress"].hide
0
 page << 'function foo() {'
0
 page[@user.dom_id].remove
0
-page.insert_html :bottom, :disabled_users, :partial => 'disabled', :locals => { :user => @user }
0
+page[:disabled_users].show
0
+page.insert_html :bottom, :disabled_users, :partial => 'user'
0
 page << '}'
0
 page[@user.dom_id].visual_effect :drop_out, :afterFinish => ActiveSupport::JSON::Variable.new("foo")
0
\ No newline at end of file

0
@@ -12,13 +12,7 @@
0
 <%= render :partial => "user", :collection => @enabled %>
0
 </ul>
0
 
0
-<% content_for :sidebar do -%>
0
-  <div class="sgroup">
0
-    <h3>Disabled Users</h3>
0
-    <ul class="slist" id="disabled_users">
0
-      <% @disabled.each do |user| -%>
0
-<%= render :partial => "disabled", :locals => { :user => user } %>
0
-      <% end -%>
0
-    </ul>
0
-  </div>
0
-<% end -%>
0
\ No newline at end of file
0
+<h3><a href="#" id="disabled_users_trigger">Disabled Users</a></h3>
0
+<ul id="disabled_users" style="display:none">
0
+<%= render :partial => "user", :collection => @disabled %>
0
+</ul>

0
@@ -522,6 +522,7 @@ Event.addBehavior({
0
   '#reset_password_link:click,#reset_password_cancel:click': function() { Effect.toggle('reset_password', 'blind'); },
0
   '#asset-add-file:click': function() { return Asset.addInput(); },
0
   '#sec-options-trigger:click': function() { $('sec-options').toggle(); },
0
+  '#disabled_users_trigger:click': function() { $('disabled_users').toggle(); },
0
   '#tagsall:click': function() { 
0
     var inputs = $('new_asset').getInputs('text');
0
     var tags = $F(inputs.first()).split(',');

0
@@ -988,19 +988,20 @@ dl.sform {
0
  *=USERS
0
  */
0
 
0
-#users {
0
+#users, #disabled_users {
0
   list-style: none;
0
   margin-top: 20px;
0
   text-shadow: 2px 2px #fff;
0
 }
0
 
0
-#users li {
0
+#users li, #disabled_users li {
0
   background: #eee;
0
   margin: 0 0 10px 0;
0
   padding: 5px;
0
 }
0
 
0
-#users li .avatar {
0
+#users li .avatar,
0
+#disabled_users li .avatar {
0
   float: left;
0
   margin-right: 10px;
0
   max-height: 50px;