<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>app/controllers/admin/admin_controller.rb</filename>
    </added>
    <added>
      <filename>app/controllers/admin/users_controller.rb</filename>
    </added>
    <added>
      <filename>app/views/admin/users/_form.html.erb</filename>
    </added>
    <added>
      <filename>app/views/admin/users/_user.html.erb</filename>
    </added>
    <added>
      <filename>app/views/layouts/admin.html.erb</filename>
    </added>
    <added>
      <filename>public/images/admin/icon_asc.gif</filename>
    </added>
    <added>
      <filename>public/images/admin/icon_desc.gif</filename>
    </added>
    <added>
      <filename>public/images/admin/icon_destroy.png</filename>
    </added>
    <added>
      <filename>public/images/admin/icon_edit.png</filename>
    </added>
    <added>
      <filename>public/images/admin/icon_export.png</filename>
    </added>
    <added>
      <filename>public/images/admin/icon_find.png</filename>
    </added>
    <added>
      <filename>public/images/admin/icon_import.png</filename>
    </added>
    <added>
      <filename>public/images/admin/icon_list.png</filename>
    </added>
    <added>
      <filename>public/images/admin/icon_new.png</filename>
    </added>
    <added>
      <filename>public/images/admin/icon_next.gif</filename>
    </added>
    <added>
      <filename>public/images/admin/icon_prev.gif</filename>
    </added>
    <added>
      <filename>public/images/admin/icon_show.png</filename>
    </added>
    <added>
      <filename>public/images/admin/icon_sort.png</filename>
    </added>
    <added>
      <filename>public/images/admin/indicator_medium.gif</filename>
    </added>
    <added>
      <filename>public/stylesheets/admin.css</filename>
    </added>
    <added>
      <filename>test/functional/users_controller_test.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,4 +1,4 @@
-== qadmin-demo
+= qadmin-demo
 
 qadmin-demo is an example rails app that showcases the power of the qadmin gem.
 </diff>
      <filename>README.rdoc</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,4 @@
 class AccountsController &lt; ApplicationController
-  # Be sure to include AuthenticationSystem in Application Controller instead
-  include AuthenticatedSystem
   
   # Protect these actions behind an admin login
   # before_filter :admin_required, :only =&gt; [:suspend, :unsuspend, :destroy, :purge]</diff>
      <filename>app/controllers/accounts_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,8 +1,6 @@
 # This controller handles the login/logout function of the site.  
 class SessionsController &lt; ApplicationController
-  # Be sure to include AuthenticationSystem in Application Controller instead
-  include AuthenticatedSystem
-
+  layout 'admin'
   # render new.rhtml
   def new
   end</diff>
      <filename>app/controllers/sessions_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -72,6 +72,10 @@ class User &lt; ActiveRecord::Base
   def full_name
     &quot;#{first_name} #{last_name}&quot;
   end
+  
+  def to_s
+    full_name
+  end
 
   protected
     </diff>
      <filename>app/models/user.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,16 +1,14 @@
 &lt;h1&gt;Log In&lt;/h1&gt;
 
 &lt;% form_tag session_path do -%&gt;
-&lt;p&gt;&lt;%= label_tag 'login' %&gt;&lt;br /&gt;
+&lt;p&gt;&lt;%= label_tag 'login' %&gt;
 &lt;%= text_field_tag 'login', @login %&gt;&lt;/p&gt;
 
-&lt;p&gt;&lt;%= label_tag 'password' %&gt;&lt;br/&gt;
+&lt;p&gt;&lt;%= label_tag 'password' %&gt;
 &lt;%= password_field_tag 'password', nil %&gt;&lt;/p&gt;
 
-&lt;!-- Uncomment this if you want this functionality
 &lt;p&gt;&lt;%= label_tag 'remember_me', 'Remember me' %&gt;
 &lt;%= check_box_tag 'remember_me', '1', @remember_me %&gt;&lt;/p&gt;
---&gt;
 
 &lt;p&gt;&lt;%= submit_tag 'Log in' %&gt;&lt;/p&gt;
 &lt;% end -%&gt;</diff>
      <filename>app/views/sessions/new.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -15,37 +15,13 @@ Rails::Initializer.run do |config|
   config.gem 'static_model', :version =&gt; '&gt;=0.2.0'
   config.gem 'fastercsv'
   config.gem 'will_paginate'
-  config.load_paths += %W[#{Rails.root}/app/mailers #{Rails.root}/app/observers]
+  config.load_paths += %W[
+                          #{Rails.root}/app/mailers
+                          #{Rails.root}/app/observers 
+                          #{Rails.root}/app/controllers/admin
+                          ]
   config.active_record.observers = :user_observer
-  # Settings in config/environments/* take precedence over those specified here.
-  # Application configuration should go into files in config/initializers
-  # -- all .rb files in that directory are automatically loaded.
 
-  # Add additional load paths for your own custom dirs
-  # config.load_paths += %W( #{RAILS_ROOT}/extras )
-
-  # Specify gems that this application depends on and have them installed with rake gems:install
-  # config.gem &quot;bj&quot;
-  # config.gem &quot;hpricot&quot;, :version =&gt; '0.6', :source =&gt; &quot;http://code.whytheluckystiff.net&quot;
-  # config.gem &quot;sqlite3-ruby&quot;, :lib =&gt; &quot;sqlite3&quot;
-  # config.gem &quot;aws-s3&quot;, :lib =&gt; &quot;aws/s3&quot;
-
-  # Only load the plugins named here, in the order given (default is alphabetical).
-  # :all can be used as a placeholder for all plugins not explicitly named
-  # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-  # Skip frameworks you're not going to use. To use Rails without a database,
-  # you must remove the Active Record framework.
-  # config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
-
-  # Activate observers that should always be running
-  # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-  # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-  # Run &quot;rake -D time&quot; for a list of tasks for finding time zone names.
   config.time_zone = 'UTC'
 
-  # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-  # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
-  # config.i18n.default_locale = :de
 end
\ No newline at end of file</diff>
      <filename>config/environment.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,9 @@
 ActionController::Routing::Routes.draw do |map|
+  
+  map.with_options :path_prefix =&gt; 'admin' do |admin|
+    admin.resources :users
+  end
+
   map.logout '/logout', :controller =&gt; 'sessions', :action =&gt; 'destroy'
   map.login '/login', :controller =&gt; 'sessions', :action =&gt; 'new'
   map.register '/register', :controller =&gt; 'accounts', :action =&gt; 'create'
@@ -7,45 +12,6 @@ ActionController::Routing::Routes.draw do |map|
 
   map.resource :session
 
-  # The priority is based upon order of creation: first created -&gt; highest priority.
-
-  # Sample of regular route:
-  #   map.connect 'products/:id', :controller =&gt; 'catalog', :action =&gt; 'view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  #   map.purchase 'products/:id/purchase', :controller =&gt; 'catalog', :action =&gt; 'purchase'
-  # This route can be invoked with purchase_url(:id =&gt; product.id)
-
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   map.resources :products
-
-  # Sample resource route with options:
-  #   map.resources :products, :member =&gt; { :short =&gt; :get, :toggle =&gt; :post }, :collection =&gt; { :sold =&gt; :get }
-
-  # Sample resource route with sub-resources:
-  #   map.resources :products, :has_many =&gt; [ :comments, :sales ], :has_one =&gt; :seller
-  
-  # Sample resource route with more complex sub-resources
-  #   map.resources :products do |products|
-  #     products.resources :comments
-  #     products.resources :sales, :collection =&gt; { :recent =&gt; :get }
-  #   end
-
-  # Sample resource route within a namespace:
-  #   map.namespace :admin do |admin|
-  #     # Directs /admin/products/* to Admin::ProductsController (app/controllers/admin/products_controller.rb)
-  #     admin.resources :products
-  #   end
-
-  # You can have the root of your site routed with map.root -- just remember to delete public/index.html.
-  # map.root :controller =&gt; &quot;welcome&quot;
-
-  # See how all your routes lay out with &quot;rake routes&quot;
-
-  # Install the default routes as the lowest priority.
-  # Note: These default routes make all actions in every controller accessible via GET requests. You should
-  # consider removing the them or commenting them out if you're using named routes and resources.
   map.connect ':controller/:action/:id'
   map.connect ':controller/:action/:id.:format'
 end</diff>
      <filename>config/routes.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>1be1141ddebf453e4e89ebba63270e7dc5535662</id>
    </parent>
  </parents>
  <author>
    <name>Aaron Quint</name>
    <email>aaron@quirkey.com</email>
  </author>
  <url>http://github.com/quirkey/qadmin-demo/commit/c7fdf8f26e9e563776d7cd206f4f7dbbe829d1bd</url>
  <id>c7fdf8f26e9e563776d7cd206f4f7dbbe829d1bd</id>
  <committed-date>2009-03-22T14:57:32-07:00</committed-date>
  <authored-date>2009-03-22T14:57:32-07:00</authored-date>
  <message>Generated qadmin for Users and added configuration so it sits in admin/</message>
  <tree>abcb34cefb74c3f10cb4c3b705c7567e5f27cc75</tree>
  <committer>
    <name>Aaron Quint</name>
    <email>aaron@quirkey.com</email>
  </committer>
</commit>
