Skip to content
Browse files

checkpoint

  • Loading branch information...
1 parent 5495594 commit 963a4c0e07849d30023d277633720ce515d3db12 @tthomas48 committed Feb 11, 2013
Showing with 191 additions and 29 deletions.
  1. +2 −1 Gemfile
  2. +23 −22 Gemfile.lock
  3. +2 −0 app/assets/stylesheets/companies.css.scss
  4. +1 −1 app/models/admin.rb
  5. +1 −1 app/views/companies/contact.html.haml
  6. +12 −0 app/views/devise/confirmations/new.html.erb
  7. +5 −0 app/views/devise/mailer/confirmation_instructions.html.erb
  8. +8 −0 app/views/devise/mailer/reset_password_instructions.html.erb
  9. +7 −0 app/views/devise/mailer/unlock_instructions.html.erb
  10. +16 −0 app/views/devise/passwords/edit.html.erb
  11. +12 −0 app/views/devise/passwords/new.html.erb
  12. +25 −0 app/views/devise/registrations/edit.html.erb
  13. +18 −0 app/views/devise/registrations/new.html.erb
  14. +17 −0 app/views/devise/sessions/new.html.erb
  15. +25 −0 app/views/devise/shared/_links.erb
  16. +12 −0 app/views/devise/unlocks/new.html.erb
  17. +2 −2 app/views/layouts/application.html.haml
  18. BIN public/assets/application-2bfbe92bf6449f2834e9199e2da8a47a.css.gz
  19. BIN public/assets/application-583abf2dcac2cddf4ab42fa5bcd65569.js.gz
  20. +1 −0 public/assets/application-74c8734aff1e6521e4b28fcf4179b880.css
  21. BIN public/assets/application-74c8734aff1e6521e4b28fcf4179b880.css.gz
  22. +1 −1 public/assets/application.css
  23. BIN public/assets/application.css.gz
  24. BIN public/assets/application.js.gz
  25. +1 −1 public/assets/manifest.yml
  26. BIN vendor/cache/awesome_nested_fields-0.6.2.gem
  27. BIN vendor/cache/capistrano-2.14.2.gem
  28. BIN vendor/cache/cocaine-0.3.2.gem
  29. BIN vendor/cache/devise-2.2.3.gem
  30. BIN vendor/cache/jquery-rails-2.2.1.gem
  31. BIN vendor/cache/mime-types-1.21.gem
  32. BIN vendor/cache/net-scp-1.1.0.gem
  33. BIN vendor/cache/net-sftp-2.1.1.gem
  34. BIN vendor/cache/net-ssh-2.6.5.gem
  35. BIN vendor/cache/net-ssh-gateway-1.2.0.gem
  36. BIN vendor/cache/newrelic_rpm-3.5.6.46.gem
  37. BIN vendor/cache/paperclip-3.1.4.gem
  38. BIN vendor/cache/rack-1.3.10.gem
  39. BIN vendor/cache/rack-ssl-1.3.3.gem
  40. BIN vendor/cache/rdoc-3.12.1.gem
  41. BIN vendor/cache/sass-rails-3.1.7.gem
  42. BIN vendor/cache/whenever-0.8.2.gem
View
3 Gemfile
@@ -9,7 +9,8 @@ gem 'rails', '3.1.1'
gem 'mysql2'
gem 'haml'
gem 'execjs'
-gem 'paperclip'
+gem 'cocaine', '0.3.2'
+gem 'paperclip', "3.1.4"
gem 'bootstrap-sass'
gem 'awesome_nested_fields'
gem 'devise'
View
45 Gemfile.lock
@@ -31,20 +31,20 @@ GEM
multi_json (~> 1.0)
ansi (1.4.3)
arel (2.2.3)
- awesome_nested_fields (0.6.0)
+ awesome_nested_fields (0.6.2)
rails (>= 3.0.0)
bcrypt-ruby (3.0.1)
bootstrap-sass (2.2.2.0)
sass (~> 3.2)
builder (3.0.4)
- capistrano (2.13.5)
+ capistrano (2.14.2)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
chronic (0.9.0)
- cocaine (0.4.2)
+ cocaine (0.3.2)
coffee-rails (3.1.1)
coffee-script (>= 2.2.0)
railties (~> 3.1.0)
@@ -54,7 +54,7 @@ GEM
coffee-script-source (1.4.0)
curb (0.8.3)
daemons (1.1.9)
- devise (2.1.2)
+ devise (2.2.3)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
@@ -75,7 +75,7 @@ GEM
highline (1.6.15)
hike (1.2.1)
i18n (0.6.1)
- jquery-rails (2.1.4)
+ jquery-rails (2.2.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.6)
@@ -85,32 +85,32 @@ GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.19)
+ mime-types (1.21)
multi_json (1.5.0)
mysql2 (0.3.11)
- net-scp (1.0.4)
- net-ssh (>= 1.99.1)
- net-sftp (2.0.5)
- net-ssh (>= 2.0.9)
- net-ssh (2.6.2)
- net-ssh-gateway (1.1.0)
- net-ssh (>= 1.99.1)
- newrelic_rpm (3.5.4.34)
+ net-scp (1.1.0)
+ net-ssh (>= 2.6.5)
+ net-sftp (2.1.1)
+ net-ssh (>= 2.6.5)
+ net-ssh (2.6.5)
+ net-ssh-gateway (1.2.0)
+ net-ssh (>= 2.6.5)
+ newrelic_rpm (3.5.6.46)
nokogiri (1.5.6)
orm_adapter (0.4.0)
- paperclip (3.4.0)
+ paperclip (3.1.4)
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
- cocaine (~> 0.4.0)
+ cocaine (>= 0.0.2)
mime-types
polyglot (0.3.3)
- rack (1.3.6)
+ rack (1.3.10)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
- rack-ssl (1.3.2)
+ rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
@@ -130,10 +130,10 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (10.0.3)
- rdoc (3.12)
+ rdoc (3.12.1)
json (~> 1.4)
sass (3.2.5)
- sass-rails (3.1.6)
+ sass-rails (3.1.7)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
sass (>= 3.1.10)
@@ -161,7 +161,7 @@ GEM
multi_json (~> 1.0, >= 1.0.2)
warden (1.2.1)
rack (>= 1.0)
- whenever (0.8.1)
+ whenever (0.8.2)
activesupport (>= 2.3.4)
chronic (>= 0.6.3)
@@ -172,6 +172,7 @@ DEPENDENCIES
awesome_nested_fields
bootstrap-sass
capistrano
+ cocaine (= 0.3.2)
coffee-rails (~> 3.1.1)
devise
execjs
@@ -180,7 +181,7 @@ DEPENDENCIES
jquery-rails
mysql2
newrelic_rpm
- paperclip
+ paperclip (= 3.1.4)
rails (= 3.1.1)
sass-rails (~> 3.1.1)
thin
View
2 app/assets/stylesheets/companies.css.scss
@@ -128,6 +128,8 @@ tr {
.navbar-inverse {
background-color: #EEE;
color: #000;
+ margin-bottom: 0;
+ margin-top: 20px;
}
.main {
padding-bottom: 4em;
View
2 app/models/admin.rb
@@ -1,7 +1,7 @@
class Admin < ActiveRecord::Base
# Include default devise modules. Others available are:
# :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
- devise :database_authenticatable, :registerable,
+ devise :database_authenticatable,
:recoverable, :rememberable, :trackable, :validatable
# Setup accessible (or protected) attributes for your model
View
2 app/views/companies/contact.html.haml
@@ -22,7 +22,7 @@
= label_tag(:message, "Message")
.input
= text_area_tag(:message, "", {:placeholder => "Message to the Liason.", :required => true})
- .actionbar
+ .actionbar.btn-group
= submit_tag("Send Message", :class => "btn btn-primary")
= link_to 'Back', companies_path, :class => "btn btn-secondary"
View
12 app/views/devise/confirmations/new.html.erb
@@ -0,0 +1,12 @@
+<h2>Resend confirmation instructions</h2>
+
+<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
+ <%= devise_error_messages! %>
+
+ <div><%= f.label :email %><br />
+ <%= f.email_field :email %></div>
+
+ <div><%= f.submit "Resend confirmation instructions" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>
View
5 app/views/devise/mailer/confirmation_instructions.html.erb
@@ -0,0 +1,5 @@
+<p>Welcome <%= @resource.email %>!</p>
+
+<p>You can confirm your account email through the link below:</p>
+
+<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p>
View
8 app/views/devise/mailer/reset_password_instructions.html.erb
@@ -0,0 +1,8 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Someone has requested a link to change your password, and you can do this through the link below.</p>
+
+<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>
+
+<p>If you didn't request this, please ignore this email.</p>
+<p>Your password won't change until you access the link above and create a new one.</p>
View
7 app/views/devise/mailer/unlock_instructions.html.erb
@@ -0,0 +1,7 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p>
+
+<p>Click the link below to unlock your account:</p>
+
+<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p>
View
16 app/views/devise/passwords/edit.html.erb
@@ -0,0 +1,16 @@
+<h2>Change your password</h2>
+
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
+ <%= devise_error_messages! %>
+ <%= f.hidden_field :reset_password_token %>
+
+ <div><%= f.label :password, "New password" %><br />
+ <%= f.password_field :password %></div>
+
+ <div><%= f.label :password_confirmation, "Confirm new password" %><br />
+ <%= f.password_field :password_confirmation %></div>
+
+ <div><%= f.submit "Change my password" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>
View
12 app/views/devise/passwords/new.html.erb
@@ -0,0 +1,12 @@
+<h2>Forgot your password?</h2>
+
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
+ <%= devise_error_messages! %>
+
+ <div><%= f.label :email %><br />
+ <%= f.email_field :email %></div>
+
+ <div><%= f.submit "Send me reset password instructions" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>
View
25 app/views/devise/registrations/edit.html.erb
@@ -0,0 +1,25 @@
+<h2>Edit <%= resource_name.to_s.humanize %></h2>
+
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
+ <%= devise_error_messages! %>
+
+ <div><%= f.label :email %><br />
+ <%= f.email_field :email %></div>
+
+ <div><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
+ <%= f.password_field :password, :autocomplete => "off" %></div>
+
+ <div><%= f.label :password_confirmation %><br />
+ <%= f.password_field :password_confirmation %></div>
+
+ <div><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+ <%= f.password_field :current_password %></div>
+
+ <div><%= f.submit "Update" %></div>
+<% end %>
+
+<h3>Cancel my account</h3>
+
+<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %>.</p>
+
+<%= link_to "Back", :back %>
View
18 app/views/devise/registrations/new.html.erb
@@ -0,0 +1,18 @@
+<h2>Sign up</h2>
+
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+ <%= devise_error_messages! %>
+
+ <div><%= f.label :email %><br />
+ <%= f.email_field :email %></div>
+
+ <div><%= f.label :password %><br />
+ <%= f.password_field :password %></div>
+
+ <div><%= f.label :password_confirmation %><br />
+ <%= f.password_field :password_confirmation %></div>
+
+ <div><%= f.submit "Sign up" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>
View
17 app/views/devise/sessions/new.html.erb
@@ -0,0 +1,17 @@
+<h2>Sign in</h2>
+
+<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+ <div><%= f.label :email %><br />
+ <%= f.email_field :email %></div>
+
+ <div><%= f.label :password %><br />
+ <%= f.password_field :password %></div>
+
+ <% if devise_mapping.rememberable? -%>
+ <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
+ <% end -%>
+
+ <div><%= f.submit "Sign in" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>
View
25 app/views/devise/shared/_links.erb
@@ -0,0 +1,25 @@
+<%- if controller_name != 'sessions' %>
+ <%= link_to "Sign in", new_session_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+ <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
+ <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+ <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+ <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+ <%- resource_class.omniauth_providers.each do |provider| %>
+ <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
+ <% end -%>
+<% end -%>
View
12 app/views/devise/unlocks/new.html.erb
@@ -0,0 +1,12 @@
+<h2>Resend unlock instructions</h2>
+
+<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
+ <%= devise_error_messages! %>
+
+ <div><%= f.label :email %><br />
+ <%= f.email_field :email %></div>
+
+ <div><%= f.submit "Resend unlock instructions" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>
View
4 app/views/layouts/application.html.haml
@@ -26,7 +26,7 @@
A collective of performance based companies dedicated to creating new work in Austin, TX.
.main
= yield
- %footer{:class => "navbar navbar-fixed-bottom navbar-inverse"}
- New Work Austin website funded by a grant from the Mellon Foundation.
+ %footer{:class => "navbar navbar-inverse"}
+ New Work Austin website funded by a grant from the Mellon Foundation.
View
BIN public/assets/application-2bfbe92bf6449f2834e9199e2da8a47a.css.gz
Binary file not shown.
View
BIN public/assets/application-583abf2dcac2cddf4ab42fa5bcd65569.js.gz
Binary file not shown.
View
1 public/assets/application-74c8734aff1e6521e4b28fcf4179b880.css
1 addition, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
BIN public/assets/application-74c8734aff1e6521e4b28fcf4179b880.css.gz
Binary file not shown.
View
2 public/assets/application.css
1 addition, 1 deletion not shown because the diff is too large. Please use a local Git client to view these changes.
View
BIN public/assets/application.css.gz
Binary file not shown.
View
BIN public/assets/application.js.gz
Binary file not shown.
View
2 public/assets/manifest.yml
@@ -5,6 +5,6 @@ logo_small.png: logo_small-a6b2808619310329d6ac70f8942c7d79.png
rails.png: rails-7ad812856c7dc20006d43424bbe57d40.png
application.js: application-583abf2dcac2cddf4ab42fa5bcd65569.js
Jcrop.gif: Jcrop-0c2f7501c50bde320641a9a5aee629f3.gif
-application.css: application-2bfbe92bf6449f2834e9199e2da8a47a.css
+application.css: application-74c8734aff1e6521e4b28fcf4179b880.css
glyphicons-halflings-white.png: glyphicons-halflings-white-0d9ce4eb23c7f3ec006607cdaa7017ba.png
glyphicons-halflings.png: glyphicons-halflings-95fceccec7799ff7454b3c073da8dc5b.png
View
BIN vendor/cache/awesome_nested_fields-0.6.2.gem
Binary file not shown.
View
BIN vendor/cache/capistrano-2.14.2.gem
Binary file not shown.
View
BIN vendor/cache/cocaine-0.3.2.gem
Binary file not shown.
View
BIN vendor/cache/devise-2.2.3.gem
Binary file not shown.
View
BIN vendor/cache/jquery-rails-2.2.1.gem
Binary file not shown.
View
BIN vendor/cache/mime-types-1.21.gem
Binary file not shown.
View
BIN vendor/cache/net-scp-1.1.0.gem
Binary file not shown.
View
BIN vendor/cache/net-sftp-2.1.1.gem
Binary file not shown.
View
BIN vendor/cache/net-ssh-2.6.5.gem
Binary file not shown.
View
BIN vendor/cache/net-ssh-gateway-1.2.0.gem
Binary file not shown.
View
BIN vendor/cache/newrelic_rpm-3.5.6.46.gem
Binary file not shown.
View
BIN vendor/cache/paperclip-3.1.4.gem
Binary file not shown.
View
BIN vendor/cache/rack-1.3.10.gem
Binary file not shown.
View
BIN vendor/cache/rack-ssl-1.3.3.gem
Binary file not shown.
View
BIN vendor/cache/rdoc-3.12.1.gem
Binary file not shown.
View
BIN vendor/cache/sass-rails-3.1.7.gem
Binary file not shown.
View
BIN vendor/cache/whenever-0.8.2.gem
Binary file not shown.

0 comments on commit 963a4c0

Please sign in to comment.
Something went wrong with that request. Please try again.