muck-users 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

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

@@ -46,20 +46,31 @@ class Admin::Muck::RolesController < Admin::Muck::BaseController
       flash[:notice] = translate('muck.users.cant_delete_administrator_role')
       output_admin_messages
     else
-      @role.delete
-      render :update do |page|
-        page.remove @role.dom_id
+      success = @role.delete
+      flash[:notice] = translate('muck.users.role_not_deleted') if !success
+
+      respond_to do |format|
+        format.html do
+          flash[:notice] = translate('muck.users.role_deleted') if success
+          redirect_to admin_roles_path
+        end
+        format.xml  { head :ok }
+        format.js do
+          if success
+            render :js => 'admin/roles/destroy'
+          else
+            output_admin_messages
+          end
+        end
       end
+
     end
   end
 
   protected
     
     def ajax_update_roles
-      render :update do |page|
-        page.replace_html 'current-roles', :partial => 'admin/roles/role', :collection => Role.by_alpha
-        page << "jQuery('.dialog').dialog('close');"
-      end
+      render :template => 'admin/roles/ajax_update_roles'
     end
     
 end

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

@@ -125,7 +125,7 @@ class Admin::Muck::UsersController < Admin::Muck::BaseController
         redirect_to admin_users_path
       end
       format.xml  { head :ok }
-      format.js { render(:update){|page| page.visual_effect :fade, "#{@user.dom_id('row')}".to_sym} }
+      format.js { render :js => "#{}jQuery('##{@user.dom_id('row')}').fadeOut();" }
     end
   end
   
@@ -137,10 +137,7 @@ class Admin::Muck::UsersController < Admin::Muck::BaseController
 
     def update_permissions(user, message)
       flash[:notice] = message
-      render :update do |page|
-        page << "jQuery('.dialog').dialog('close');"
-        page.replace_html user.dom_id('permissions'), :partial => 'admin/permissions/permission', :collection => user.permissions, :locals => { :user => user }
-      end
+      render :template => 'admin/users/update_permissions', :layout => false
     end
       
     def update_activate(message)

data/app/controllers/muck/users_controller.rb

@@ -97,8 +97,8 @@ class Muck::UsersController < ApplicationController
       end
     end
     respond_to do |format|
-      format.html { render :text => result}
-      format.js { render :text => result}
+      format.html { render :text => result }
+      format.js { render :text => result }
     end
   end
 
@@ -120,7 +120,7 @@ class Muck::UsersController < ApplicationController
     end
     respond_to do |format|
       format.html { render :text => result }
-      format.js { render :text => result}
+      format.js { render :text => result }
     end
   end
 

data/app/views/admin/roles/ajax_update_roles.js.erb

@@ -0,0 +1,2 @@
+jQuery('#current-roles').html('<%=escape_javascript(render(:partial => 'admin/roles/role', :collection => Role.by_alpha))%>');
+jQuery('.dialog').dialog('close');

data/app/views/admin/roles/destroy.js.erb

@@ -0,0 +1,2 @@
+<%= hide_admin_messages %>
+jQuery('#<%=@role.dom_id%>').fadeOut();"

data/app/views/admin/users/update_permissions.js.erb

@@ -0,0 +1,2 @@
+jQuery('.dialog').dialog('close');
+jQuery('#<%= user.dom_id('permissions') %>').html('<%= escape_javascript(render(:partial => 'admin/permissions/permission', :collection => user.permissions, :locals => { :user => user })) %>');

data/app/views/users/_signup_form_javascript.html.erb

@@ -1,18 +1,3 @@
-<% content_for :javascript do -%>
-  jQuery("#user_login").blur(function(){
-    jQuery.post("is_login_available",{ user_login:jQuery(this).val() } ,function(data){
-    	jQuery("#username-availibility").html(data);    
-    }); 
-  });
-	jQuery("#user_login").keydown(function() { 
-		jQuery("#username-availibility").html(''); 
-	});
-	jQuery("#user_email").blur(function(){
-    jQuery.post("is_email_available",{ user_email:jQuery(this).val() } ,function(data){
-    	jQuery("#email-availibility").html(data);    
-    }); 
-  });
-	jQuery("#user_email").keydown(function() { 
-		jQuery("#email-availibility").html(''); 
-	});
+<% content_for :head do -%>
+  <%= javascript_include_tag 'muck-users' %>
 <% end -%>

data/locales/en.yml

@@ -51,9 +51,9 @@ en:
       select_new_password: Select a New Password
       access_code_delete_link: Delete Access Code
       request_access_code: Request Access Code
-      updated_permissions: Updated Permissions
       first_name: First Name
       forgot_username: Forgot Username
+      updated_permissions: Updated Permissions
       account_activated: Your account has been activated! You can now login.
       already_logged_in: You are already logged in and don't need to recover your password.
       email_invalid: Invalid email
@@ -116,11 +116,13 @@ en:
       add_permission_to_user: Add Permission to user {{user}}
       user_account_deleted: You have successfully deleted your account.
       sign_in: Sign In
+      role_deleted: Role Deleted
+      role_not_deleted: Role could not be deleted
       complete_profile: Complete Your Profile
       access_codes: Access Codes
+      access_code_delete_confirm: Are you sure you want to cancel this access code?
       expiration_date_tip: Enter the date upon which the access code will become invalid
       problem_editing_account: There was a problem updating your information.
-      access_code_delete_confirm: Are you sure you want to cancel this access code?
       navigation: 
         inactive_users: Inactive Users
         all_users: All Users

data/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   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-30}
+  s.date = %q{2010-02-01}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -46,6 +46,8 @@ Gem::Specification.new do |s|
      "app/views/admin/access_codes/show.html.erb",
      "app/views/admin/permissions/_permission.html.erb",
      "app/views/admin/roles/_role.html.erb",
+     "app/views/admin/roles/ajax_update_roles.js.erb",
+     "app/views/admin/roles/destroy.js.erb",
      "app/views/admin/roles/edit.html.erb",
      "app/views/admin/roles/index.html.erb",
      "app/views/admin/roles/new.html.erb",
@@ -63,6 +65,7 @@ Gem::Specification.new do |s|
      "app/views/admin/users/index.html.erb",
      "app/views/admin/users/permissions.html.erb",
      "app/views/admin/users/search.html.erb",
+     "app/views/admin/users/update_permissions.js.erb",
      "app/views/password_resets/edit.html.erb",
      "app/views/password_resets/new.html.erb",
      "app/views/user_mailer/access_code.text.html.erb",
@@ -674,6 +677,7 @@ Gem::Specification.new do |s|
      "public/images/admin/source/roles.png",
      "public/images/admin/user.gif",
      "public/images/profile_default.jpg",
+     "public/javascripts/muck-users.js",
      "rails/init.rb",
      "tasks/rails.rake",
      "test/rails_root/.gitignore",
@@ -688,7 +692,6 @@ Gem::Specification.new do |s|
      "test/rails_root/app/models/user.rb",
      "test/rails_root/app/models/user_session.rb",
      "test/rails_root/app/views/default/index.html.erb",
-     "test/rails_root/app/views/layouts/default.html.erb",
      "test/rails_root/config/amazon_s3.yml",
      "test/rails_root/config/boot.rb",
      "test/rails_root/config/database.yml",
@@ -1143,6 +1146,8 @@ Gem::Specification.new do |s|
      "test/rails_root/public/javascripts/jquery/jquery.swapimage.min.js",
      "test/rails_root/public/javascripts/jquery/jquery.tips.js",
      "test/rails_root/public/javascripts/jquery/jrails.js",
+     "test/rails_root/public/javascripts/muck-countries.js",
+     "test/rails_root/public/javascripts/muck-users.js",
      "test/rails_root/public/javascripts/muck.js",
      "test/rails_root/public/javascripts/muck_activities.js",
      "test/rails_root/public/javascripts/muck_time/en.js",
@@ -1188,6 +1193,7 @@ Gem::Specification.new do |s|
      "test/rails_root/public/stylesheets/blueprint/src/print.css",
      "test/rails_root/public/stylesheets/blueprint/src/reset.css",
      "test/rails_root/public/stylesheets/blueprint/src/typography.css",
+     "test/rails_root/public/stylesheets/default.css",
      "test/rails_root/public/stylesheets/jquery/cupertino/images/ui-bg_diagonals-small_0_aaaaaa_40x40.png",
      "test/rails_root/public/stylesheets/jquery/cupertino/images/ui-bg_diagonals-thick_15_444444_40x40.png",
      "test/rails_root/public/stylesheets/jquery/cupertino/images/ui-bg_glass_100_f0f0f0_1x400.png",

data/public/javascripts/muck-users.js

@@ -0,0 +1,18 @@
+jQuery(document).ready(function() {
+	jQuery("#user_login").blur(function(){
+	  jQuery.post("is_login_available",{ user_login:jQuery(this).val(), format:'js' },function(data){
+	    jQuery("#username-availibility").html(data);
+	  });
+	});
+	jQuery("#user_login").keydown(function() {
+	  jQuery("#username-availibility").html('');
+	});
+	jQuery("#user_email").blur(function(){
+	  jQuery.post("is_email_available",{ user_email:jQuery(this).val(), format:'js' },function(data){
+	    jQuery("#email-availibility").html(data);
+	  });
+	});
+	jQuery("#user_email").keydown(function() {
+	  jQuery("#email-availibility").html('');
+	});
+});

data/test/rails_root/app/controllers/application_controller.rb

@@ -2,6 +2,8 @@ class ApplicationController < ActionController::Base
   include SslRequirement
   helper :all
   protect_from_forgery
+  
+  layout 'default'
 
   protected
 

data/test/rails_root/config/environment.rb

@@ -19,9 +19,7 @@ Rails::Initializer.run do |config|
   config.gem "authlogic"
   config.gem "searchlogic"
   config.gem "bcrypt-ruby", :lib => "bcrypt"
-  config.gem 'jrails'
   config.gem "overlord"
   config.gem 'muck-engine', :lib => 'muck_engine'
   config.plugin_locators << TestGemLocator
-end
-
+end

data/test/rails_root/public/javascripts/muck-countries.js

@@ -0,0 +1,50 @@
+function setup_country(force_load){
+
+	var country_id = jQuery("#countries").val();
+	var state_id = jQuery("#states").val();
+
+	if (country_id == undefined){ 
+		return; 
+	}
+
+	if (country_id == '-1'){
+		jQuery("#states").val('-1');
+		jQuery("#counties").val('-1');
+	}
+
+	if (country_id == '-1' || country_id == ''){
+		jQuery("#states-container").hide();
+		jQuery("#counties-container").hide();
+		return;
+	}
+
+	if(force_load || state_id == '' || state_id == null || state_id == -1) {
+		jQuery.getJSON("/helper/load_states_for_country/" + country_id + ".js", function(data){
+			var options = '';
+			jQuery("#counties-container").hide();
+			jQuery('#states-container label').html(data.label);
+			states = data.states;
+			if(states.length > 0){
+				for (var i = 0; i < states.length; i++) {
+					var state_id = states[i].state.id;
+					if(state_id == undefined) { state_id = ''; }
+					options += '<option value="' + state_id + '">' + states[i].state.name + '</option>';
+				}
+				jQuery("#states-container").show();
+				jQuery("select#states").html(options);
+			} else {
+				jQuery("#states-container").hide();
+			}
+		});
+	}
+}
+
+jQuery(document).ready(function() {
+  jQuery("#countries-container select").change(function() {
+		setup_country(true);
+  });
+	if(jQuery("#states").val() == '' || jQuery("#states").val() == null) {
+		jQuery("#states-container").hide();
+	}
+	setup_country(false);
+});

data/test/rails_root/public/javascripts/muck-users.js

@@ -0,0 +1,18 @@
+jQuery(document).ready(function() {
+	jQuery("#user_login").blur(function(){
+	  jQuery.post("is_login_available",{ user_login:jQuery(this).val(), format:'js' },function(data){
+	    jQuery("#username-availibility").html(data);
+	  });
+	});
+	jQuery("#user_login").keydown(function() {
+	  jQuery("#username-availibility").html('');
+	});
+	jQuery("#user_email").blur(function(){
+	  jQuery.post("is_email_available",{ user_email:jQuery(this).val(), format:'js' },function(data){
+	    jQuery("#email-availibility").html(data);
+	  });
+	});
+	jQuery("#user_email").keydown(function() {
+	  jQuery("#email-availibility").html('');
+	});
+});

data/test/rails_root/public/javascripts/muck.js

@@ -8,88 +8,6 @@ jQuery(document).ajaxSend(function(event, request, settings) {
   	settings.data += (settings.data ? "&" : "") + "authenticity_token=" + encodeURIComponent(AUTH_TOKEN);
 });
 
-function setup_submit_delete(){
-	jQuery(".submit-delete").click(function() {
-		// if(!confirm("Are you sure?")){
-		// 	return false;
-		// }
-    jQuery(this).parents('.delete-container').fadeOut();
-    var form = jQuery(this).parents('form');
-    jQuery.post(form.attr('action') + '.json', form.serialize(),
-      function(data){
-        var json = eval('(' + data + ')');
-        if(!json.success){
-          jQuery.jGrowl.info(json.message);
-        }
-      });
-    return false;
-  });
-	jQuery(".submit-delete-js").click(function() {
-		// if(!confirm("Are you sure?")){
-		// 	return false;
-		// }
-    jQuery(this).parents('.delete-container').fadeOut();
-    var form = jQuery(this).parents('form');
-    jQuery.post(form.attr('action') + '.js', form.serialize(),
-      function(data){
-      });
-    return false;
-  });
-}
-
-function show_hide_obj (ary_objs_to_show, ary_objs_to_hide)
-{
- 	for (i=0;i<ary_objs_to_show.length;i++) {
- 		if (obj_to_show = document.getElementById(ary_objs_to_show[i])) obj_to_show.style.display="";
- 		if (tab = document.getElementById('anchor'+ary_objs_to_show[i])) tab.className = 'curTab';
- 	}
- 	for (i=0;i<ary_objs_to_hide.length;i++) {
- 		if (obj_to_hide = document.getElementById(ary_objs_to_hide[i])) obj_to_hide.style.display="none";
- 		if (tab = document.getElementById('anchor'+ary_objs_to_hide[i])) tab.className = '';
- 	}
-}
-
-function setup_country(force_load){
-
-	var country_id = jQuery("#countries").val();
-	var state_id = jQuery("#states").val();
-
-	if (country_id == undefined){ 
-		return; 
-	}
-
-	if (country_id == '-1'){
-		jQuery("#states").val('-1');
-		jQuery("#counties").val('-1');
-	}
-
-	if (country_id == '-1' || country_id == ''){
-		jQuery("#states-container").hide();
-		jQuery("#counties-container").hide();
-		return;
-	}
-
-	if(force_load || state_id == '' || state_id == null || state_id == -1) {
-		jQuery.getJSON("/helper/load_states_for_country/" + country_id + ".js", function(data){
-			var options = '';
-			jQuery("#counties-container").hide();
-			jQuery('#states-container label').html(data.label);
-			states = data.states;
-			if(states.length > 0){
-				for (var i = 0; i < states.length; i++) {
-					var state_id = states[i].state.id;
-					if(state_id == undefined) { state_id = ''; }
-					options += '<option value="' + state_id + '">' + states[i].state.name + '</option>';
-				}
-				jQuery("#states-container").show();
-				jQuery("select#states").html(options);
-			} else {
-				jQuery("#states-container").hide();
-			}
-		});
-	}
-}
-
 function apply_ajax_forms() {
   jQuery('form.ajax').ajaxForm({
     dataType: 'script',
@@ -133,21 +51,26 @@ jQuery(document).ready(function() {
     return false;
   });
 
-	jQuery("#global-login").focus(function() {
-		jQuery("#global-login").val("");
-	});
-	jQuery("#global-password").focus(function() {
-		jQuery("#global-password").val("");
-	});
-	jQuery("#quick-login-submit").click(function() {
-		jQuery("#quick-login").submit();
-	});
-	
-	jQuery("#countries-container select").change(function() {
-		setup_country(true);
+  jQuery(".submit-delete").live('click', function() {
+    jQuery(this).parents('.delete-container').fadeOut();
+    var form = jQuery(this).parents('form');
+    jQuery.post(form.attr('action') + '.json', form.serialize(),
+      function(data){
+        var json = eval('(' + data + ')');
+        if(!json.success){
+          jQuery.jGrowl.info(json.message);
+        }
+      });
+    return false;
+  });
+  
+  jQuery(".submit-delete-js").live('click', function() {
+    jQuery(this).parents('.delete-container').fadeOut();
+    var form = jQuery(this).parents('form');
+    jQuery.post(form.attr('action') + '.js', form.serialize(),
+      function(data){
+      });
+    return false;
   });
-	if(jQuery("#states").val() == '' || jQuery("#states").val() == null) {
-		jQuery("#states-container").hide();
-	}
-	setup_country(false);
+
 });

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

@@ -26,7 +26,9 @@ ul.admin-list li a{font-size:1.2em;}
 /* errors, message */
 .notify-box{font-size:1.2em;color:#555;width:100%}
 .error,.notice,.success {margin:0;}
-#errorExplanation{margin:0;padding:0;}
+#errorExplanation{margin:0;padding:.8em;width:97%;border:2px solid #ddd;background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;}
+#admin-messages{display:none;}
+
 /* tables */
 .adminTable{margin:5px 0 0 0;padding:0 0 40px 0px;width:980px;}
 .adminTable a{color:#000;text-decoration:none;font-weight:bold;}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Justin Ball
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-30 00:00:00 -07:00
+date: 2010-02-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,6 +102,8 @@ files:
 - app/views/admin/access_codes/show.html.erb
 - app/views/admin/permissions/_permission.html.erb
 - app/views/admin/roles/_role.html.erb
+- app/views/admin/roles/ajax_update_roles.js.erb
+- app/views/admin/roles/destroy.js.erb
 - app/views/admin/roles/edit.html.erb
 - app/views/admin/roles/index.html.erb
 - app/views/admin/roles/new.html.erb
@@ -119,6 +121,7 @@ files:
 - app/views/admin/users/index.html.erb
 - app/views/admin/users/permissions.html.erb
 - app/views/admin/users/search.html.erb
+- app/views/admin/users/update_permissions.js.erb
 - app/views/password_resets/edit.html.erb
 - app/views/password_resets/new.html.erb
 - app/views/user_mailer/access_code.text.html.erb
@@ -730,6 +733,7 @@ files:
 - public/images/admin/source/roles.png
 - public/images/admin/user.gif
 - public/images/profile_default.jpg
+- public/javascripts/muck-users.js
 - rails/init.rb
 - tasks/rails.rake
 - test/rails_root/.gitignore
@@ -744,7 +748,6 @@ files:
 - test/rails_root/app/models/user.rb
 - test/rails_root/app/models/user_session.rb
 - test/rails_root/app/views/default/index.html.erb
-- test/rails_root/app/views/layouts/default.html.erb
 - test/rails_root/config/amazon_s3.yml
 - test/rails_root/config/boot.rb
 - test/rails_root/config/database.yml
@@ -1199,6 +1202,8 @@ files:
 - test/rails_root/public/javascripts/jquery/jquery.swapimage.min.js
 - test/rails_root/public/javascripts/jquery/jquery.tips.js
 - test/rails_root/public/javascripts/jquery/jrails.js
+- test/rails_root/public/javascripts/muck-countries.js
+- test/rails_root/public/javascripts/muck-users.js
 - test/rails_root/public/javascripts/muck.js
 - test/rails_root/public/javascripts/muck_activities.js
 - test/rails_root/public/javascripts/muck_time/en.js
@@ -1244,6 +1249,7 @@ files:
 - test/rails_root/public/stylesheets/blueprint/src/print.css
 - test/rails_root/public/stylesheets/blueprint/src/reset.css
 - test/rails_root/public/stylesheets/blueprint/src/typography.css
+- test/rails_root/public/stylesheets/default.css
 - test/rails_root/public/stylesheets/jquery/cupertino/images/ui-bg_diagonals-small_0_aaaaaa_40x40.png
 - test/rails_root/public/stylesheets/jquery/cupertino/images/ui-bg_diagonals-thick_15_444444_40x40.png
 - test/rails_root/public/stylesheets/jquery/cupertino/images/ui-bg_glass_100_f0f0f0_1x400.png

data/test/rails_root/app/views/layouts/default.html.erb

@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-	<head>
-	  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <title>home</title>
-    <%= stylesheet_link_tag 'application', :cache=>true -%>
-    <%= javascript_include_tag 'application' -%>
-    <%= javascript_tag %[const AUTH_TOKEN = #{form_authenticity_token.inspect};] if protect_against_forgery? -%>
-    <%= yield :head -%>
-    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
-  </head>
-  <body>
-    <div id="header">
-		  <div id="top-navigation">
-      </div>
-      <div class="clear"></div>
-    </div>
-    <div id="main">
-      <div id="content">
-			<%= yield %>
-		</div>
-    </div>
-    <div id="footer">
-    </div>
-  </body>
-</html>