Browse Source

Fixed contact details and email confirmation sent page

development
Godwin 8 years ago
parent
commit
7519ce45f1
  1. 21
      app/controllers/application_controller.rb
  2. 3
      app/views/application/_login_confirmation_sent.html.haml
  3. 2
      config/locales/en.yml

21
app/controllers/application_controller.rb

@ -16,6 +16,22 @@ class ApplicationController < LinguaFrancaApplicationController
@@test_location @@test_location
def capture_page_info def capture_page_info
if request.method == "GET" && (params[:controller] != 'application' || params[:action] != 'contact')
session[:last_request]
request_info = {
'params' => params,
'request' => {
'remote_ip' => request.remote_ip,
'uuid' => request.uuid,
'original_url' => request.original_url,
'env' => Hash.new
}
}
request.env.each do | key, value |
request_info['request']['env'][key.to_s] = value.to_s
end
session['request_info'] = request_info
end
# set the translator to the current user if we're logged in # set the translator to the current user if we're logged in
I18n.config.translator = current_user I18n.config.translator = current_user
I18n.config.callback = self I18n.config.callback = self
@ -253,13 +269,14 @@ class ApplicationController < LinguaFrancaApplicationController
] ]
end end
request_info = session['request_info'] || { 'request' => request, 'params' => params }
UserMailer.send_mail(:contact_details) do UserMailer.send_mail(:contact_details) do
[ [
current_user || params[:email], current_user || params[:email],
params[:subject], params[:subject],
params[:message], params[:message],
request, request_info['request'],
params request_info['params']
] ]
end end

3
app/views/application/_login_confirmation_sent.html.haml

@ -1,5 +1,4 @@
= row do = row do
= columns(medium: 12) do = columns(medium: 12) do
%h2=_'articles.permission_denied.headings.confirmation_sent','Confirmation Sent' %h2=_'articles.permission_denied.headings.confirmation_sent','Confirmation Sent'
= columns(medium: 6) do %p=_'articles.conference_registration.paragraphs.email_confirm', :p
%p=_'articles.permission_denied.paragraphs.confirmation_sent', :p

2
config/locales/en.yml

@ -5409,7 +5409,7 @@ en:
email_confirm: Go to your inbox! You should see an email from Bike!Bike! in email_confirm: Go to your inbox! You should see an email from Bike!Bike! in
just a few moments. There will be a link in the email for you to click on. just a few moments. There will be a link in the email for you to click on.
Check your spam box if you do not see it. If you encounter any problems, Check your spam box if you do not see it. If you encounter any problems,
please email to admin@bikebike.org. please contact us.
confirm_email_address: We ask that you first confirm your email address, once confirm_email_address: We ask that you first confirm your email address, once
your email address is confirmed you will be able to complete registration, your email address is confirmed you will be able to complete registration,
add workshops and pay your registration donation fee. If you have already add workshops and pay your registration donation fee. If you have already

Loading…
Cancel
Save