Skip to content

Commit 7cab559

Browse files
committed
replace haml with erb
1 parent 49ec309 commit 7cab559

22 files changed

+150
-152
lines changed

Gemfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ group :assets do
77
end
88
gem 'jquery-rails'
99
gem "mongoid", ">= 3.0.3"
10-
gem "haml", ">= 3.1.7"
11-
gem "haml-rails", ">= 0.3.4", :group => :development
12-
gem "hpricot", ">= 0.8.6", :group => :development
13-
gem "ruby_parser", ">= 2.3.1", :group => :development
1410
gem "rspec-rails", ">= 2.11.0", :group => [:development, :test]
1511
gem "capybara", ">= 1.1.2", :group => :test
1612
gem "database_cleaner", ">= 0.8.0", :group => :test

Gemfile.lock

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,7 @@ GEM
7878
ffi (1.1.5)
7979
gherkin (2.11.2)
8080
json (>= 1.4.6)
81-
haml (3.1.7)
82-
haml-rails (0.3.4)
83-
actionpack (~> 3.0)
84-
activesupport (~> 3.0)
85-
haml (~> 3.0)
86-
railties (~> 3.0)
8781
hike (1.2.1)
88-
hpricot (0.8.6)
8982
i18n (0.6.0)
9083
journey (1.0.4)
9184
jquery-rails (2.1.1)
@@ -106,7 +99,7 @@ GEM
10699
moped (~> 1.1)
107100
origin (~> 1.0)
108101
tzinfo (~> 0.3.22)
109-
mongoid-rspec (1.5.1)
102+
mongoid-rspec (1.5.4)
110103
mongoid (>= 3.0.1)
111104
rake
112105
rspec (>= 2.9)
@@ -154,8 +147,6 @@ GEM
154147
activesupport (>= 3.0)
155148
railties (>= 3.0)
156149
rspec (~> 2.11.0)
157-
ruby_parser (2.3.1)
158-
sexp_processor (~> 3.0)
159150
rubyzip (0.9.9)
160151
sass (3.2.1)
161152
sass-rails (3.2.5)
@@ -167,7 +158,6 @@ GEM
167158
libwebsocket (~> 0.1.3)
168159
multi_json (~> 1.0)
169160
rubyzip
170-
sexp_processor (3.2.0)
171161
sprockets (2.1.3)
172162
hike (~> 1.2)
173163
rack (~> 1.0)
@@ -197,15 +187,11 @@ DEPENDENCIES
197187
devise (>= 2.1.2)
198188
email_spec (>= 1.2.1)
199189
factory_girl_rails (>= 4.0.0)
200-
haml (>= 3.1.7)
201-
haml-rails (>= 0.3.4)
202-
hpricot (>= 0.8.6)
203190
jquery-rails
204191
launchy (>= 2.1.2)
205192
mongoid (>= 3.0.3)
206193
mongoid-rspec (>= 1.4.6)
207194
rails (= 3.2.8)
208195
rspec-rails (>= 2.11.0)
209-
ruby_parser (>= 2.3.1)
210196
sass-rails (~> 3.2.3)
211197
uglifier (>= 1.0.3)
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<h2>Edit <%= resource_name.to_s.humanize %></h2>
2+
3+
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
4+
<%= devise_error_messages! %>
5+
<p><%= f.label :name %><br />
6+
<%= f.text_field :name %></p>
7+
8+
<div><%= f.label :email %><br />
9+
<%= f.email_field :email %></div>
10+
11+
<div><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
12+
<%= f.password_field :password, :autocomplete => "off" %></div>
13+
14+
<div><%= f.label :password_confirmation %><br />
15+
<%= f.password_field :password_confirmation %></div>
16+
17+
<div><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
18+
<%= f.password_field :current_password %></div>
19+
20+
<div><%= f.submit "Update" %></div>
21+
<% end %>
22+
23+
<h3>Cancel my account</h3>
24+
25+
<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %>.</p>
26+
27+
<%= link_to "Back", :back %>

app/views/devise/registrations/edit.html.haml

Lines changed: 0 additions & 31 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<h2>Sign up</h2>
2+
3+
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
4+
<%= devise_error_messages! %>
5+
<p><%= f.label :name %><br />
6+
<%= f.text_field :name %></p>
7+
8+
<div><%= f.label :email %><br />
9+
<%= f.email_field :email %></div>
10+
11+
<div><%= f.label :password %><br />
12+
<%= f.password_field :password %></div>
13+
14+
<div><%= f.label :password_confirmation %><br />
15+
<%= f.password_field :password_confirmation %></div>
16+
17+
<div><%= f.submit "Sign up" %></div>
18+
<% end %>
19+
20+
<%= render "devise/shared/links" %>

app/views/devise/registrations/new.html.haml

Lines changed: 0 additions & 21 deletions
This file was deleted.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<%- if controller_name != 'sessions' %>
2+
<%= link_to "Sign in", new_session_path(resource_name) %><br />
3+
<% end -%>
4+
5+
<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
6+
<%= link_to "Sign up", new_registration_path(resource_name) %><br />
7+
<% end -%>
8+
9+
<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
10+
<%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
11+
<% end -%>
12+
13+
<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
14+
<%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
15+
<% end -%>
16+
17+
<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
18+
<%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
19+
<% end -%>
20+
21+
<%- if devise_mapping.omniauthable? %>
22+
<%- resource_class.omniauth_providers.each do |provider| %>
23+
<%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
24+
<% end -%>
25+
<% end -%>

app/views/devise/shared/_links.html.haml

Lines changed: 0 additions & 19 deletions
This file was deleted.

app/views/home/index.html.erb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<h3>Home</h3>
2+
<% @users.each do |user| %>
3+
<p><%= user.name %> <%= link_to root_url(:subdomain => user.name), root_url(:subdomain => user.name) %></p>
4+
<% end %>

app/views/home/index.html.haml

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)