diff --git a/app/assets/stylesheets/global.scss b/app/assets/stylesheets/global.scss index 41b208ab..1069c17c 100644 --- a/app/assets/stylesheets/global.scss +++ b/app/assets/stylesheets/global.scss @@ -64,7 +64,6 @@ body > .container { font-size: 2rem; border: 2px solid $black; vertical-align: middle; - display: inline-block; margin-top: 1px; margin-bottom: 1px; margin-left: -0.5rem; @@ -86,6 +85,10 @@ input:checked[type="checkbox"] { margin-left: 1rem; } +.form-check-label { + display: inline; +} + .width-fit-content { width: fit-content !important; } diff --git a/app/views/ui/users/new.html.erb b/app/views/ui/users/new.html.erb index 22c011e1..8bd1c437 100644 --- a/app/views/ui/users/new.html.erb +++ b/app/views/ui/users/new.html.erb @@ -9,4 +9,10 @@
<%= f.primary t(:new_user_submit), class: "btn btn-primary w-100 w-md-auto" %>
+
+
+

<%= t :new_user_login_heading %>

+ <%= t :new_user_login_link %> +
+
<% end %> diff --git a/config/locales/views/users/en.yml b/config/locales/views/users/en.yml index ce905bb3..7b66c11e 100644 --- a/config/locales/views/users/en.yml +++ b/config/locales/views/users/en.yml @@ -1,4 +1,6 @@ en: new_user_submit: "Sign up" - new_user_ts_and_cs_label_html: "I have read and accept the Terms and Conditions" + new_user_ts_and_cs_label_html: "I accept the Terms and Conditions" new_user_success: "Thanks for signing up! You are now logged in." + new_user_login_heading: "Already have an account?" + new_user_login_link: "Log in" diff --git a/spec/features/user_management_spec.rb b/spec/features/user_management_spec.rb index 812417a5..2a06826c 100644 --- a/spec/features/user_management_spec.rb +++ b/spec/features/user_management_spec.rb @@ -5,11 +5,11 @@ visit "/login" click_on "Sign up" expect(page).to have_current_path(new_ui_user_path) - fill_in "Username", with: "myusername" fill_in "Email", with: "user@example.com" + fill_in "Username", with: "myusername" fill_in "Password", with: "password123" fill_in "Password confirmation", with: "password123" - check "I have read and accept the Terms and Conditions" + check "I accept the Terms and Conditions" click_on "Sign up" expect(page).to have_content("Thanks for signing up! You are now logged in.") end