Move email input nearer password input on forms.

This moves the email input from `user_loggedout.html` closer to the
password inputs in `user_loggedout_{by_email,password}.html`, because
we want to emphasise the connection between your login email/username
and your password, and, now that only one "Yes I have an account / No
I do not have an account" fieldset is displayed at a time, there was
no reason to ask for the email/username up front.

This, however, now means the form includes two username inputs, so:

* `Report/New.pm` and `Report/Update.pm` now pick the first non-empty
  username param and use that.
* `user_loggedout_email.html` now expects a `name` parameter, so that
  we can give the two username inputs unique ids in the markup.

Also:

* The "optional" phone and email inputs in user_loggedout_by_email.html
  are printed *after* the main username input if SMS login is enabled
  (since one or other of them is unhidden by javascript, based on
  whether you entered a phone number or and email address into the
  "username" input, and it would look weird to have an input become
  unhidden *above* the input you’re currently editing).

1 files changed, 1 insertions, 1 deletions

diff --git a/.cypress/cypress/integration/simple_spec.js b/.cypress/cypress/integration/simple_spec.js
index 01fb77f49..7040681a3 100644
--- a/.cypress/cypress/integration/simple_spec.js
+++ b/.cypress/cypress/integration/simple_spec.js
@@ -12,8 +12,8 @@ describe('Clicking the map', function() {
         cy.get('[name=title]').type('Title');
         cy.get('[name=detail]').type('Detail');
         cy.get('#js-new-report-user-show').click();
-        cy.get('[name=username]').type('user@example.org');
         cy.get('#js-new-report-show-sign-in').click();
+        cy.get('#form_username_sign_in').type('user@example.org');
         cy.get('[name=password_sign_in]').type('password');
         cy.get('[name=password_sign_in]').parents('form').submit();
         cy.get('#map_sidebar').should('contain', 'check and confirm your details');