Site
/
clarion
11
0
Fork 0
Code Issues 4 Pull Requests 1 Packages Projects Releases Wiki Activity

OpenFest: Fix registration and login process

This commit is contained in:
Andrew Radev 2015-08-05 14:54:17 +03:00
parent ce61422321
commit 9d53e49fb4
8 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/views/devise/shared/_links.html.slim
View File

@ -1,24 +1,16 @@
br br
- if controller_name != 'sessions' - if controller_name != 'sessions'
= link_to t('sessions.sign_in'), new_session_path(resource_name) = link_to t('sessions.sign_in'), new_user_session_path
br br
- if devise_mapping.registerable? && controller_name != 'registrations' - if devise_mapping.registerable? && controller_name != 'registrations'
= link_to t('registrations.sign_up'), new_registration_path(resource_name) = link_to t('registrations.sign_up'), new_user_registration_path
br br
- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' - if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations'
= link_to t('passwords.forgotten_password'), new_password_path(resource_name) = link_to t('passwords.forgotten_password'), new_user_password_path
br br
- if devise_mapping.confirmable? && controller_name != 'confirmations' - if devise_mapping.confirmable? && controller_name != 'confirmations'
= link_to t('confirmations.did_not_receive_confirmation_instructions'), new_confirmation_path(resource_name) = link_to t('confirmations.did_not_receive_confirmation_instructions'), new_user_confirmation_path
br br
- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
= link_to t('unlocks.did_not_receive_unlock_instructions'), new_unlock_path(resource_name)
br
- if devise_mapping.omniauthable?
- resource_class.omniauth_providers.each do |provider|
= link_to t('sessions.sign_in_with', provider: provider.to_s.titleize), omniauth_authorize_path(resource_name, provider)

2
lib/open_fest/app/assets/javascripts/open_fest/application.js
View File

@ -10,4 +10,6 @@
// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
// about supported directives. // about supported directives.
// //
//= require jquery
//= require jquery_ujs
//= require_tree . //= require_tree .

1
lib/open_fest/app/views/layouts/open_fest/application.html.erb
View File

@ -15,6 +15,7 @@
<body> <body>
<%= render 'open_fest/shared/nav' %> <%= render 'open_fest/shared/nav' %>
<section class="content"> <section class="content">
<%= render 'open_fest/shared/flash_messages' %>
<%= yield %> <%= yield %>
</section> </section>
</body> </body>

3
lib/open_fest/app/views/open_fest/shared/_flash_messages.slim Normal file
View File

@ -0,0 +1,3 @@
div#flash_messages
- flash.each do |key, value|
= content_tag :div, value, class: "flash #{key}"

2
lib/open_fest/app/views/open_fest/users/registrations/edit.slim
View File

@ -1,6 +1,6 @@
- content_for(:title) { t :edit_speaker_profile } - content_for(:title) { t :edit_speaker_profile }
= simple_form_for(resource, wrapper: :default, as: resource_name, url: open_fest.user_registration_path, html: { method: :put, multipart: true }) do |f| = simple_form_for(resource, wrapper: :default, as: :user, url: user_registration_path, html: { method: :put, multipart: true }) do |f|
.form_inputs .form_inputs
h2.entry-title = t :personal_profile h2.entry-title = t :personal_profile
= f.error_notification = f.error_notification

2
lib/open_fest/app/views/open_fest/users/registrations/new.slim
View File

@ -2,7 +2,7 @@
h2.entry-title = t :registration h2.entry-title = t :registration
= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| = simple_form_for(resource, as: resource_name, url: user_registration_path) do |f|
= f.error_notification = f.error_notification
.form-inputs .form-inputs

2
lib/open_fest/app/views/open_fest/users/sessions/new.slim
View File

@ -2,7 +2,7 @@
h2.entry-title = t :login h2.entry-title = t :login
= simple_form_for(resource, wrapper: :default, as: resource_name, url: session_path(resource_name), ) do |f| = simple_form_for(resource, wrapper: :default, as: resource_name, url: user_session_path) do |f|
.form-inputs .form-inputs
= f.input :email, required: false, autofocus: true, hint: false = f.input :email, required: false, autofocus: true, hint: false
= f.input :password, required: false, hint: false = f.input :password, required: false, hint: false

16
lib/open_fest/app/views/open_fest/users/shared/_links.slim
View File

@ -1,23 +1,15 @@
- if controller_name != 'sessions' - if controller_name != 'sessions'
= link_to t(:enter), new_session_path(resource_name) = link_to t(:enter), new_user_session_path
br br
- if devise_mapping.registerable? && controller_name != 'registrations' - if devise_mapping.registerable? && controller_name != 'registrations'
= link_to t(:registration), new_registration_path(resource_name) = link_to t(:registration), new_user_registration_path
br br
- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' - if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations'
= link_to t(:lostpass), new_password_path(resource_name) = link_to t(:lostpass), new_user_password_path
br br
- if devise_mapping.confirmable? && controller_name != 'confirmations' - if devise_mapping.confirmable? && controller_name != 'confirmations'
= link_to t(:did_not_get_confirmation), new_confirmation_path(resource_name) = link_to t(:did_not_get_confirmation), new_user_confirmation_path
br br
- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
= link_to t(:did_not_get_unlock), new_unlock_path(resource_name)
br
- if devise_mapping.omniauthable?
- resource_class.omniauth_providers.each do |provider|
= link_to t(:login_with, with: @provider.to_s.titleize), omniauth_authorize_path(resource_name, provider)