only allow users with an invite to create accounts

app/views/sessions/new.html.haml

@@ -7,13 +7,12 @@
   = form_tag login_path, :class => 'loginForm' do
     = hidden_field_tag 'return_to', params[:return_to]
     - if params[:return_to] && params[:return_to] =~ /\/join\//
-      %p.loginForm__invite.warningBox.u-margin To accept your invitation you need to login to your account or create a new one. Choose from the options below to continue.
+      %p.loginForm__invite.warningBox.u-margin Login to your existing account to accept your invitation.
 
     %p.loginForm__input= text_field_tag 'email_address', '', :type => 'email', :autocomplete => 'off', :spellcheck => 'false', :class => 'input input--text input--onWhite', :placeholder => "Your e-mail address", :autofocus => true, :tabindex => 1
     %p.loginForm__input= password_field_tag 'password', '', :class => 'input input--text input--onWhite', :placeholder => "Your password", :tabindex => 2
     .loginForm__submit
       %ul.loginForm__links
         %li= link_to "Forgotten your password?", login_reset_path(:return_to => params[:return_to])
-        %li= link_to "Create a new user", signup_path(:return_to => params[:return_to])
       %p= submit_tag "Login", :class => 'button button--positive', :tabindex => 3
 

app/views/user/new.html.haml

@@ -1,17 +1,19 @@
 - @wide = true
 - page_title << "Signup"
 .subPageBox__title
-  Create your own Postal account
+  Join the #{@user_invite.organizations.first.name} organization
 = display_flash
 
 .subPageBox__content
   %p.subPageBox__text
-    To create an account, just enter your details below and you'll be on your way.
-    Be sure to enter a valid e-mail address because we'll send you a verification
-    e-mail as part of the signup process.
+    If you don't already have an account on this system, you can create one below. Otherwise, you should
+    #{link_to "login to your existing account", login_path(:return_to => join_path(@user_invite.uuid)), :class => 'u-link'}
+    and add this organization to that.
+
   .signupForm
     = form_for @user, :url => signup_path do |f|
       = hidden_field_tag 'return_to', params[:return_to]
+      = hidden_field_tag 'invite_token', params[:invite_token]
       = f.error_messages
       .fieldSet.fieldSet--compact.u-margin
         .fieldSet__fieldPair