0
@@ -18,7 +18,11 @@ class Admin::TemplatesController < Admin::BaseController
0
 
0
   def update
0
     render :update do |page|
0
-      page.call 'Flash.notice', 'Template updated successfully' if @tmpl.update_attributes(params[:template])
0
+      if @tmpl.update_attributes(params[:template])
0
+        page.call 'Flash.notice', 'Template updated successfully'
0
+      else
0
+        page.call 'Flash.error', "Save failed: #{@tmpl.errors.full_messages.to_sentence}"
0
+      end
0
     end
0
   end
0
 

0
@@ -1,16 +1,13 @@
0
 class Admin::UsersController < Admin::BaseController
0
+  before_filter :find_all_users, :only => [:index, :show, :new]
0
+  before_filter :find_user,      :only => [:show, :update]
0
   def index
0
-    @users = User.find_with_deleted :all, :order => 'login'
0
     @enabled, @disabled = @users.partition { |u| u.deleted_at.nil? }
0
     @users = @enabled + @disabled
0
   end
0
-
0
-  def show
0
-    @user = User.find_by_login params[:id]
0
-  end
0
   
0
   def new
0
-    @user = User.new
0
+    @user  = User.new
0
   end
0
 
0
   def create
0
@@ -25,13 +22,12 @@ class Admin::UsersController < Admin::BaseController
0
   end
0
 
0
   def update
0
-    @user = User.find_by_login params[:id]
0
-    if @user.update_attributes params[:user]
0
-      flash[:notice] = "Profile updated."
0
-      redirect_to :action => 'show', :id => @user
0
-    else
0
-      flash[:error] = "Save failed."
0
-      render :action => 'show'
0
+    render :update do |page|
0
+      if @user.update_attributes(params[:user])
0
+        page.call 'Flash.notice', 'Profile updated.'
0
+      else
0
+        page.call 'Flash.error', "Save failed: #{@user.errors.full_messages.to_sentence}"
0
+      end
0
     end
0
   end
0
 
0
@@ -46,4 +42,13 @@ class Admin::UsersController < Admin::BaseController
0
     @user.deleted_at = nil
0
     @user.save!
0
   end
0
+  
0
+  protected
0
+    def find_all_users
0
+      @users = User.find_with_deleted :all, :order => 'login'
0
+    end
0
+    
0
+    def find_user
0
+      @user = User.find_with_deleted params[:id]
0
+    end
0
 end

0
@@ -8,10 +8,6 @@ class User < UserAuth
0
     write_attribute :filters, [value].flatten.collect { |v| v.blank? ? nil : v.to_sym }.compact.uniq
0
   end
0
 
0
-  def to_param
0
-    login
0
-  end
0
-
0
   def to_liquid
0
     [:login, :email].inject({}) { |hsh, attr_name| hsh.merge attr_name.to_s => send(attr_name) }
0
   end

0
@@ -1,4 +1,4 @@
0
-<li id="<%= user.dom_id %>" class="clear<%= %( deleted) unless user.deleted_at.nil? %>">
0
+<li id="<%= user.dom_id %>" class="clear<%= %( deleted) unless user.deleted_at.nil? %><%= %( selected) if @user == user %>">
0
   <% if user.deleted_at.nil? -%>
0
     <%= avatar_for user %>
0
     <h3><%= link_to user.login, :action => 'show', :id => user %></h3>

0
@@ -1,3 +1,10 @@
0
-<% form_for :user, @user, :url => { :action => 'create' }, :html => { :multipart => true } do |f| -%>
0
+<% form_for :user, :url => { :action => 'create' } do |f| -%>
0
 <%= render :partial => 'form', :locals => { :f => f, :create  => true } %>
0
 <% end -%>
0
+
0
+<% content_for :sidebar do -%>
0
+<h3>Users</h3>
0
+<ul id="users">
0
+<%= render :partial => "user", :collection => @users %>
0
+</ul>
0
+<% end -%>
0
\ No newline at end of file

0
@@ -8,7 +8,13 @@
0
 <!-- /end action nav -->
0
 <% end %>
0
 
0
-<% form_for :user, @user, :url => { :action => 'update', :id => @user }, :html => { :multipart => true } do |f| -%>
0
+<% remote_form_for :user, :url => { :action => 'update', :id => @user }, :html => { :multipart => true } do |f| -%>
0
 <%= render :partial => 'form', :locals => { :f => f, :create => false } %>
0
 <% end -%>
0
 
0
+<% content_for :sidebar do -%>
0
+<h3>Users</h3>
0
+<ul id="users">
0
+<%= render :partial => "user", :collection => @users %>
0
+</ul>
0
+<% end -%>
0
\ No newline at end of file

0
@@ -174,6 +174,7 @@ var Flash = {
0
   // and show it on the screen.  This message will auto-hide 
0
   // after a specified amount of miliseconds
0
   error: function(message) {
0
+    new Effect.ScrollTo('flash-notice');
0
     $('flash-errors').innerHTML = '';
0
     $('flash-errors').innerHTML = "<ul>" + message + "</ul>";
0
     new Effect.Appear('flash-errors', {duration: 0.3});
0
@@ -182,6 +183,7 @@ var Flash = {
0
 
0
   // Notice-level messages.  See Messenger.error for full details.
0
   notice: function(message) {
0
+    new Effect.ScrollTo('flash-notice');
0
     $('flash-notice').innerHTML = '';
0
     $('flash-notice').innerHTML = "<li>" + message + "</li>";
0
     new Effect.Appear('flash-notice', {duration: 0.3});