diff options
Diffstat (limited to 'templates/web/default')
| -rwxr-xr-x | templates/web/default/around/display_location.html | 2 | ||||
| -rw-r--r-- | templates/web/default/auth/general.html | 54 | ||||
| -rw-r--r-- | templates/web/default/auth/sign_out.html (renamed from templates/web/default/auth/logout.html) | 0 | ||||
| -rw-r--r-- | templates/web/default/report/new/notes.html | 2 |
4 files changed, 28 insertions, 30 deletions
diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html index 88300113b..aa1dc86d6 100755 --- a/templates/web/default/around/display_location.html +++ b/templates/web/default/around/display_location.html @@ -23,7 +23,6 @@ pc => pc latitude => short_latitude, longitude => short_longitude, - submit_map => 1, skipped => 1, } ); @@ -37,7 +36,6 @@ %] <form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm"> -<input type="hidden" name="submit_map" value="1"> <input type="hidden" name="map" value="[% c.req.params.map | html %]"> <input type="hidden" name="pc" value="[% pc | html %]"> [% c.cobrand.form_elements('mapForm') %] diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html index b5e6bf6e0..d30fefcee 100644 --- a/templates/web/default/auth/general.html +++ b/templates/web/default/auth/general.html @@ -17,27 +17,25 @@ loc_email_error = errors.$email_error || errors.other; END %] - <div id="fieldset"> + [% IF loc_email_error %] + <div class="form-error">[% loc_email_error %]</div> + [% ELSIF sign_in_error %] + <div class="form-error">[% loc('Email or password wrong - please try again.') %]</div> + [% END %] - [% IF loc_email_error %] - <div class="form-error">[% loc_email_error %]</div> - [% ELSIF login_error %] - <div class="form-error">[% loc('Email or password wrong - please try again.') %]</div> - [% END %] - - - <div class="form-field"> + <div class="form-field"> <label class="n" for="email">[% loc('Your email address:') %]</label> <input type="email" size="30" id="email" name="email" value="[% email | html %]"> - </div> + </div> - <h3 style="margin-bottom:0">[% loc("Do you have a FixMyStreet password?") %]</h3> +<div id="form_sign_in"> + <h3>[% loc("Do you have a FixMyStreet password?") %]</h3> -<div style="float: left; width: 48%; border-right: solid 1px #999999;"> + <div id="form_sign_in_yes"> <p> - <label class="n" for="password_login">[% loc('<strong>Yes</strong>, I have a password:') %]</label> - <input type="password" name="password_login" id="password_login" value=""> + <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password:') %]</label> + <input type="password" name="password_sign_in" id="password_sign_in" value=""> </p> <p> @@ -48,22 +46,24 @@ </p> <p> - <input type="submit" name="login" value="[% loc('Sign in') %]"> + <input type="submit" name="sign_in" value="[% loc('Sign in') %]"> </p> -</div> -<div style="float: right; width: 48%; clear:none;"> + </div> + <div id="form_sign_in_no"> <p>[% loc('<strong>No</strong>, I do not, let me sign in by email:') %]</p> - <div class="form-field"> - <label for="name">[% loc('Your name:') %]</label> - <input type="text" name="name" value=""> - </div> + <div id="fieldset"> + <div class="form-field"> + <label for="name">[% loc('Your name:') %]</label> + <input type="text" name="name" value=""> + </div> - <div class="form-field"> - <label for="password_register">[% loc('Enter a new password:') %]</label> - <input type="password" name="password_register" id="password_register" value=""> + <div class="form-field"> + <label for="password_register">[% loc('Enter a new password:') %]</label> + <input type="password" name="password_register" id="password_register" value=""> + </div> </div> <p><small>Providing a name and password is optional, but doing so @@ -71,12 +71,12 @@ manage your reports.</small></p> <p> - <input type="submit" name="email_login" value="[% loc('Sign in by email') %]"> + <input type="submit" name="email_sign_in" value="[% loc('Sign in by email') %]"> </p> -</div> - </div> + +</div> </form> diff --git a/templates/web/default/auth/logout.html b/templates/web/default/auth/sign_out.html index 3d8df60e4..3d8df60e4 100644 --- a/templates/web/default/auth/logout.html +++ b/templates/web/default/auth/sign_out.html diff --git a/templates/web/default/report/new/notes.html b/templates/web/default/report/new/notes.html index 38c8bfb7b..be605ddaa 100644 --- a/templates/web/default/report/new/notes.html +++ b/templates/web/default/report/new/notes.html @@ -1,4 +1,4 @@ -<p>[% loc("Please note:") %]</p> +<p style="clear:both">[% loc("Please note:") %]</p> <ul> |