Skip to content

Commit

Permalink
updated message when adoption is completed
Browse files Browse the repository at this point in the history
  • Loading branch information
cheezy committed Aug 24, 2011
1 parent 9cb55c9 commit 3f73d1d
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 57 deletions.
2 changes: 1 addition & 1 deletion .rvmrc
@@ -1 +1 @@
rvm 1.9.2
rvm 1.9.2-p290
90 changes: 43 additions & 47 deletions Gemfile.lock
Expand Up @@ -28,63 +28,58 @@ GEM
activemodel (= 3.0.7)
activesupport (= 3.0.7)
activesupport (3.0.7)
arel (2.0.9)
arel (2.0.10)
builder (2.1.2)
capybara (0.4.1.2)
celerity (>= 0.7.9)
culerity (>= 0.2.4)
capybara (1.0.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (>= 0.0.27)
xpath (~> 0.1.3)
celerity (0.8.9)
childprocess (0.1.8)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
childprocess (0.2.1)
ffi (~> 1.0.6)
cucumber (0.10.2)
cucumber (1.0.2)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
gherkin (>= 2.3.5)
gherkin (~> 2.4.5)
json (>= 1.4.6)
term-ansicolor (>= 1.0.5)
cucumber-rails (0.4.1)
cucumber (>= 0.10.1)
nokogiri (>= 1.4.4)
rack-test (>= 0.5.7)
culerity (0.2.15)
cucumber-rails (1.0.2)
capybara (>= 1.0.0)
cucumber (~> 1.0.0)
nokogiri (>= 1.4.6)
database_cleaner (0.6.7)
diff-lcs (1.1.2)
erubis (2.6.6)
abstract (>= 1.0.0)
factory_girl (1.3.3)
factory_girl_rails (1.0.1)
factory_girl (~> 1.3)
factory_girl (2.0.4)
factory_girl_rails (1.1.0)
factory_girl (~> 2.0.0)
railties (>= 3.0.0)
ffi (1.0.7)
rake (>= 0.8.7)
gherkin (2.3.6)
ffi (1.0.9)
gherkin (2.4.15)
json (>= 1.4.6)
i18n (0.5.0)
jasmine (1.0.2.0)
jasmine (1.0.2.1)
json_pure (>= 1.4.3)
rack (>= 1.1)
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
jquery-rails (0.2.7)
rails (~> 3.0)
thor (~> 0.14.4)
json (1.5.1)
json_pure (1.5.1)
jquery-rails (1.0.13)
railties (~> 3.0)
thor (~> 0.14)
json (1.5.3)
json_pure (1.5.3)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
nokogiri (1.4.4)
polyglot (0.3.1)
rack (1.2.2)
nokogiri (1.5.0)
polyglot (0.3.2)
rack (1.2.3)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
Expand All @@ -102,35 +97,36 @@ GEM
activesupport (= 3.0.7)
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.8.7)
rspec (2.5.0)
rspec-core (~> 2.5.0)
rspec-expectations (~> 2.5.0)
rspec-mocks (~> 2.5.0)
rspec-core (2.5.1)
rspec-expectations (2.5.0)
rake (0.9.2)
rspec (2.6.0)
rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0)
rspec-mocks (~> 2.6.0)
rspec-core (2.6.4)
rspec-expectations (2.6.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.5.0)
rspec-rails (2.5.0)
rspec-mocks (2.6.0)
rspec-rails (2.6.1)
actionpack (~> 3.0)
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.5.0)
rspec (~> 2.6.0)
rubyzip (0.9.4)
selenium-webdriver (0.2.0)
childprocess (>= 0.1.7)
selenium-webdriver (2.5.0)
childprocess (>= 0.2.1)
ffi (>= 1.0.7)
json_pure
rubyzip
sqlite3 (1.3.3)
sqlite3 (1.3.4)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
term-ansicolor (1.0.5)
term-ansicolor (1.0.6)
thor (0.14.6)
treetop (1.4.9)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.27)
will_paginate (3.0.pre2)
tzinfo (0.3.29)
will_paginate (3.0.0)
xpath (0.1.4)
nokogiri (~> 1.3)

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/orders_controller.rb
Expand Up @@ -44,7 +44,7 @@ def create
if @order.save
Cart.destroy(session[:cart_id])
session[:cart_id] = nil
format.html { redirect_to(agency_url, :notice => 'Thank you for your order.') }
format.html { redirect_to(agency_url, :notice => 'Thank you for your adopting a puppy!') }
else
format.html { render :action => "new" }
end
Expand Down
8 changes: 0 additions & 8 deletions app/views/orders/_form.html.erb
Expand Up @@ -23,14 +23,6 @@
<%= f.label :email %>
<%= f.email_field :email, :size => 40 %>
</div>
<div class="field">
<%= f.label :has_children, "Do you have children?" %>
<%= f.check_box :has_children %>
</div>
<div class="field">
<%= f.label :has_other_pets, "Do you have other pets?" %>
<%= f.check_box :has_other_pets %>
</div>
<div class="field">
<%= f.label :pay_type %>
<%= f.select :pay_type, Order::PAYMENT_TYPES,
Expand Down
4 changes: 4 additions & 0 deletions public/stylesheets/puppies.css
@@ -1,5 +1,9 @@
/* Global styles */

#notice {
font-size: large;
}

#agency #notice {
color: #0e5c8b;
border: 2px solid #0e5c8b;
Expand Down

0 comments on commit 3f73d1d

Please sign in to comment.