diff --git a/app/controllers/recruiter_controller.rb b/app/controllers/recruiter_controller.rb index 3d6ae2c..e263c80 100644 --- a/app/controllers/recruiter_controller.rb +++ b/app/controllers/recruiter_controller.rb @@ -18,7 +18,7 @@ class RecruiterController < ApplicationController RecruiterMailer.candidate_created(@candidate).deliver_now redirect_to recruiter_path, flash: { notice: "Sucessfully created candidate #{@candidate.name}" } else - flash[:error] = "Failed to save Candidate." + flash[:error] = "Failed to save candidate." render :form end end @@ -34,7 +34,7 @@ class RecruiterController < ApplicationController session[:user] = recruiter.to_i redirect_to recruiter_path else - redirect_to recruiter_login_path, flash: { error: "Sorry, incorrect email or password." } + redirect_to recruiter_login_path, flash: { error: "Sorry, incorrect email or password. Please try again." } end end diff --git a/app/controllers/review_controller.rb b/app/controllers/review_controller.rb index 91ae07d..1077fbe 100644 --- a/app/controllers/review_controller.rb +++ b/app/controllers/review_controller.rb @@ -22,7 +22,7 @@ class ReviewController < ApplicationController session[:user] = reviewer.to_i redirect_to review_path else - redirect_to review_login_path, flash: { error: "Sorry, incorrect email or password." } + redirect_to review_login_path, flash: { error: "Sorry, incorrect email or password. Please try again." } end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4c7737c..feaaee8 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,7 +1,7 @@ module ApplicationHelper def experience_options val options_for_select([ - ["Please Select", ""], + ["Please select", ""], ["0-3 Years", "0-3"], ["4-6 Years", "4-6"], ["7-9 Years", "7-9"], diff --git a/app/views/candidate/login.html.erb b/app/views/candidate/login.html.erb index 35ee06d..248a4fa 100644 --- a/app/views/candidate/login.html.erb +++ b/app/views/candidate/login.html.erb @@ -3,7 +3,7 @@

Let's Get Started

- Hey there! Give us your test id, and we'll get you started. + Hey there! Give us your Test ID, and we'll get you started.

<%= form_tag(validate_candidate_path) do %> @@ -15,6 +15,6 @@
<%= flash[:error] %>
<% end %> - + <% end %>
diff --git a/app/views/candidate/question.html.erb b/app/views/candidate/question.html.erb index 23fb9ba..e8beaa4 100644 --- a/app/views/candidate/question.html.erb +++ b/app/views/candidate/question.html.erb @@ -28,10 +28,10 @@ <% else %>
- +
- +
<% end %> diff --git a/app/views/candidate/welcome_back.html.erb b/app/views/candidate/welcome_back.html.erb index 0648c9a..c813b48 100644 --- a/app/views/candidate/welcome_back.html.erb +++ b/app/views/candidate/welcome_back.html.erb @@ -3,7 +3,7 @@

Welcome Back

-

Hello <%= current_candidate.name %>

+

Hello, <%= current_candidate.name %>!

We are ready to pick up where you left off. diff --git a/app/views/candidate_mailer/welcome.html.erb b/app/views/candidate_mailer/welcome.html.erb index e458d56..87ccfae 100644 --- a/app/views/candidate_mailer/welcome.html.erb +++ b/app/views/candidate_mailer/welcome.html.erb @@ -9,19 +9,26 @@ -

Your Candidate ID is <%= @candidate.test_hash %>

+

+ Please visit <%= link_to nil, login_url(@candidate.test_hash) %> to begin your test. +

+ -

+ +

+ Or, visit <%= root_url %> and enter your Test ID to begin your test. + Your Test ID is: <%= @candidate.test_hash %>. +

+ +

Once we have evaluated your answers, your recruiter will be in touch. Good luck!
diff --git a/app/views/candidate_mailer/welcome.text.erb b/app/views/candidate_mailer/welcome.text.erb index 5e1fe81..e7279fd 100644 --- a/app/views/candidate_mailer/welcome.text.erb +++ b/app/views/candidate_mailer/welcome.text.erb @@ -1,9 +1,9 @@ PERFICIENT DIGITAL - Skills Assessment Test -Please visit <%= login_url(@candidate.test_hash) %> to get started. +Please visit <%= login_url(@candidate.test_hash) %> to begin your test. -Or, visit <%= root_url %> and enter your Candidate ID to being your test. -Your Candidate ID is: <%= @candidate.test_hash %> +Or, visit <%= root_url %> and enter your Test ID to begin your test. +Your Test ID is: <%= @candidate.test_hash %> -We will reach back to you once we have evaluated your answers. +Once we have evaluated your answers, your recruiter will be in touch. Good luck! diff --git a/app/views/recruiter/login.html.erb b/app/views/recruiter/login.html.erb index abfa894..9d4098d 100644 --- a/app/views/recruiter/login.html.erb +++ b/app/views/recruiter/login.html.erb @@ -16,6 +16,6 @@ <%= form.password_field :password %> - <%= submit_tag "Login" %> + <%= submit_tag "Log in" %> <% end %>