Basic site flow improvements and devise handling

This commit is contained in:
2014-07-16 11:20:11 +02:00
parent de298a529b
commit a302123c6b
20 changed files with 134 additions and 85 deletions
@@ -2,11 +2,8 @@ h2= t('devise.confirmations.title')
= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), html: { method: :post, class: 'form-horizontal' }) do |f|
= devise_error_messages!
.control-group
= f.label :email, class: 'control-label'
.controls
= f.email_field :email
.control-group
.controls= f.submit t('devise.confirmations.submit_text'), class: 'btn-primary'
= f.row :email do
.form-label= f.label :email, class: 'control-label'
.form-field= f.email_field :email
.form-row.form-actions= f.submit t('devise.confirmations.submit_text'), class: 'button'
= render "links"
+7 -9
View File
@@ -2,13 +2,11 @@ h2= t('devise.passwords.edit.title')
= form_for(resource, :as => resource_name, :url => password_path(resource_name), html: {class: 'form-horizontal', method: :put}) do |f|
= devise_error_messages!
= f.hidden_field :reset_password_token
.control-group
= f.label :password, class: 'control-label'
.controls= f.password_field :password
.control-group
= f.label :password_confirmation, class: 'control-label'
.controls= f.password_field :password_confirmation
.control-group
.controls
= f.submit t('devise.passwords.edit.button'), class: 'btn btn-primary'
.form-row
.form-label= f.label :password
.form-field= f.password_field :password
= f.row :password_confirmation do
.form-label= f.label :password_confirmation
.form-field= f.password_field :password_confirmation
.form-row= f.submit t('devise.passwords.edit.button'), class: 'button'
= render "links"
+4 -6
View File
@@ -1,10 +1,8 @@
h2= t('devise.passwords.title')
= form_for(resource, :as => resource_name, :url => password_path(resource_name), html: {class: 'form-horizontal'}) do |f|
= devise_error_messages!
.control-group
= f.label :email, class: 'control-label'
.controls= f.email_field :email
.control-group
.controls
= f.submit t('devise.passwords.button'), class: 'btn btn-primary'
= f.row :email do
.form-label= f.label :email, class: 'control-label'
.form-field= f.email_field :email
.form-row.form-actions= f.submit t('devise.passwords.button'), class: 'button'
= render "links"
+13 -14
View File
@@ -6,18 +6,17 @@ p
= form_for(resource, :as => resource_name, :url => registration_path(resource_name), html: {class: 'form-horizontal'}) do |f|
= devise_error_messages!
.control-group
= f.label :name, class: 'control-label'
.controls= f.text_field :name
.control-group
= f.label :email, class: 'control-label'
.controls= f.email_field :email
.control-group
= f.label :password, class: 'control-label'
.controls= f.password_field :password
.control-group
= f.label :password_confirmation, class: 'control-label'
.controls= f.password_field :password_confirmation
.control-group
.controls
= f.submit t('devise.registrations.button'), class: 'btn btn-primary'
= f.row :name do
.form-label= f.label :name, class: 'control-label'
.form-field= f.text_field :name
= f.row :email do
.form-label= f.label :email, class: 'control-label'
.form-field= f.email_field :email
= f.row :password do
.form-label= f.label :password, class: 'control-label'
.form-field= f.password_field :password
= f.row :password_confirmation do
.form-label= f.label :password_confirmation, class: 'control-label'
.form-field= f.password_field :password_confirmation
.form-row.form-actions= f.submit t('devise.registrations.button'), class: 'button'
= render "links"
+10 -15
View File
@@ -1,19 +1,14 @@
h2= t('devise.sessions.title')
= form_for(resource, :as => resource_name, :url => session_path(resource_name), html: {class: 'form-horizontal'}) do |f|
= devise_error_messages!
.control-group
= f.label :email, class: 'control-label'
.controls= f.email_field :email
.control-group
= f.label :password, class: 'control-label'
.controls= f.password_field :password
.control-group
.controls
= f.label :remember_me do
= f.check_box :remember_me
| 
= t('devise.sessions.remember_me')
.control-group
.controls
= f.submit t('devise.sessions.button'), class: 'btn btn-primary'
= f.row :email do
.form-label= f.label :email
.form-field= f.email_field :email
.form-row
= f.label :remember_me do
= f.check_box :remember_me
| 
= t('devise.sessions.remember_me')
.form-row
= f.submit t('devise.sessions.button'), class: 'new-session-button'
= render "links"