Merge pull request #8 from asavkin/slim

slim
asavkin · Mar 15, 2016 · 6208af1 · 6208af1
2 parents 5018c07 + 07c360e
commit 6208af1
Show file tree

Hide file tree

Showing 41 changed files with 288 additions and 358 deletions.
diff --git a/Gemfile b/Gemfile
@@ -27,6 +27,8 @@ gem 'bootstrap-sass'
 
 gem 'devise'
 
+gem 'slim-rails'
+
 gem 'activeadmin', github: 'activeadmin'
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -176,6 +176,15 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    slim (3.0.6)
+      temple (~> 0.7.3)
+      tilt (>= 1.3.3, < 2.1)
+    slim-rails (3.0.1)
+      actionmailer (>= 3.1, < 5.0)
+      actionpack (>= 3.1, < 5.0)
+      activesupport (>= 3.1, < 5.0)
+      railties (>= 3.1, < 5.0)
+      slim (~> 3.0)
     spring (1.6.1)
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
@@ -185,6 +194,7 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.11)
+    temple (0.7.6)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.1)
@@ -217,6 +227,7 @@ DEPENDENCIES
   rails (= 4.2.0)
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
+  slim-rails
   spring
   sqlite3
   turbolinks

diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
diff --git a/app/views/devise/confirmations/new.html.slim b/app/views/devise/confirmations/new.html.slim
@@ -0,0 +1,10 @@
+h2 Resend confirmation instructions
+= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: {method: :post}) do |f|
+  = devise_error_messages!
+  .field
+    = f.label :email
+    br
+    = f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email)
+  .actions
+    = f.submit "Resend confirmation instructions"
+    = render "devise/shared/links"
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
diff --git a/app/views/devise/mailer/confirmation_instructions.html.slim b/app/views/devise/mailer/confirmation_instructions.html.slim
@@ -0,0 +1,4 @@
+p
+  | Welcome #{@email}!
+p You can confirm your account email through the link below:
+p= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token)
diff --git a/app/views/devise/mailer/password_change.html.erb b/app/views/devise/mailer/password_change.html.erb
diff --git a/app/views/devise/mailer/password_change.html.slim b/app/views/devise/mailer/password_change.html.slim
@@ -0,0 +1,3 @@
+p
+  | Hello #{@resource.email}!
+p We're contacting you to notify you that your password has been changed.
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
diff --git a/app/views/devise/mailer/reset_password_instructions.html.slim b/app/views/devise/mailer/reset_password_instructions.html.slim
@@ -0,0 +1,6 @@
+p
+  | Hello #{@resource.email}!
+p Someone has requested a link to change your password. You can do this through the link below.
+p= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token)
+p If you didn't request this, please ignore this email.
+p Your password won't change until you access the link above and create a new one.
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
diff --git a/app/views/devise/mailer/unlock_instructions.html.slim b/app/views/devise/mailer/unlock_instructions.html.slim
@@ -0,0 +1,5 @@
+p
+  | Hello #{@resource.email}!
+p Your account has been locked due to an excessive number of unsuccessful sign in attempts.
+p Click the link below to unlock your account:
+p= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token)
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
diff --git a/app/views/devise/passwords/edit.html.slim b/app/views/devise/passwords/edit.html.slim
@@ -0,0 +1,19 @@
+h2 Change your password
+= 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
+  .field
+    = f.label :password, "New password"
+    br
+    - if @minimum_password_length
+      em
+        | (#{@minimum_password_length} characters minimum)
+      br
+      = f.password_field :password, autofocus: true, autocomplete: "off"
+  .field
+    = f.label :password_confirmation, "Confirm new password"
+    br
+    = f.password_field :password_confirmation, autocomplete: "off"
+  .actions
+    = f.submit "Change my password"
+    = render "devise/shared/links"
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
diff --git a/app/views/devise/passwords/new.html.slim b/app/views/devise/passwords/new.html.slim
@@ -0,0 +1,10 @@
+h2 Forgot your password?
+= form_for(resource, as: resource_name, url: password_path(resource_name), html: {method: :post}) do |f|
+  = devise_error_messages!
+  .field
+    = f.label :email
+    br
+    = f.email_field :email, autofocus: true
+  .actions
+    = f.submit "Send me reset password instructions"
+    = render "devise/shared/links"
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
diff --git a/app/views/devise/registrations/edit.html.slim b/app/views/devise/registrations/edit.html.slim
@@ -0,0 +1,39 @@
+h2
+  | Edit #{resource_name.to_s.humanize}
+= form_for(resource, as: resource_name, url: registration_path(resource_name), html: {method: :put}) do |f|
+  = devise_error_messages!
+  .field
+    = f.label :email
+    br
+    = f.email_field :email, autofocus: true
+    - if devise_mapping.confirmable? && resource.pending_reconfirmation?
+    div
+      | Currently waiting confirmation for: #{resource.unconfirmed_email}
+  .field
+    = f.label :password
+    i (leave blank if you don't want to change it)
+    br
+    = f.password_field :password, autocomplete: "off"
+  .field
+    = f.label :password_confirmation
+    br
+    = f.password_field :password_confirmation, autocomplete: "off"
+  .field
+    = f.label :current_password
+    i (we need your current password to confirm your changes)
+    br
+    = f.password_field :current_password, autocomplete: "off"
+  .field
+    = f.label :first_name
+    br
+    = f.text_field :first_name
+  .field
+    = f.label :last_name
+    br
+    = f.text_field :last_name
+  .actions
+    = f.submit "Update"
+h3 Cancel my account
+p
+  | Unhappy? #{button_to "Cancel my account", registration_path(resource_name), data: {confirm: "Are you sure?"}, method: :delete}
+= link_to "Back", :back
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
diff --git a/app/views/devise/registrations/new.html.slim b/app/views/devise/registrations/new.html.slim
@@ -0,0 +1,29 @@
+h2 Sign up
+= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
+  = devise_error_messages!
+  .field
+    = f.label :email
+    br
+    = f.email_field :email, autofocus: true
+  .field
+    = f.label :password
+    - if @minimum_password_length
+      em
+        | (#{@minimum_password_length} characters minimum)
+    br
+    = f.password_field :password, autocomplete: "off"
+  .field
+    = f.label :password_confirmation
+    br
+    = f.password_field :password_confirmation, autocomplete: "off"
+  .field
+    = f.label :first_name
+    br
+    = f.text_field :first_name
+  .field
+    = f.label :last_name
+    br
+    = f.text_field :last_name
+  .actions
+    = f.submit "Sign up"
+    = render "devise/shared/links"
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb