Merge branch 'master' into 3298-edit-project-display-name-on-delete-a…

…ctivated_state-=-inactive

app/views/devise/confirmations/new.html.erb

@@ -1,14 +1,20 @@
-<div class="form-container">
-  <h2>Resend confirmation instructions</h2>
+<div class="form-container panel panel-default">
+  <div class="panel-body">
+    <h2>Resend confirmation email</h2>
 
-  <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, class: "form" }) do |f| %>
-    <%= devise_error_messages! %>
+    <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, class: "form" }) do |f| %>
+      <%= render "devise/shared/error_messages", resource: resource %>
 
-    <fieldset class="fieldset--email"><%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, required: true %></fieldset>
+      <fieldset class="fieldset--email">
+        <%= f.label :email, "Email Address" %><br />
+        <%= f.email_field :email, autofocus: true, required: true %>
+      </fieldset>
 
-    <div class="submit-container"><%= f.submit "Resend confirmation instructions" %></div>
-  <% end %>
+      <div class="submit-container"><%= f.submit "Submit" %></div>
+    <% end %>
+  </div>
 
-  <%= render "devise/shared/links" %>
+  <div class="panel-footer">
+    <%= render "devise/shared/links" %>
+  </div>
 </div>

app/views/devise/mailer/confirmation_instructions.html.erb

@@ -1,5 +1,9 @@
-<p>Welcome <%= @email %>!</p>
-
-<p>You can confirm your account email through the link below:</p>
+<p>Welcome to the Zooniverse, <%= @email %>!</p>
 
+<p>Please confirm your account email by clicking the link below:</p>
 <p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>
+
+<p>While you are able to login and classify within projects, you will not be able to post on Talk discussion forums until you verify your email account.</p>
+
+<p>Thanks!<br />
+The Zooniverse Team</p>