From 7519ce45f113d2b8fd6b52e7686916c72e25920f Mon Sep 17 00:00:00 2001
From: Godwin <goodgodwin@hotmail.com>
Date: Tue, 12 Jul 2016 20:59:53 -0700
Subject: [PATCH] Fixed contact details and email confirmation sent page

---
 app/controllers/application_controller.rb     | 21 +++++++++++++++++--
 .../_login_confirmation_sent.html.haml        |  3 +--
 config/locales/en.yml                         |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5cdd448..03bf089 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -16,6 +16,22 @@ class ApplicationController < LinguaFrancaApplicationController
 	@@test_location
 
 	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
 		I18n.config.translator = current_user
 		I18n.config.callback = self
@@ -253,13 +269,14 @@ class ApplicationController < LinguaFrancaApplicationController
 			]
 		end
 
+		request_info = session['request_info'] || { 'request' => request, 'params' => params }
 		UserMailer.send_mail(:contact_details) do 
 			[
 				current_user || params[:email],
 				params[:subject],
 				params[:message],
-				request,
-				params
+				request_info['request'],
+				request_info['params']
 			]
 		end
 
diff --git a/app/views/application/_login_confirmation_sent.html.haml b/app/views/application/_login_confirmation_sent.html.haml
index 8b74c39..4099e77 100644
--- a/app/views/application/_login_confirmation_sent.html.haml
+++ b/app/views/application/_login_confirmation_sent.html.haml
@@ -1,5 +1,4 @@
 = row do
 	= columns(medium: 12) do
 		%h2=_'articles.permission_denied.headings.confirmation_sent','Confirmation Sent'
-	= columns(medium: 6) do
-		%p=_'articles.permission_denied.paragraphs.confirmation_sent', :p
+		%p=_'articles.conference_registration.paragraphs.email_confirm', :p
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7069ee6..935b73c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -5409,7 +5409,7 @@ en:
         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.
           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
           your email address is confirmed you will be able to complete registration,
           add workshops and pay your registration donation fee. If you have already