diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2012-03-01 21:35:55 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2012-03-01 21:35:55 +0000 |
| commit | 7b373378a67a760e5486393c031cb1d9ac265df1 (patch) | |
| tree | 8f4f28c9a88df270cbc391ad7a9bdc341d232cc8 | |
| parent | bddd00fa75258c07e94ac9a668725d7f847c4c1f (diff) | |
No password box needed if signed in, shrink placeholders a bit to fix #243, correct some wording.
| -rw-r--r-- | templates/web/fixmystreet/auth/general.html | 4 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/display.html | 8 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/new/fill_in_details_form.html | 13 |
3 files changed, 13 insertions, 12 deletions
diff --git a/templates/web/fixmystreet/auth/general.html b/templates/web/fixmystreet/auth/general.html index a0cb80726..556d5bb3c 100644 --- a/templates/web/fixmystreet/auth/general.html +++ b/templates/web/fixmystreet/auth/general.html @@ -52,10 +52,10 @@ <label class="hidden-js" for="name">[% loc('Your name') %]</label> <input type="text" name="name" value="" placeholder="[% loc('Your name') %]"> - <label class="hidden-js" for="password_register">[% loc('Enter a new password (optional)') %]</label> + <label class="hidden-js" for="password_register">[% loc('Enter a password (optional)') %]</label> <div class="form-txt-submit-box"> - <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a new password (optional)') %]"> + <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password (optional)') %]"> <input class="green-btn" type="submit" name="email_sign_in" value="[% loc('Sign in') %]"> </div> </div> diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 92a177ffc..b3cfcff6a 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -132,7 +132,7 @@ <input type="email" name="rznvy" id="form_rznvy" value="[% update.user.email | html %]" required> <div id="form_sign_in"> - <h3>[% loc("Now to submit your report…") %]</h3> + <h3>[% loc("Now to submit your update…") %]</h3> <h2>[% loc("Do you have a FixMyStreet password?") %]</h2> <div id="form_sign_in_yes" class="form-box"> @@ -157,10 +157,10 @@ [% INCLUDE name %] - <label class="hidden-js" for="password_register">[% loc('Enter a new password (optional)') %]</label> + <label class="hidden-js" for="password_register">[% loc('Enter a password (optional)') %]</label> <div class="form-txt-submit-box"> - <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a new password (optional)') %]"> + <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password (optional)') %]"> <input class="green-btn" type="submit" name="submit_register" id="submit_register" value="[% loc('Post') %]"> </div> </div> @@ -195,4 +195,4 @@ <input type="checkbox" name="add_alert" id="form_add_alert" value="1"[% ' checked' IF add_alert %]> <label class="inline" for="form_add_alert">[% loc( 'Alert me to future updates' ) %]</label> </div> -[% END %]
\ No newline at end of file +[% END %] diff --git a/templates/web/fixmystreet/report/new/fill_in_details_form.html b/templates/web/fixmystreet/report/new/fill_in_details_form.html index 4578deaf3..63a78a158 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -65,7 +65,7 @@ [% IF field_errors.detail %] <p class='form-error'>[% field_errors.detail %]</p> [% END %] - <textarea name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem here') %]" required>[% report.detail | html %]</textarea> + <textarea name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem.') %]" required>[% report.detail | html %]</textarea> [% IF js %] <div id="form_category_row"> @@ -122,13 +122,14 @@ <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> </div> + <div class="general-sidebar-notes"> + <p>[% loc('We never show your email address or phone number.') %]</p> + </div> + <label class="hidden-js" for="form_phone">[% loc('Your phone number (optional)') %]</label> <input class="" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number (optional)') %]"> - <label class="hidden-js" for="password_register">[% loc('Enter a new password (optional)') %]</label> - <div class="form-txt-submit-box"> - <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a new password (optional)') %]"> <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]"> </div> </div> @@ -186,10 +187,10 @@ <label class="hidden-js" for="form_phone">[% loc('Your phone number (optional)') %]</label> <input class="form-focus-hidden" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number (optional)') %]"> - <label class="hidden-js" for="password_register">[% loc('Enter a new password (optional)') %]</label> + <label class="hidden-js" for="password_register">[% loc('Enter a password (optional)') %]</label> <div class="form-txt-submit-box form-focus-hidden"> - <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a new password (optional)') %]"> + <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password (optional)') %]"> <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]"> </div> </div> |