muck-friends 0.1.16 → 0.1.17

data/VERSION

@@ -1 +1 @@
-0.1.16
+0.1.17

data/app/controllers/muck/friends_controller.rb

@@ -45,9 +45,9 @@ class Muck::FriendsController < ApplicationController
     end
     
     if success
-      if params[:block] == true
+      if params[:block]
         message = t('muck.friends.blocked', :user => @target.display_name)
-      elsif params[:block] == false
+      elsif params[:unblock]
         message = t('muck.friends.unblocked', :user => @target.display_name)
       end
     else

data/muck-friends.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{muck-friends}
-  s.version = "0.1.16"
+  s.version = "0.1.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2009-11-13}
+  s.date = %q{2009-12-09}
   s.description = %q{Friend engine for the muck system.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -134,7 +134,6 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20090426041056_create_countries.rb",
      "test/rails_root/db/migrate/20090426041103_create_states.rb",
      "test/rails_root/db/migrate/20090512013727_create_profiles.rb",
-     "test/rails_root/db/migrate/20090602041838_create_users.rb",
      "test/rails_root/db/migrate/20090608073052_create_friends.rb",
      "test/rails_root/db/migrate/20090730044139_add_comment_cache.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
@@ -350,20 +349,25 @@ Gem::Specification.new do |s|
      "test/rails_root/config/environments/development.rb",
      "test/rails_root/config/environments/production.rb",
      "test/rails_root/config/environments/test.rb",
+     "test/rails_root/config/initializers/geokit_config.rb",
      "test/rails_root/config/initializers/inflections.rb",
      "test/rails_root/config/initializers/mime_types.rb",
      "test/rails_root/config/initializers/requires.rb",
      "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/20090402033319_add_muck_activities.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/20090512013727_create_profiles.rb",
-     "test/rails_root/db/migrate/20090602041838_create_users.rb",
      "test/rails_root/db/migrate/20090608073052_create_friends.rb",
      "test/rails_root/db/migrate/20090730044139_add_comment_cache.rb",
+     "test/rails_root/db/migrate/20090818204527_add_activity_indexes.rb",
+     "test/rails_root/db/migrate/20090819030523_add_attachable_to_activities.rb",
+     "test/rails_root/db/migrate/20091124203137_add_location_to_profiles.rb",
+     "test/rails_root/db/migrate/20091124205819_add_fields_to_profiles.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
      "test/rails_root/features/support/env.rb",
      "test/rails_root/features/support/paths.rb",
@@ -375,6 +379,31 @@ Gem::Specification.new do |s|
      "test/rails_root/test/unit/friend_mailer_test.rb",
      "test/rails_root/test/unit/friend_test.rb",
      "test/rails_root/test/unit/user_test.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/init.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/install.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/acts_as_mappable.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/adapters/abstract.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/adapters/mysql.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/adapters/postgresql.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/adapters/sqlserver.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/defaults.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/geocoder_control.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails/ip_geocode_lookup.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/lib/geokit-rails.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/acts_as_mappable_test.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/boot.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/ip_geocode_lookup_test.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/company.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/custom_location.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/location.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/mock_address.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/mock_family.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/mock_house.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/mock_organization.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/mock_person.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/models/store.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/schema.rb",
+     "test/rails_root/vendor/plugins/geokit-rails/test/test_helper.rb",
      "test/rails_root/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb",
      "test/rails_root/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb"
   ]
@@ -398,3 +427,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<muck-profiles>, [">= 0"])
   end
 end
+

data/test/rails_root/Rakefile

@@ -29,3 +29,11 @@ require 'muck_users/tasks'
 require 'muck_activities/tasks'
 require 'muck_friends/tasks'
 require 'muck_profiles/tasks'
+
+namespace :muck do
+  
+  def muck_gems
+    ['muck-engine', 'muck-users', 'muck-profiles', 'muck-activities', 'muck-friends']
+  end
+  
+end

data/test/rails_root/config/database.yml

@@ -1,17 +1,16 @@
 development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  timeout: 5000
-
-test: &TEST
-  adapter: sqlite3
-  database: db/test.sqlite3
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  timeout: 5000
-
+  adapter: mysql
+  database: muck_friends_development
+  username: root
+  password:
+  host: localhost
+  encoding: utf8
+test:
+  adapter: mysql
+  database: muck_friends_test
+  username: root
+  password:
+  host: localhost
+  encoding: utf8
 cucumber:
-  <<: *TEST
+  <<: *TEST

data/test/rails_root/config/environment.rb

@@ -17,8 +17,10 @@ Rails::Initializer.run do |config|
   config.time_zone = 'UTC'
   config.gem "will_paginate"
   config.gem "authlogic"
+  config.gem "geokit"
+  config.gem "sanitize"
   config.gem "bcrypt-ruby", :lib => "bcrypt"
-  config.gem 'thoughtbot-paperclip', :lib => 'paperclip', :source => "http://gems.github.com"
+  config.gem 'paperclip'
   config.gem 'muck-engine', :lib => 'muck_engine'
   config.gem 'muck-users', :lib => 'muck_users'
   config.gem 'muck-profiles', :lib => 'muck_profiles'

data/test/rails_root/config/initializers/geokit_config.rb

@@ -0,0 +1,63 @@
+require 'geokit'
+
+if defined? Geokit
+
+	# These defaults are used in Geokit::Mappable.distance_to and in acts_as_mappable
+	Geokit::default_units = :miles
+	Geokit::default_formula = :sphere
+
+	# This is the timeout value in seconds to be used for calls to the geocoder web
+	# services.  For no timeout at all, comment out the setting.  The timeout unit
+	# is in seconds. 
+	Geokit::Geocoders::request_timeout = 3
+
+	# These settings are used if web service calls must be routed through a proxy.
+	# These setting can be nil if not needed, otherwise, addr and port must be 
+	# filled in at a minimum.  If the proxy requires authentication, the username
+	# and password can be provided as well.
+	Geokit::Geocoders::proxy_addr = nil
+	Geokit::Geocoders::proxy_port = nil
+	Geokit::Geocoders::proxy_user = nil
+	Geokit::Geocoders::proxy_pass = nil
+
+	# This is your yahoo application key for the Yahoo Geocoder.
+	# See http://developer.yahoo.com/faq/index.html#appid
+	# and http://developer.yahoo.com/maps/rest/V1/geocode.html
+	Geokit::Geocoders::yahoo = 'REPLACE_WITH_YOUR_YAHOO_KEY'
+    
+	# This is your Google Maps geocoder key. 
+	# See http://www.google.com/apis/maps/signup.html
+	# and http://www.google.com/apis/maps/documentation/#Geocoding_Examples
+	Geokit::Geocoders::google = 'REPLACE_WITH_YOUR_GOOGLE_KEY'
+    
+	# This is your username and password for geocoder.us.
+	# To use the free service, the value can be set to nil or false.  For 
+	# usage tied to an account, the value should be set to username:password.
+	# See http://geocoder.us
+	# and http://geocoder.us/user/signup
+	Geokit::Geocoders::geocoder_us = false 
+
+	# This is your authorization key for geocoder.ca.
+	# To use the free service, the value can be set to nil or false.  For 
+	# usage tied to an account, set the value to the key obtained from
+	# Geocoder.ca.
+	# See http://geocoder.ca
+	# and http://geocoder.ca/?register=1
+	Geokit::Geocoders::geocoder_ca = false
+
+	# Uncomment to use a username with the Geonames geocoder
+	#Geokit::Geocoders::geonames="REPLACE_WITH_YOUR_GEONAMES_USERNAME"
+
+	# This is the order in which the geocoders are called in a failover scenario
+	# If you only want to use a single geocoder, put a single symbol in the array.
+	# Valid symbols are :google, :yahoo, :us, and :ca.
+	# Be aware that there are Terms of Use restrictions on how you can use the 
+	# various geocoders.  Make sure you read up on relevant Terms of Use for each
+	# geocoder you are going to use.
+	Geokit::Geocoders::provider_order = [:google,:us]
+
+	# The IP provider order. Valid symbols are :ip,:geo_plugin.
+	# As before, make sure you read up on relevant Terms of Use for each
+	# Geokit::Geocoders::ip_provider_order = [:geo_plugin,:ip]
+
+end

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/db/migrate/20090402234137_create_languages.rb

@@ -5,7 +5,7 @@ class CreateLanguages < ActiveRecord::Migration
       t.string :english_name
       t.string :locale
       t.boolean :supported, :default => true
-      t.integer :is_default, :default => false
+      t.boolean :is_default, :default => false
     end
     add_index :languages, :name
     add_index :languages, :locale

data/test/rails_root/db/migrate/20090818204527_add_activity_indexes.rb

@@ -0,0 +1,9 @@
+class AddActivityIndexes < ActiveRecord::Migration
+  def self.up
+    add_index :activities, ["source_id", "source_type"]
+  end
+
+  def self.down
+    remove_index :activities, ["source_id", "source_type"]
+  end
+end

data/test/rails_root/db/migrate/20090819030523_add_attachable_to_activities.rb

@@ -0,0 +1,13 @@
+class AddAttachableToActivities < ActiveRecord::Migration
+  def self.up
+    add_column :activities, :attachable_id, :integer
+    add_column :activities, :attachable_type, :string
+    add_index :activities, ["attachable_id", "attachable_type"]
+  end
+
+  def self.down
+    remove_column :activities, :attachable_id
+    remove_column :activities, :attachable_type
+    remove_index :activities, ["attachable_id", "attachable_type"]
+  end
+end

data/test/rails_root/db/migrate/20091124203137_add_location_to_profiles.rb

@@ -0,0 +1,15 @@
+class AddLocationToProfiles < ActiveRecord::Migration
+  def self.up
+    add_column :profiles, :location, :string
+    add_column :profiles, :lat, :decimal, :precision => 15, :scale => 10
+    add_column :profiles, :lng, :decimal, :precision => 15, :scale => 10
+    add_index  :profiles, [:lat, :lng]
+  end
+
+  def self.down
+    remove_index  :profiles, [:lat, :lng]
+    remove_column :profiles, :location
+    remove_column :profiles, :lat
+    remove_column :profiles, :lng
+  end
+end

data/test/rails_root/db/migrate/20091124205819_add_fields_to_profiles.rb

@@ -0,0 +1,21 @@
+class AddFieldsToProfiles < ActiveRecord::Migration
+  def self.up
+    add_column :profiles, :about, :text
+    add_column :profiles, :first_name, :string
+    add_column :profiles, :last_name, :string
+    add_column :profiles, :city, :string
+    add_column :profiles, :state_id, :integer
+    add_column :profiles, :country_id, :integer
+    add_column :profiles, :language_id, :integer
+  end
+
+  def self.down
+    remove_column :profiles, :about
+    remove_column :profiles, :first_name
+    remove_column :profiles, :last_name
+    remove_column :profiles, :city
+    remove_column :profiles, :state_id
+    remove_column :profiles, :country_id
+    remove_column :profiles, :language_id
+  end
+end

data/test/rails_root/public/javascripts/jquery/jquery.fancybox.js

@@ -1,9 +1,16 @@
 /*
- * FancyBox - simple and fancy jQuery plugin
- * Examples and documentation at: http://fancy.klade.lv/
- * Version: 1.2.1 (13/03/2009)
+ * FancyBox - jQuery Plugin
+ * simple and fancy lightbox alternative
+ *
  * Copyright (c) 2009 Janis Skarnelis
- * Licensed under the MIT License: http://en.wikipedia.org/wiki/MIT_License
+ * Examples and documentation at: http://fancybox.net
+ * 
+ * Version: 1.2.6 (16/11/2009)
  * Requires: jQuery v1.3+
-*/
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}(';(7($){$.b.2Q=7(){u B.2t(7(){9 1J=$(B).n(\'2Z\');5(1J.1c(/^3w\\(["\']?(.*\\.2p)["\']?\\)$/i)){1J=3t.$1;$(B).n({\'2Z\':\'45\',\'2o\':"3W:3R.4m.4d(3h=F, 3T="+($(B).n(\'41\')==\'2J-3Z\'?\'4c\':\'3N\')+", Q=\'"+1J+"\')"}).2t(7(){9 1b=$(B).n(\'1b\');5(1b!=\'2e\'&&1b!=\'2n\')$(B).n(\'1b\',\'2n\')})}})};9 A,4,16=D,s=1t 1o,1w,1v=1,1y=/\\.(3A|3Y|2p|3c|3d)(.*)?$/i;9 P=($.2q.3K&&2f($.2q.3z.2k(0,1))<8);$.b.c=7(Y){Y=$.3x({},$.b.c.2R,Y);9 2s=B;7 2h(){A=B;4=Y;2r();u D};7 2r(){5(16)u;5($.1O(4.2c)){4.2c()}4.j=[];4.h=0;5(Y.j.N>0){4.j=Y.j}t{9 O={};5(!A.1H||A.1H==\'\'){9 O={d:A.d,X:A.X};5($(A).1G("1m:1D").N){O.1a=$(A).1G("1m:1D")}4.j.2j(O)}t{9 Z=$(2s).2o("a[1H="+A.1H+"]");9 O={};3C(9 i=0;i<Z.N;i++){O={d:Z[i].d,X:Z[i].X};5($(Z[i]).1G("1m:1D").N){O.1a=$(Z[i]).1G("1m:1D")}4.j.2j(O)}3F(4.j[4.h].d!=A.d){4.h++}}}5(4.23){5(P){$(\'1U, 1Q, 1P\').n(\'1S\',\'3s\')}$("#1i").n(\'25\',4.2U).J()}1d()};7 1d(){$("#1f, #1e, #V, #G").S();9 d=4.j[4.h].d;5(d.1c(/#/)){9 U=11.3r.d.3f(\'#\')[0];U=d.3g(U,\'\');U=U.2k(U.2l(\'#\'));1k(\'<6 l="3e">\'+$(U).o()+\'</6>\',4.1I,4.1x)}t 5(d.1c(1y)){s=1t 1o;s.Q=d;5(s.3a){1K()}t{$.b.c.34();$(s).x().14(\'3b\',7(){$(".I").S();1K()})}}t 5(d.1c("17")||A.3j.2l("17")>=0){1k(\'<17 l="35" 3q="$.b.c.38()" 3o="3n\'+C.T(C.3l()*3m)+\'" 2K="0" 3E="0" Q="\'+d+\'"></17>\',4.1I,4.1x)}t{$.4p(d,7(2m){1k(\'<6 l="3L">\'+2m+\'</6>\',4.1I,4.1x)})}};7 1K(){5(4.30){9 w=$.b.c.1n();9 r=C.1M(C.1M(w[0]-36,s.g)/s.g,C.1M(w[1]-4b,s.f)/s.f);9 g=C.T(r*s.g);9 f=C.T(r*s.f)}t{9 g=s.g;9 f=s.f}1k(\'<1m 48="" l="49" Q="\'+s.Q+\'" />\',g,f)};7 2F(){5((4.j.N-1)>4.h){9 d=4.j[4.h+1].d;5(d.1c(1y)){1A=1t 1o();1A.Q=d}}5(4.h>0){9 d=4.j[4.h-1].d;5(d.1c(1y)){1A=1t 1o();1A.Q=d}}};7 1k(1j,g,f){16=F;9 L=4.2Y;5(P){$("#q")[0].1E.2u("f");$("#q")[0].1E.2u("g")}5(L>0){g+=L*2;f+=L*2;$("#q").n({\'v\':L+\'z\',\'2E\':L+\'z\',\'2i\':L+\'z\',\'y\':L+\'z\',\'g\':\'2B\',\'f\':\'2B\'});5(P){$("#q")[0].1E.2C(\'f\',\'(B.2D.4j - 20)\');$("#q")[0].1E.2C(\'g\',\'(B.2D.3S - 20)\')}}t{$("#q").n({\'v\':0,\'2E\':0,\'2i\':0,\'y\':0,\'g\':\'2z%\',\'f\':\'2z%\'})}5($("#k").1u(":19")&&g==$("#k").g()&&f==$("#k").f()){$("#q").1Z("2N",7(){$("#q").1C().1F($(1j)).21("1s",7(){1g()})});u}9 w=$.b.c.1n();9 2v=(g+36)>w[0]?w[2]:(w[2]+C.T((w[0]-g-36)/2));9 2w=(f+1z)>w[1]?w[3]:(w[3]+C.T((w[1]-f-1z)/2));9 K={\'y\':2v,\'v\':2w,\'g\':g+\'z\',\'f\':f+\'z\'};5($("#k").1u(":19")){$("#q").1Z("1s",7(){$("#q").1C();$("#k").24(K,4.2X,4.2T,7(){$("#q").1F($(1j)).21("1s",7(){1g()})})})}t{5(4.1W>0&&4.j[4.h].1a!==1L){$("#q").1C().1F($(1j));9 M=4.j[4.h].1a;9 15=$.b.c.1R(M);$("#k").n({\'y\':(15.y-18)+\'z\',\'v\':(15.v-18)+\'z\',\'g\':$(M).g(),\'f\':$(M).f()});5(4.1X){K.25=\'J\'}$("#k").24(K,4.1W,4.2W,7(){1g()})}t{$("#q").S().1C().1F($(1j)).J();$("#k").n(K).21("1s",7(){1g()})}}};7 2y(){5(4.h!=0){$("#1e, #2O").x().14("R",7(e){e.2x();4.h--;1d();u D});$("#1e").J()}5(4.h!=(4.j.N-1)){$("#1f, #2M").x().14("R",7(e){e.2x();4.h++;1d();u D});$("#1f").J()}};7 1g(){2y();2F();$(W).1B(7(e){5(e.29==27){$.b.c.1l();$(W).x("1B")}t 5(e.29==37&&4.h!=0){4.h--;1d();$(W).x("1B")}t 5(e.29==39&&4.h!=(4.j.N-1)){4.h++;1d();$(W).x("1B")}});5(4.1r){$(11).14("1N 1T",$.b.c.2g)}t{$("6#k").n("1b","2e")}5(4.2b){$("#22").R($.b.c.1l)}$("#1i, #V").14("R",$.b.c.1l);$("#V").J();5(4.j[4.h].X!==1L&&4.j[4.h].X.N>0){$(\'#G 6\').o(4.j[4.h].X);$(\'#G\').J()}5(4.23&&P){$(\'1U, 1Q, 1P\',$(\'#q\')).n(\'1S\',\'19\')}5($.1O(4.2a)){4.2a()}16=D};u B.x(\'R\').R(2h)};$.b.c.2g=7(){9 m=$.b.c.1n();$("#k").n(\'y\',(($("#k").g()+36)>m[0]?m[2]:m[2]+C.T((m[0]-$("#k").g()-36)/2)));$("#k").n(\'v\',(($("#k").f()+1z)>m[1]?m[3]:m[3]+C.T((m[1]-$("#k").f()-1z)/2)))};$.b.c.1h=7(H,2A){u 2f($.3I(H.3u?H[0]:H,2A,F))||0};$.b.c.1R=7(H){9 m=H.4g();m.v+=$.b.c.1h(H,\'3k\');m.v+=$.b.c.1h(H,\'3J\');m.y+=$.b.c.1h(H,\'3H\');m.y+=$.b.c.1h(H,\'3D\');u m};$.b.c.38=7(){$(".I").S();$("#35").J()};$.b.c.1n=7(){u[$(11).g(),$(11).f(),$(W).3i(),$(W).3p()]};$.b.c.2G=7(){5(!$("#I").1u(\':19\')){33(1w);u}$("#I > 6").n(\'v\',(1v*-40)+\'z\');1v=(1v+1)%12};$.b.c.34=7(){33(1w);9 m=$.b.c.1n();$("#I").n({\'y\':((m[0]-40)/2+m[2]),\'v\':((m[1]-40)/2+m[3])}).J();$("#I").14(\'R\',$.b.c.1l);1w=3Q($.b.c.2G,3X)};$.b.c.1l=7(){16=F;$(s).x();$("#1i, #V").x();5(4.2b){$("#22").x()}$("#V, .I, #1e, #1f, #G").S();5(4.1r){$(11).x("1N 1T")}1q=7(){$("#1i, #k").S();5(4.1r){$(11).x("1N 1T")}5(P){$(\'1U, 1Q, 1P\').n(\'1S\',\'19\')}5($.1O(4.1V)){4.1V()}16=D};5($("#k").1u(":19")!==D){5(4.26>0&&4.j[4.h].1a!==1L){9 M=4.j[4.h].1a;9 15=$.b.c.1R(M);9 K={\'y\':(15.y-18)+\'z\',\'v\':(15.v-18)+\'z\',\'g\':$(M).g(),\'f\':$(M).f()};5(4.1X){K.25=\'S\'}$("#k").31(D,F).24(K,4.26,4.2S,1q)}t{$("#k").31(D,F).1Z("2N",1q)}}t{1q()}u D};$.b.c.2V=7(){9 o=\'\';o+=\'<6 l="1i"></6>\';o+=\'<6 l="22">\';o+=\'<6 p="I" l="I"><6></6></6>\';o+=\'<6 l="k">\';o+=\'<6 l="2I">\';o+=\'<6 l="V"></6>\';o+=\'<6 l="E"><6 p="E 44"></6><6 p="E 43"></6><6 p="E 42"></6><6 p="E 3V"></6><6 p="E 3U"></6><6 p="E 3O"></6><6 p="E 3M"></6><6 p="E 3P"></6></6>\';o+=\'<a d="2P:;" l="1e"><1p p="1Y" l="2O"></1p></a><a d="2P:;" l="1f"><1p p="1Y" l="2M"></1p></a>\';o+=\'<6 l="q"></6>\';o+=\'<6 l="G"></6>\';o+=\'</6>\';o+=\'</6>\';o+=\'</6>\';$(o).2H("46");$(\'<32 4i="0" 4h="0" 4k="0"><2L><13 p="G" l="4l"></13><13 p="G" l="4o"><6></6></13><13 p="G" l="4n"></13></2L></32>\').2H(\'#G\');5(P){$("#2I").47(\'<17 p="4a" 4e="2J" 2K="0"></17>\');$("#V, .E, .G, .1Y").2Q()}};$.b.c.2R={2Y:10,30:F,1X:D,1W:0,26:0,2X:3G,2W:\'28\',2S:\'28\',2T:\'28\',1I:3B,1x:3v,23:F,2U:0.3,2b:F,1r:F,j:[],2c:2d,2a:2d,1V:2d};$(W).3y(7(){$.b.c.2V()})})(4f);',62,274,'||||opts|if|div|function||var||fn|fancybox|href||height|width|itemCurrent||itemArray|fancy_outer|id|pos|css|html|class|fancy_content||imagePreloader|else|return|top||unbind|left|px|elem|this|Math|false|fancy_bg|true|fancy_title|el|fancy_loading|show|itemOpts|pad|orig_item|length|item|isIE|src|click|hide|round|target|fancy_close|document|title|settings|subGroup||window||td|bind|orig_pos|busy|iframe||visible|orig|position|match|_change_item|fancy_left|fancy_right|_finish|getNumeric|fancy_overlay|value|_set_content|close|img|getViewport|Image|span|__cleanup|centerOnScroll|normal|new|is|loadingFrame|loadingTimer|frameHeight|imageRegExp|50|objNext|keydown|empty|first|style|append|children|rel|frameWidth|image|_proceed_image|undefined|min|resize|isFunction|select|object|getPosition|visibility|scroll|embed|callbackOnClose|zoomSpeedIn|zoomOpacity|fancy_ico|fadeOut||fadeIn|fancy_wrap|overlayShow|animate|opacity|zoomSpeedOut||swing|keyCode|callbackOnShow|hideOnContentClick|callbackOnStart|null|absolute|parseInt|scrollBox|_initialize|bottom|push|substr|indexOf|data|relative|filter|png|browser|_start|matchedGroup|each|removeExpression|itemLeft|itemTop|stopPropagation|_set_navigation|100|prop|auto|setExpression|parentNode|right|_preload_neighbor_images|animateLoading|appendTo|fancy_inner|no|frameborder|tr|fancy_right_ico|fast|fancy_left_ico|javascript|fixPNG|defaults|easingOut|easingChange|overlayOpacity|build|easingIn|zoomSpeedChange|padding|backgroundImage|imageScale|stop|table|clearInterval|showLoading|fancy_frame|||showIframe||complete|load|bmp|jpeg|fancy_div|split|replace|enabled|scrollLeft|className|paddingTop|random|1000|fancy_iframe|name|scrollTop|onload|location|hidden|RegExp|jquery|355|url|extend|ready|version|jpg|425|for|borderLeftWidth|hspace|while|300|paddingLeft|curCSS|borderTopWidth|msie|fancy_ajax|fancy_bg_w|scale|fancy_bg_sw|fancy_bg_nw|setInterval|DXImageTransform|clientWidth|sizingMethod|fancy_bg_s|fancy_bg_se|progid|66|gif|repeat||backgroundRepeat|fancy_bg_e|fancy_bg_ne|fancy_bg_n|none|body|prepend|alt|fancy_img|fancy_bigIframe|60|crop|AlphaImageLoader|scrolling|jQuery|offset|cellpadding|cellspacing|clientHeight|border|fancy_title_left|Microsoft|fancy_title_right|fancy_title_main|get'.split('|'),0,{}))
+ * 
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ */
+ 
+;eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}(';(p($){$.q.1Q=p(){J O.2n(p(){n b=$(O).u(\'2o\');8(b.1d(/^3i\\(["\']?(.*\\.2p)["\']?\\)$/i)){b=3j.$1;$(O).u({\'2o\':\'3k\',\'1e\':"3l:3m.3n.3o(3p=D, 3q="+($(O).u(\'3r\')==\'2q-3s\'?\'3t\':\'3u\')+", 13=\'"+b+"\')"}).2n(p(){n a=$(O).u(\'1u\');8(a!=\'2r\'&&a!=\'2s\')$(O).u(\'1u\',\'2s\')})}})};n l,4,1f=F,X=1v 1w,1x,1y=1,1z=/\\.(3v|3w|2p|3x|3y)(.*)?$/i;n m=1A,18=$.14.1g&&$.14.2t.1R(0,1)==6&&!19.3z,1S=18||($.14.1g&&$.14.2t.1R(0,1)==7);$.q.r=p(o){n j=$.2u({},$.q.r.2v,o);n k=O;p 2w(){l=O;4=$.2u({},j);2x();J F};p 2x(){8(1f)J;8($.1T(4.1U)){4.1U()}4.v=[];4.t=0;8(j.v.Y>0){4.v=j.v}C{n a={};8(!l.1B||l.1B==\'\'){n a={K:l.K,G:l.G};8($(l).1C("1l:1D").Y){a.S=$(l).1C("1l:1D")}C{a.S=$(l)}8(a.G==\'\'||1V a.G==\'1m\'){a.G=a.S.2y(\'1W\')}4.v.2z(a)}C{n b=$(k).1e("a[1B="+l.1B+"]");n a={};3A(n i=0;i<b.Y;i++){a={K:b[i].K,G:b[i].G};8($(b[i]).1C("1l:1D").Y){a.S=$(b[i]).1C("1l:1D")}C{a.S=$(b[i])}8(a.G==\'\'||1V a.G==\'1m\'){a.G=a.S.2y(\'1W\')}4.v.2z(a)}}}3B(4.v[4.t].K!=l.K){4.t++}8(4.1E){8(18){$(\'1X, 1Y, 1Z\').u(\'21\',\'3C\');$("#T").u(\'A\',$(U).A())}$("#T").u({\'3D-3E\':4.2A,\'22\':4.2B}).Z()}$(19).11("23.L 24.L",$.q.r.2C);1h()};p 1h(){$("#1n, #1o, #1i, #H").1a();n b=4.v[4.t].K;8(b.1d("1j")||l.3F.2D("1j")>=0){$.q.r.1F();1p(\'<1j s="2E" 3G="2F.q.r.2G()" 3H="3I\'+P.1b(P.3J()*3K)+\'" 2H="0" 3L="0" 13="\'+b+\'"></1j>\',4.1G,4.1H)}C 8(b.1d(/#/)){n c=19.3M.K.3N(\'#\')[0];c=b.3O(c,\'\');c=c.1R(c.2D(\'#\'));1p(\'<9 s="3P">\'+$(c).2I()+\'</9>\',4.1G,4.1H)}C 8(b.1d(1z)){X=1v 1w;X.13=b;8(X.3Q){25()}C{$.q.r.1F();$(X).Q().11(\'3R\',p(){$("#M").1a();25()})}}C{$.q.r.1F();$.3S(b,p(a){$("#M").1a();1p(\'<9 s="3T">\'+a+\'</9>\',4.1G,4.1H)})}};p 25(){n a=X.E;n b=X.A;n c=(4.N*2)+40;n d=(4.N*2)+26;n w=$.q.r.1q();8(4.2J&&(a>(w[0]-c)||b>(w[1]-d))){n e=P.28(P.28(w[0]-c,a)/a,P.28(w[1]-d,b)/b);a=P.1b(e*a);b=P.1b(e*b)}1p(\'<1l 1W="" s="3U" 13="\'+X.13+\'" />\',a,b)};p 2K(){8((4.v.Y-1)>4.t){n a=4.v[4.t+1].K||F;8(a&&a.1d(1z)){1I=1v 1w();1I.13=a}}8(4.t>0){n a=4.v[4.t-1].K||F;8(a&&a.1d(1z)){1I=1v 1w();1I.13=a}}};p 1p(a,b,c){1f=D;n d=4.N;8(1S||m){$("#y")[0].15.2L("A");$("#y")[0].15.2L("E")}8(d>0){b+=d*2;c+=d*2;$("#y").u({\'z\':d+\'R\',\'2M\':d+\'R\',\'2N\':d+\'R\',\'B\':d+\'R\',\'E\':\'2O\',\'A\':\'2O\'});8(1S||m){$("#y")[0].15.2P(\'A\',\'(O.2Q.3V - \'+d*2+\')\');$("#y")[0].15.2P(\'E\',\'(O.2Q.3W - \'+d*2+\')\')}}C{$("#y").u({\'z\':0,\'2M\':0,\'2N\':0,\'B\':0,\'E\':\'2R%\',\'A\':\'2R%\'})}8($("#x").16(":V")&&b==$("#x").E()&&c==$("#x").A()){$("#y").1J(\'29\',p(){$("#y").1r().1K($(a)).2a("1L",p(){1s()})});J}n w=$.q.r.1q();n e=(c+26)>w[1]?w[3]:(w[3]+P.1b((w[1]-c-26)*0.5));n f=(b+40)>w[0]?w[2]:(w[2]+P.1b((w[0]-b-40)*0.5));n g={\'B\':f,\'z\':e,\'E\':b+\'R\',\'A\':c+\'R\'};8($("#x").16(":V")){$("#y").1J("1L",p(){$("#y").1r();$("#x").2b(g,4.2S,4.2T,p(){$("#y").1K($(a)).2a("1L",p(){1s()})})})}C{8(4.2c>0&&4.v[4.t].S!==1m){$("#y").1r().1K($(a));n h=4.v[4.t].S;n i=$.q.r.2d(h);$("#x").u({\'B\':(i.B-20-4.N)+\'R\',\'z\':(i.z-20-4.N)+\'R\',\'E\':$(h).E()+(4.N*2),\'A\':$(h).A()+(4.N*2)});8(4.2e){g.22=\'Z\'}$("#x").2b(g,4.2c,4.2U,p(){1s()})}C{$("#y").1a().1r().1K($(a)).Z();$("#x").u(g).2a("1L",p(){1s()})}}};p 2V(){8(4.t!==0){$("#1o, #2W").Q().11("17",p(e){e.2X();4.t--;1h();J F});$("#1o").Z()}8(4.t!=(4.v.Y-1)){$("#1n, #2Y").Q().11("17",p(e){e.2X();4.t++;1h();J F});$("#1n").Z()}};p 1s(){8($.14.1g){$("#y")[0].15.1M(\'1e\');$("#x")[0].15.1M(\'1e\')}2V();2K();$(U).11("1N.L",p(e){8(e.2f==27&&4.2Z){$.q.r.1c()}C 8(e.2f==37&&4.t!==0){$(U).Q("1N.L");4.t--;1h()}C 8(e.2f==39&&4.t!=(4.v.Y-1)){$(U).Q("1N.L");4.t++;1h()}});8(4.30){$("#y").17($.q.r.1c)}8(4.1E&&4.31){$("#T").11("17",$.q.r.1c)}8(4.33){$("#1i").11("17",$.q.r.1c).Z()}8(1V 4.v[4.t].G!==\'1m\'&&4.v[4.t].G.Y>0){n a=$("#x").1u();$(\'#H 9\').3X(4.v[4.t].G).2I();$(\'#H\').u({\'z\':a.z+$("#x").34()-32,\'B\':a.B+(($("#x").35()*0.5)-($(\'#H\').E()*0.5))}).Z()}8(4.1E&&18){$(\'1X, 1Y, 1Z\',$(\'#y\')).u(\'21\',\'V\')}8($.1T(4.2g)){4.2g(4.v[4.t])}8($.14.1g){$("#x")[0].15.1M(\'1e\');$("#y")[0].15.1M(\'1e\')}1f=F};J O.Q(\'17.L\').11(\'17.L\',2w)};$.q.r.2C=p(){n w=$.q.r.1q();8(4.2h&&$("#x").16(\':V\')){n a=$("#x").35();n b=$("#x").34();n c={\'z\':(b>w[1]?w[3]:w[3]+P.1b((w[1]-b)*0.5)),\'B\':(a>w[0]?w[2]:w[2]+P.1b((w[0]-a)*0.5))};$("#x").u(c);$(\'#H\').u({\'z\':c.z+b-32,\'B\':c.B+((a*0.5)-($(\'#H\').E()*0.5))})}8(18&&$("#T").16(\':V\')){$("#T").u({\'A\':$(U).A()})}8($("#M").16(\':V\')){$("#M").u({\'B\':((w[0]-40)*0.5+w[2]),\'z\':((w[1]-40)*0.5+w[3])})}};$.q.r.1t=p(a,b){J 3Y($.3Z(a.41?a[0]:a,b,D))||0};$.q.r.2d=p(a){n b=a.42();b.z+=$.q.r.1t(a,\'43\');b.z+=$.q.r.1t(a,\'44\');b.B+=$.q.r.1t(a,\'45\');b.B+=$.q.r.1t(a,\'46\');J b};$.q.r.2G=p(){$("#M").1a();$("#2E").Z()};$.q.r.1q=p(){J[$(19).E(),$(19).A(),$(U).47(),$(U).48()]};$.q.r.36=p(){8(!$("#M").16(\':V\')){38(1x);J}$("#M > 9").u(\'z\',(1y*-40)+\'R\');1y=(1y+1)%12};$.q.r.1F=p(){38(1x);n w=$.q.r.1q();$("#M").u({\'B\':((w[0]-40)*0.5+w[2]),\'z\':((w[1]-40)*0.5+w[3])}).Z();$("#M").11(\'17\',$.q.r.1c);1x=49($.q.r.36,4a)};$.q.r.1c=p(){1f=D;$(X).Q();$(U).Q("1N.L");$(19).Q("23.L 24.L");$("#T, #y, #1i").Q();$("#1i, #M, #1o, #1n, #H").1a();1O=p(){8($("#T").16(\':V\')){$("#T").1J("29")}$("#y").1r();8(4.2h){$(19).Q("23.L 24.L")}8(18){$(\'1X, 1Y, 1Z\').u(\'21\',\'V\')}8($.1T(4.2i)){4.2i()}1f=F};8($("#x").16(":V")!==F){8(4.2j>0&&4.v[4.t].S!==1m){n a=4.v[4.t].S;n b=$.q.r.2d(a);n c={\'B\':(b.B-20-4.N)+\'R\',\'z\':(b.z-20-4.N)+\'R\',\'E\':$(a).E()+(4.N*2),\'A\':$(a).A()+(4.N*2)};8(4.2e){c.22=\'1a\'}$("#x").3a(F,D).2b(c,4.2j,4.3b,1O)}C{$("#x").3a(F,D).1J(\'29\',1O)}}C{1O()}J F};$.q.r.3c=p(){n a=\'\';a+=\'<9 s="T"></9>\';a+=\'<9 s="M"><9></9></9>\';a+=\'<9 s="x">\';a+=\'<9 s="3d">\';a+=\'<9 s="1i"></9>\';a+=\'<9 s="W"><9 I="W" s="4b"></9><9 I="W" s="4c"></9><9 I="W" s="4d"></9><9 I="W" s="4e"></9><9 I="W" s="4f"></9><9 I="W" s="4g"></9><9 I="W" s="4h"></9><9 I="W" s="4i"></9></9>\';a+=\'<a K="2k:;" s="1o"><1P I="2l" s="2W"></1P></a><a K="2k:;" s="1n"><1P I="2l" s="2Y"></1P></a>\';a+=\'<9 s="y"></9>\';a+=\'</9>\';a+=\'</9>\';a+=\'<9 s="H"></9>\';$(a).3e("4j");$(\'<3f 4k="0" 4l="0" 4m="0"><3g><1k I="H" s="4n"></1k><1k I="H" s="4o"><9></9></1k><1k I="H" s="4p"></1k></3g></3f>\').3e(\'#H\');8($.14.1g){$(".W").1Q()}8(18){$("9#T").u("1u","2r");$("#M 9, #1i, .H, .2l").1Q();$("#3d").4q(\'<1j s="3h" 13="2k:F;" 4r="2q" 2H="0"></1j>\');n b=$(\'#3h\')[0].4s.U;b.4t();b.1c()}};$.q.r.2v={N:10,2J:D,2e:D,2c:0,2j:0,2S:4u,2U:\'2m\',3b:\'2m\',2T:\'2m\',1G:4v,1H:4w,1E:D,2B:0.3,2A:\'#4x\',2Z:D,33:D,31:D,30:D,2h:D,v:[],1U:1A,2g:1A,2i:1A};$(U).4y(p(){m=$.14.1g&&!$.4z;8($("#x").Y<1){$.q.r.3c()}})})(2F);',62,284,'||||opts||||if|div||||||||||||||var||function|fn|fancybox|id|itemCurrent|css|itemArray||fancy_outer|fancy_content|top|height|left|else|true|width|false|title|fancy_title|class|return|href|fb|fancy_loading|padding|this|Math|unbind|px|orig|fancy_overlay|document|visible|fancy_bg|imagePreloader|length|show||bind||src|browser|style|is|click|IE6|window|hide|round|close|match|filter|busy|msie|_change_item|fancy_close|iframe|td|img|undefined|fancy_right|fancy_left|_set_content|getViewport|empty|_finish|getNumeric|position|new|Image|loadingTimer|loadingFrame|imageRegExp|null|rel|children|first|overlayShow|showLoading|frameWidth|frameHeight|objNext|fadeOut|append|normal|removeAttribute|keydown|__cleanup|span|fixPNG|substr|oldIE|isFunction|callbackOnStart|typeof|alt|embed|object|select||visibility|opacity|resize|scroll|_proceed_image|60||min|fast|fadeIn|animate|zoomSpeedIn|getPosition|zoomOpacity|keyCode|callbackOnShow|centerOnScroll|callbackOnClose|zoomSpeedOut|javascript|fancy_ico|swing|each|backgroundImage|png|no|absolute|relative|version|extend|defaults|_initialize|_start|attr|push|overlayColor|overlayOpacity|scrollBox|indexOf|fancy_frame|jQuery|showIframe|frameborder|html|imageScale|_preload_neighbor_images|removeExpression|right|bottom|auto|setExpression|parentNode|100|zoomSpeedChange|easingChange|easingIn|_set_navigation|fancy_left_ico|stopPropagation|fancy_right_ico|enableEscapeButton|hideOnContentClick|hideOnOverlayClick||showCloseButton|outerHeight|outerWidth|animateLoading||clearInterval||stop|easingOut|build|fancy_inner|appendTo|table|tr|fancy_bigIframe|url|RegExp|none|progid|DXImageTransform|Microsoft|AlphaImageLoader|enabled|sizingMethod|backgroundRepeat|repeat|crop|scale|jpg|gif|bmp|jpeg|XMLHttpRequest|for|while|hidden|background|color|className|onload|name|fancy_iframe|random|1000|hspace|location|split|replace|fancy_div|complete|load|get|fancy_ajax|fancy_img|clientHeight|clientWidth|text|parseInt|curCSS||jquery|offset|paddingTop|borderTopWidth|paddingLeft|borderLeftWidth|scrollLeft|scrollTop|setInterval|66|fancy_bg_n|fancy_bg_ne|fancy_bg_e|fancy_bg_se|fancy_bg_s|fancy_bg_sw|fancy_bg_w|fancy_bg_nw|body|cellspacing|cellpadding|border|fancy_title_left|fancy_title_main|fancy_title_right|prepend|scrolling|contentWindow|open|300|560|340|666|ready|boxModel'.split('|'),0,{}));

data/test/rails_root/public/javascripts/jquery/jquery.tips.js

@@ -1,16 +1,17 @@
 jQuery(document).ready(function() {
 	jQuery(".tip-field").focus(function() {
 		jQuery(".active").removeClass("active");
-		var tip_key = jQuery('#' + this.id).siblings('#tip-key');
+		var tip_key = jQuery('#' + this.id).siblings('.tip-key');
 		var control_id = this.id;
 		var help_id = this.id;
+		var field = jQuery('#' + this.id);
 		if (tip_key.length > 0){
 			control_id = tip_key.html();
-			help_id = jQuery('#' + this.id).siblings('#tip-id').html();
-		}		
-		var tip_text = jQuery('#' + help_id + "-help").html();
-		var tip_title = jQuery('#' + help_id + "-help-title").html();
-		var tip_position = jQuery('#' + help_id + "-help-position").html();
+			help_id = field.siblings('.tip-id').html();
+		}
+		var tip_text = field.siblings('.tip-text').html();
+		var tip_title = field.siblings('.tip-title').html();
+		var tip_position = field.siblings('.tip-position').html();
 		if (!tip_position) { tip_position = 'right'; }
 		show_tip(control_id, tip_title, tip_text, tip_position);
 		jQuery("#" + help_id + "-container").addClass("active");

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

@@ -51,6 +51,47 @@ function show_hide_obj (ary_objs_to_show, ary_objs_to_hide)
  	}
 }
 
+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.jGrowl.defaults.position = 'center';
 
 jQuery.jGrowl.info = function(msg){
@@ -69,12 +110,18 @@ jQuery(document).ready(function() {
 	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);
+  });
+	if(jQuery("#states").val() == '' || jQuery("#states").val() == null) {
+		jQuery("#states-container").hide();
+	}
+	setup_country(false);
 });