From 3a2f5722ce1ff76fa9e9904878ad3d64abb5e5f0 Mon Sep 17 00:00:00 2001 From: Marcel Kooi <1marcelkooi@gmail.com> Date: Sat, 3 Nov 2018 23:31:16 -0400 Subject: [PATCH 1/2] Fix logo path --- app/views/devise/invitations/edit.html.erb | 3 ++- app/views/layouts/devise.html.erb | 2 +- app/views/layouts/login.html.erb | 2 +- app/views/layouts/navigation/_header.html.erb | 3 ++- app/views/static/index.html.erb | 14 +++++++------- app/views/static/register.html.erb | 2 +- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app/views/devise/invitations/edit.html.erb b/app/views/devise/invitations/edit.html.erb index cad17e7dea..789975b0ad 100644 --- a/app/views/devise/invitations/edit.html.erb +++ b/app/views/devise/invitations/edit.html.erb @@ -1,3 +1,4 @@ +<% resource = User.new %>

<%= t 'devise.invitations.edit.header' %>

Welcome to Diaperbase! Before we get started, please set a new password for yourself.

We recommend a password that is:

@@ -8,7 +9,7 @@

An easy one would be to pick a line from a poem or a favorite quote!

<%= simple_form_for resource, as: resource_name, url: invitation_path(resource_name), html: { method: :put } do |f| %> - <%= devise_error_messages! %> + <%= f.hidden_field :invitation_token %> <%= f.input :password %> diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb index 48ae086324..380438c7e7 100644 --- a/app/views/layouts/devise.html.erb +++ b/app/views/layouts/devise.html.erb @@ -23,7 +23,7 @@
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index 0096ba4026..75656b765a 100644 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -22,7 +22,7 @@