muck-users 0.2.20 → 0.2.21

data/VERSION

@@ -1 +1 @@
-0.2.20
+0.2.21

data/app/controllers/admin/muck/users_controller.rb

@@ -2,6 +2,7 @@ class Admin::Muck::UsersController < Admin::Muck::BaseController
   unloadable
     
   before_filter :get_user, :only => [:update, :destroy]
+  before_filter :setup_subnavigation
   
   def index
     @user_count = User.count
@@ -115,8 +116,12 @@ class Admin::Muck::UsersController < Admin::Muck::BaseController
   
   private 
   
-  def get_user
-    @user = User.find(params[:id])
-  end
+    def get_user
+      @user = User.find(params[:id])
+    end
+  
+    def setup_subnavigation
+      @sub_navigation_path = 'admin/users/user_navigation'
+    end
   
 end

data/app/views/admin/users/_ajax_search_box.html.erb

@@ -1,6 +1,12 @@
-<div id="ajax_search_box" class="box" style="display: none;" >
+<div id="ajax_search_box" class="search-box" style="display: none;" >
   <% form_remote_tag :action => 'ajax_search', :url => '/admin/users/ajax_search', :update => "manage" do %>
     <%= text_field_tag :query, '', :class => 'span-5' %>
     <%= submit_tag t("muck.users.admin.search_users") %>
   <% end %>
 </div>
+<script type="text/javascript" language="JavaScript">
+jQuery(document).ready(function() {	
+ jQuery("#search_box").hide();
+ jQuery("#ajax_search_box").show();
+});
+</script>

data/app/views/admin/users/_dashboard_widget.html.erb

@@ -0,0 +1,4 @@
+<h2><%= translate('muck.users.users_admin') %></h2>
+<ul>
+  <li><%=translate('muck.users.total_users', :total => User.all.count) %></li>
+</ul>

data/app/views/admin/users/_search_box.html.erb

@@ -1,6 +1,6 @@
-<div id="search_box" class="box">
+<div id="search_box" class="search-box">
   <% form_tag :action => 'search' do %>
     <%= text_field_tag :query, '', :class => 'span-5' %>
     <%= submit_tag t("muck.users.admin.search_users") %>
   <% end %>
-</div>
+</div>

data/app/views/admin/users/_user_navigation.html.erb

@@ -1,11 +1,8 @@
-<% content_for :sidebar do -%>
+<div id="user-navigation" class="navigation">
+  <ul>
+    <li><%= link_to t("muck.users.navigation.all_users"), admin_users_path %></li>
+    <li><%= link_to t("muck.users.navigation.inactive_users"), inactive_admin_users_path %></li>
+  </ul>
   <%= render :partial => 'admin/users/search_box' -%>
   <%= render :partial => 'admin/users/ajax_search_box' -%>
-  <div id="user-navigation" class="box">
-    <ul>
-      <li><%= link_to t("muck.users.navigation.all_users"), admin_users_path %></li>
-      <li><%= link_to t("muck.users.navigation.inactive_users"), inactive_admin_users_path %></li>
-      <li><%= link_to t("muck.users.navigation.search_users"), search_admin_users_path %></li>
-    </ul>
-  </div>
-<% end -%>
+</div>

data/app/views/admin/users/do_search.html.erb

@@ -1,5 +1,2 @@
-<%= render :partial => 'admin/users/user_navigation' -%>
-
 <%= render :partial => 'admin/users/search_box' -%>
-
-<%= render :partial => 'admin/users/table' -%>
+<%= render :partial => 'admin/users/table' -%>

data/app/views/admin/users/inactive.html.erb

@@ -1,4 +1,3 @@
-<%= render :partial => 'admin/users/user_navigation' -%>
 <div>
   <h2><%= t('muck.users.admin.unactivated_users', :count => @user_inactive_count) %> 
 		<span class="link-button"><%= link_to t('muck.users.admin.activate_all_inactive_users'), activate_all_admin_users_path, :confirm => t('muck.users.admin.activate_all_inactive_users_confirm') %></span>

data/app/views/admin/users/inactive_emails.html.erb

@@ -1,4 +1,3 @@
-<%= render :partial => 'admin/users/user_navigation' -%>
 <div id="inactive-emails" class="activity_box">
   <h2><%= I18n.t("Inactive User's Emails (%{count} total)") % {:count => @user_inactive_count} %></h2>
 	<textarea id="user-emails"><%= @users.collect{|user| user.email}.join(', ') -%></textarea>

data/app/views/admin/users/index.html.erb

@@ -1,12 +1,4 @@
-<%= render :partial => 'admin/users/user_navigation' -%>
 <div>
   <h2><%= t('muck.users.admin_users_title') %></h2>
-	<%= render :partial => 'admin/users/table' -%>
-</div>
-
-<script type="text/javascript" language="JavaScript">
-jQuery(document).ready(function() {	
-	jQuery("#search_box").hide();
- jQuery("#ajax_search_box").show();
-});
-</script>
+  <%= render :partial => 'admin/users/table' -%>
+</div>

data/app/views/admin/users/search.html.erb

@@ -1,5 +1 @@
-<%= render :partial => 'admin/users/user_navigation' -%>
-
-<%= render :partial => 'admin/users/search_box' -%>
-
-
+<%= render :partial => 'admin/users/search_box' -%>

data/lib/muck_users.rb

@@ -8,3 +8,9 @@ ActiveRecord::Base.class_eval { include MuckUsers::Exceptions }
 ActionController::Base.send :helper, MuckUsersHelper
 
 I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', 'locales', '*.{rb,yml}') ]
+
+# Add admin link for users and roles
+MuckEngine.add_muck_admin_nav_item(I18n.translate('muck.engine.admin_users'), '/admin/users', '/images/admin/user.gif') rescue nil
+
+# Add users to the dashboard
+MuckEngine.add_muck_dashboard_item('admin/users/dashboard_widget')

data/locales/en.yml

@@ -4,6 +4,7 @@ en:
     users: 
       password_reset_link_sent: Instructions to reset your password have been emailed to you. Please check your email.
       problem_creating_account: "There was a problem creating your account.  Please correct the following errors:"
+      users_admin: Users
       forgot_password: Forgot Password
       application_base_url_not_set: Please set application_base_url in global_config.yml
       what_is_the_email: What is the email address used to create your account?
@@ -55,6 +56,7 @@ en:
       username_available: Username available
       name: Name
       account_activated: Your account has been activated! You can now login.
+      total_users: "Total Users: {{total}}"
       request_username: Request Username
       navigation: 
         inactive_users: Inactive Users
@@ -64,12 +66,12 @@ en:
       email_available: Email available
       welcome: Welcome
       username_recover_prompt: Please provide the email that you used when you created your account, your username will be emailed to you.
+      user_successfully_deleted: User {{login}} was successfully deleted.
       update_profile: Update your profile
       request_username_subject: Forgotten username
       forgot_username: Forgot Username
       email_help: Please use a valid, current e-mail address. We will never share or spam your e-mail address.
       access_denied: You don't have permission to access the requested page.
-      user_successfully_deleted: User {{login}} was successfully deleted.
       username_help: You can use between 6 and 20 characters. If the name you want isn't available try adding numbers or punctuation.
       sign_in_title: Sign In
       problem_changing_password: There was a problem changing your password. {{errors}}

data/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "0.2.20"
+  s.version = "0.2.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2010-01-06}
+  s.date = %q{2010-01-13}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
      "app/views/admin/roles/show.html.erb",
      "app/views/admin/users/_activate.html.erb",
      "app/views/admin/users/_ajax_search_box.html.erb",
+     "app/views/admin/users/_dashboard_widget.html.erb",
      "app/views/admin/users/_row.html.erb",
      "app/views/admin/users/_search_box.html.erb",
      "app/views/admin/users/_table.html.erb",
@@ -647,6 +648,10 @@ Gem::Specification.new do |s|
      "locales/zh-TW.yml",
      "locales/zh.yml",
      "muck-users.gemspec",
+     "public/images/admin/roles.gif",
+     "public/images/admin/source/User.png",
+     "public/images/admin/source/roles.png",
+     "public/images/admin/user.gif",
      "public/images/profile_default.jpg",
      "rails/init.rb",
      "tasks/rails.rake",
@@ -676,10 +681,10 @@ Gem::Specification.new do |s|
      "test/rails_root/config/routes.rb",
      "test/rails_root/db/.keep",
      "test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb",
+     "test/rails_root/db/migrate/20090327231918_create_users.rb",
      "test/rails_root/db/migrate/20090402234137_create_languages.rb",
      "test/rails_root/db/migrate/20090426041056_create_countries.rb",
      "test/rails_root/db/migrate/20090426041103_create_states.rb",
-     "test/rails_root/db/migrate/20090602041838_create_users.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
      "test/rails_root/features/support/env.rb",
      "test/rails_root/lib/tasks/muck.rake",
@@ -689,6 +694,11 @@ Gem::Specification.new do |s|
      "test/rails_root/public/500.html",
      "test/rails_root/public/dispatch.rb",
      "test/rails_root/public/favicon.ico",
+     "test/rails_root/public/images/admin/Home.gif",
+     "test/rails_root/public/images/admin/roles.gif",
+     "test/rails_root/public/images/admin/source/Home.png",
+     "test/rails_root/public/images/admin/source/User.png",
+     "test/rails_root/public/images/admin/user.gif",
      "test/rails_root/public/images/arrow_down.gif",
      "test/rails_root/public/images/arrow_left.gif",
      "test/rails_root/public/images/arrow_right.gif",
@@ -1118,6 +1128,7 @@ Gem::Specification.new do |s|
      "test/rails_root/public/robots.txt",
      "test/rails_root/public/stylesheets/.keep",
      "test/rails_root/public/stylesheets/admin.css",
+     "test/rails_root/public/stylesheets/application.css",
      "test/rails_root/public/stylesheets/blueprint/ie.css",
      "test/rails_root/public/stylesheets/blueprint/liquid_screen.css",
      "test/rails_root/public/stylesheets/blueprint/plugins/buttons/icons/cross.png",
@@ -1280,10 +1291,10 @@ Gem::Specification.new do |s|
      "test/rails_root/config/initializers/session_store.rb",
      "test/rails_root/config/routes.rb",
      "test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb",
+     "test/rails_root/db/migrate/20090327231918_create_users.rb",
      "test/rails_root/db/migrate/20090402234137_create_languages.rb",
      "test/rails_root/db/migrate/20090426041056_create_countries.rb",
      "test/rails_root/db/migrate/20090426041103_create_states.rb",
-     "test/rails_root/db/migrate/20090602041838_create_users.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
      "test/rails_root/features/support/env.rb",
      "test/rails_root/public/dispatch.rb",

data/rails/init.rb

@@ -29,4 +29,4 @@ else
 end
 
 require 'muck_users'
-require 'muck_users/initialize_routes'
+require 'muck_users/initialize_routes'

data/test/rails_root/db/migrate/{20090602041838_create_users.rb → 20090327231918_create_users.rb}

@@ -1,5 +1,4 @@
 class CreateUsers < ActiveRecord::Migration
-
   def self.up
     create_table :users, :force => true do |t|
       t.string   :login
@@ -8,29 +7,31 @@ class CreateUsers < ActiveRecord::Migration
       t.string   :last_name
       t.string   :crypted_password
       t.string   :password_salt
-      t.string   :persistence_token
-      t.string   :single_access_token
-      t.string   :perishable_token
+      t.string   :persistence_token,   :null => false
+      t.string   :single_access_token, :null => false
+      t.string   :perishable_token,    :null => false
       t.integer  :login_count,         :null => false, :default => 0
       t.integer  :failed_login_count,  :null => false, :default => 0
       t.datetime :last_request_at                                   
-      t.datetime :last_login_at 
       t.datetime :current_login_at                                  
+      t.datetime :last_login_at                                     
       t.string   :current_login_ip                                  
       t.string   :last_login_ip
-      t.boolean  :terms_of_service,   :default => false, :null => false
-      t.string   :time_zone,          :default => "UTC"
+      t.boolean  :terms_of_service,          :default => false, :null => false
+      t.string   :time_zone,                 :default => "UTC"
       t.datetime :disabled_at
+      t.datetime :created_at
       t.datetime :activated_at
-      t.timestamps
+      t.datetime :updated_at
+      t.string   :identity_url
+      t.string   :url_key
     end
 
     add_index :users, :login
     add_index :users, :email
     add_index :users, :persistence_token
-    add_index :users, :perishable_token
-    add_index :users, :single_access_token
     add_index :users, :last_request_at
+
   end
 
   def self.down

data/test/rails_root/lib/tasks/muck.rake

@@ -1,7 +1,7 @@
 namespace :muck do
   
   def muck_gems
-    ['babelphish', 'uploader', 'muck-engine']
+    ['babelphish', 'uploader', 'muck-engine', 'muck-users']
   end
   
 end

data/test/rails_root/public/stylesheets/admin.css

@@ -1,12 +1,19 @@
-/* main-navigation */
-#main-navigation{float:left;display:inline;}
-#account-navigation {float:right;display:inline;}
-
-.navigation ul{float:left;margin:4px 0;padding:2px;display:inline;}
-.navigation ul li{float:left;padding:0 4px 0 10px;list-style:none;font-weight:bold;}
+/* header */
+#main-navigation{}
+#account-navigation {}
+.navigation ul{padding:2px;margin:0;}
+.navigation ul li{list-style:none;font-weight:bold;display:inline-block;}
 .navigation ul li a{float:left;text-decoration:none;font-weight:bold;}
 .navigation ul li a:hover{text-decoration:underline;}
-
+#header{height:90px;border-bottom:solid 2px #333;}
+#admin-account{width:100%;float:right;}
+#admin-account ul{float:right;}
+#admin-account ul li{margin:1px;padding:0 4px;float:left;}
+#admin-nav li a{background-repeat:no-repeat;height:20px;margin:0 4px;padding-top:35px;text-align:center;width:40px;}
+#sub-header{width:100%;float:left;}
+/* dashboard widgets */
+.dashboard-widget{padding:5px;}
+.dashboard-widget h2{font-size:12px;border-bottom:solid 1px #555;}
 /* themes */
 #current-theme{clear:both;float:left;width:100%;}
 .theme-block{width:250px;height:300px;float:left;clear:none;margin:10px;}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  version: 0.2.20
+  version: 0.2.21
 platform: ruby
 authors: 
 - Justin Ball
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 -07:00
+date: 2010-01-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,6 +95,7 @@ files:
 - app/views/admin/roles/show.html.erb
 - app/views/admin/users/_activate.html.erb
 - app/views/admin/users/_ajax_search_box.html.erb
+- app/views/admin/users/_dashboard_widget.html.erb
 - app/views/admin/users/_row.html.erb
 - app/views/admin/users/_search_box.html.erb
 - app/views/admin/users/_table.html.erb
@@ -703,6 +704,10 @@ files:
 - locales/zh-TW.yml
 - locales/zh.yml
 - muck-users.gemspec
+- public/images/admin/roles.gif
+- public/images/admin/source/User.png
+- public/images/admin/source/roles.png
+- public/images/admin/user.gif
 - public/images/profile_default.jpg
 - rails/init.rb
 - tasks/rails.rake
@@ -732,10 +737,10 @@ files:
 - test/rails_root/config/routes.rb
 - test/rails_root/db/.keep
 - test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb
+- test/rails_root/db/migrate/20090327231918_create_users.rb
 - test/rails_root/db/migrate/20090402234137_create_languages.rb
 - test/rails_root/db/migrate/20090426041056_create_countries.rb
 - test/rails_root/db/migrate/20090426041103_create_states.rb
-- test/rails_root/db/migrate/20090602041838_create_users.rb
 - test/rails_root/features/step_definitions/webrat_steps.rb
 - test/rails_root/features/support/env.rb
 - test/rails_root/lib/tasks/muck.rake
@@ -745,6 +750,11 @@ files:
 - test/rails_root/public/500.html
 - test/rails_root/public/dispatch.rb
 - test/rails_root/public/favicon.ico
+- test/rails_root/public/images/admin/Home.gif
+- test/rails_root/public/images/admin/roles.gif
+- test/rails_root/public/images/admin/source/Home.png
+- test/rails_root/public/images/admin/source/User.png
+- test/rails_root/public/images/admin/user.gif
 - test/rails_root/public/images/arrow_down.gif
 - test/rails_root/public/images/arrow_left.gif
 - test/rails_root/public/images/arrow_right.gif
@@ -1174,6 +1184,7 @@ files:
 - test/rails_root/public/robots.txt
 - test/rails_root/public/stylesheets/.keep
 - test/rails_root/public/stylesheets/admin.css
+- test/rails_root/public/stylesheets/application.css
 - test/rails_root/public/stylesheets/blueprint/ie.css
 - test/rails_root/public/stylesheets/blueprint/liquid_screen.css
 - test/rails_root/public/stylesheets/blueprint/plugins/buttons/icons/cross.png
@@ -1357,10 +1368,10 @@ test_files:
 - test/rails_root/config/initializers/session_store.rb
 - test/rails_root/config/routes.rb
 - test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb
+- test/rails_root/db/migrate/20090327231918_create_users.rb
 - test/rails_root/db/migrate/20090402234137_create_languages.rb
 - test/rails_root/db/migrate/20090426041056_create_countries.rb
 - test/rails_root/db/migrate/20090426041103_create_states.rb
-- test/rails_root/db/migrate/20090602041838_create_users.rb
 - test/rails_root/features/step_definitions/webrat_steps.rb
 - test/rails_root/features/support/env.rb
 - test/rails_root/public/dispatch.rb