diff options
Diffstat (limited to 'templates/web/base')
30 files changed, 133 insertions, 133 deletions
diff --git a/templates/web/base/alert/_list.html b/templates/web/base/alert/_list.html index f94ce84f8..388e0e9bc 100644 --- a/templates/web/base/alert/_list.html +++ b/templates/web/base/alert/_list.html @@ -88,7 +88,7 @@ for the county council.', "%s is the site name"), site_name) %] [% UNLESS c.user_exists %] <label for="rznvy">[% loc('Your email') %]</label> - <input type="text" id="rznvy" name="rznvy" value="[% rznvy | html %]"> + <input class="form-control" type="text" id="rznvy" name="rznvy" value="[% rznvy | html %]"> [% END %] <input id="alert_email_button" style="margin-top:1em;" class="green-btn" type="submit" name="alert" value="[% loc('Subscribe me to an email alert') %]"> diff --git a/templates/web/base/alert/index.html b/templates/web/base/alert/index.html index 4965a1103..5c61e93d9 100644 --- a/templates/web/base/alert/index.html +++ b/templates/web/base/alert/index.html @@ -30,7 +30,7 @@ within a certain distance of a particular location.', "%s is the site name"), si <form method="get" action="/alert/list" class="form-box"> <fieldset> <div class="form-txt-submit-box"> - <input type="text" name="pc" value="[% pc | html %]" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> + <input class="form-control" type="text" name="pc" value="[% pc | html %]" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> <input class="green-btn" type="submit" value="[% loc('Go') %]"> </div> </fieldset> diff --git a/templates/web/base/alert/updates.html b/templates/web/base/alert/updates.html index ecaed37ca..82e99d49a 100644 --- a/templates/web/base/alert/updates.html +++ b/templates/web/base/alert/updates.html @@ -19,7 +19,7 @@ <label class="hidden n" for="alert_rznvy">[% loc('Your email') %]</label> <div class="form-txt-submit-box"> - <input type="email" name="rznvy" id="alert_rznvy" value="[% email | html %]" placeholder="[% loc('Your email') %]"> + <input class="form-control" type="email" name="rznvy" id="alert_rznvy" value="[% email | html %]" placeholder="[% loc('Your email') %]"> <input class="green-btn" type="submit" value="[% loc('Subscribe') %]"> </div> diff --git a/templates/web/base/auth/change_email.html b/templates/web/base/auth/change_email.html index 58c864929..471782e42 100644 --- a/templates/web/base/auth/change_email.html +++ b/templates/web/base/auth/change_email.html @@ -24,7 +24,7 @@ <div class="form-field"> <label for="email">[% loc('New email address:') %]</label> - <input type="email" name="email" id="email" value="[% email | html %]"> + <input class="form-control" type="email" name="email" id="email" value="[% email | html %]"> </div> <div class="final-submit"> <input type="submit" value="[% loc('Change email address') %]"> diff --git a/templates/web/base/auth/change_password.html b/templates/web/base/auth/change_password.html index 80708abb1..50ecc93a2 100644 --- a/templates/web/base/auth/change_password.html +++ b/templates/web/base/auth/change_password.html @@ -17,7 +17,7 @@ INCLUDE 'header.html', title = loc('Change password'), bodyclass = bclass <form action="[% c.uri_for('change_password') %]" method="post" name="change_password" class="fieldset"> <input type="hidden" name="token" value="[% csrf_token %]"> - + <fieldset> [% IF password_error; @@ -26,18 +26,18 @@ INCLUDE 'header.html', title = loc('Change password'), bodyclass = bclass mismatch => loc('The passwords do not match'), other => loc('Please check the passwords and try again'), }; - + loc_password_error = errors.$password_error || errors.other; %] <div class="form-error">[% loc_password_error %]</div> [% END %] <div class="form-field"> <label for="new_password">[% loc('New password:') %]</label> - <input type="password" name="new_password" value="[% new_password | html %]"> + <input class="form-control" type="password" name="new_password" value="[% new_password | html %]"> </div> <div class="form-field"> <label for="confirm">[% loc('Again:') %]</label> - <input type="password" name="confirm" value="[% confirm | html %]"> + <input class="form-control" type="password" name="confirm" value="[% confirm | html %]"> </div> <div class="final-submit"> <input type="submit" value="[% loc('Change password') %]"> diff --git a/templates/web/base/auth/general.html b/templates/web/base/auth/general.html index a8bf8f1e0..cf539ff4f 100644 --- a/templates/web/base/auth/general.html +++ b/templates/web/base/auth/general.html @@ -52,7 +52,7 @@ [% ELSIF sign_in_error %] <div class="form-error">[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form.') %]</div> [% END %] - <input type="email" class="required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]" autofocus> + <input type="email" class="form-control required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]" autofocus> <div id="form_sign_in"> <h3>[% tprintf(loc("Do you have a %s password?", "%s is the site name"), site_name) %]</h3> @@ -82,7 +82,7 @@ <label class="hidden-js n" for="password_sign_in">[% loc('Password:') %]</label> <div class="form-txt-submit-box"> - <input type="password" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]"> + <input type="password" name="password_sign_in" class="form-control" id="password_sign_in" value="" placeholder="[% loc('Your password') %]"> <input class="green-btn" type="submit" name="sign_in" value="[% loc('Sign in') %]"> </div> @@ -104,7 +104,7 @@ <h5>[% loc('<strong>No</strong> let me sign in by email') %]</h5> <label for="name">[% loc('Name') %]</label> - <input type="text" name="name" value="" placeholder="[% loc('Your name') %]"> + <input class="form-control" type="text" name="name" value="" placeholder="[% loc('Your name') %]"> <label for="password_register">[% loc('Password (optional)') %]</label> @@ -113,7 +113,7 @@ </div> <div class="form-txt-submit-box"> - <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> + <input class="form-control" type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> <input class="green-btn" type="submit" name="email_sign_in" value="[% loc('Sign in') %]"> </div> </div> diff --git a/templates/web/base/contact/index.html b/templates/web/base/contact/index.html index 86a0cec0d..536b95527 100644 --- a/templates/web/base/contact/index.html +++ b/templates/web/base/contact/index.html @@ -11,7 +11,7 @@ [% ELSE %] <h1>[% loc('Contact the team') %]</h1> [% END %] - + <form method="post" action="/contact/submit" class="validate"> <fieldset> [% INCLUDE 'errors.html' %] @@ -77,21 +77,21 @@ [% IF field_errors.name %] <div class="form-error">[% field_errors.name %]</div> [% END %] - <input type="text" class="required" name="name" id="form_name" value="[% form_name | html %]" size="30"> + <input type="text" class="form-control required" name="name" id="form_name" value="[% form_name | html %]" size="30"> <label for="form_email">[% loc('Your email') %]</label> [% IF field_errors.em %] <div class="form-error">[% field_errors.em %]</div> [% END %] - <input type="text" class="required email" name="em" id="form_email" value="[% em | html %]" size="30"> + <input type="text" class="form-control required email" name="em" id="form_email" value="[% em | html %]" size="30"> <label for="form_subject">[% loc('Subject') %]</label> [% IF field_errors.subject %] <div class="form-error">[% field_errors.subject %]</div> [% END %] - <input type="text" class="required" name="subject" id="form_subject" value="[% subject | html %]" size="30"> + <input type="text" class="form-control required" name="subject" id="form_subject" value="[% subject | html %]" size="30"> [% INCLUDE 'contact/who.html' %] @@ -99,7 +99,7 @@ [% IF field_errors.message %] <div class="form-error">[% field_errors.message %]</div> [% END %] - <textarea class="required" name="message" id="form_message" rows="7" cols="50">[% message | html %]</textarea> + <textarea class="form-control required" name="message" id="form_message" rows="7" cols="50">[% message | html %]</textarea> <input class="final-submit green-btn" type="submit" value="[% loc('Post') %]"> diff --git a/templates/web/base/questionnaire/index.html b/templates/web/base/questionnaire/index.html index 7a7e433a1..217bd827e 100644 --- a/templates/web/base/questionnaire/index.html +++ b/templates/web/base/questionnaire/index.html @@ -70,7 +70,7 @@ <p>[% loc('If you wish to leave a public update on the problem, please enter it here (please note it will not be sent to the council).') %]</p> -<p><textarea name="update" rows="7" cols="30" placeholder="[% loc('What was your experience of getting the problem fixed?') %]">[% update | html %]</textarea></p> +<p><textarea class="form-control" name="update" rows="7" cols="30" placeholder="[% loc('What was your experience of getting the problem fixed?') %]">[% update | html %]</textarea></p> [% IF c.cobrand.allow_photo_upload %] <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> diff --git a/templates/web/base/report/new/after_photo.html b/templates/web/base/report/new/after_photo.html index fb07ed056..b337977e4 100644 --- a/templates/web/base/report/new/after_photo.html +++ b/templates/web/base/report/new/after_photo.html @@ -1,5 +1,4 @@ -<div class="description_tips"> - <h4>[% loc('Tips for perfect photos') %]</h4> +<div class="description_tips" aria-label="[% loc('Tips for perfect photos') %]"> <ul class="do"> <li>[% loc('For best results include a close-up and a wide shot') %]</li> </ul> diff --git a/templates/web/base/report/new/category.html b/templates/web/base/report/new/category.html index ba6347d39..d63649083 100644 --- a/templates/web/base/report/new/category.html +++ b/templates/web/base/report/new/category.html @@ -1,14 +1,14 @@ [% IF category_options.size ~%] [% IF category; - category = category | lower; + category_lc = category | lower; END; ~%] <label for='form_category' id="form_category_label"> [%~ loc('Category') ~%] </label>[% =%] - <select name='category' id='form_category'> + <select class="form-control" name='category' id='form_category'> [%~ FOREACH cat_op IN category_options ~%] [% cat_op_lc = cat_op | lower =%] - <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op || category == cat_op_lc || (category_options.size == 2 AND loop.last) ~%] + <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op || category_lc == cat_op_lc || (category_options.size == 2 AND loop.last) ~%] >[% IF loop.first %][% cat_op %][% ELSE %][% cat_op | html %][% END %]</option> [%~ END =%] </select> diff --git a/templates/web/base/report/new/category_extras.html b/templates/web/base/report/new/category_extras.html index c416556e2..6b01f93e0 100644 --- a/templates/web/base/report/new/category_extras.html +++ b/templates/web/base/report/new/category_extras.html @@ -1,30 +1,39 @@ -<div id="category_meta"> - [%- category = report.category -%] +[% DEFAULT list_of_names = bodies_to_list_names %] - [%- IF unresponsive.$category %] - [% INCLUDE "report/new/unresponsive_body.html" body_id = unresponsive.$category %] - [%- END %] +<div id="category_meta"> + [%- IF unresponsive.$category %] + [%# Note: this is only shown on FMS.com %] + [% INCLUDE "report/new/unresponsive_body.html" body_id = unresponsive.$category %] + [%- END %] - [%- IF category_extras.$category.size %] - <h4>[% loc('Additional Information') %]</h4> - [%- FOR meta IN category_extras.$category %] + [%- IF category_extras.$category.size %] + <div class="extra-category-questions full-width"> + <h2 class="form-section-heading">[% category %]</h2> + <p class="form-section-description"> + [% tprintf( + loc('Help <strong>%s</strong> resolve your problem quicker, by providing some extra detail. This extra information will not be published online.'), + list_of_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) + ); %] + </p> + [%- FOR meta IN category_extras.$category %] [%- meta_name = meta.code -%] - <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label> - [% IF field_errors.$meta_name %] - <p class='form-error'>[% field_errors.$meta_name %]</p> - [% END -%] - [% IF meta.variable != 'false' %] - [% IF meta.exists('values') %] - <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> - [% FOR option IN meta.values %] - <option value="[% option.key %]"[% IF option.key == report_meta.$meta_name.value %] selected[% END %]>[% option.name %]</option> - [% END %] - </select> - [% ELSE %] - <input type="text" value="[% report_meta.$meta_name.value | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> - [% END %] - [% END %] - [%- END %] - [%- END %] + <label for="form_[% meta_name %]">[% meta.description %]</label> + [% IF field_errors.$meta_name %] + <p class='form-error'>[% field_errors.$meta_name %]</p> + [% END -%] + [% IF meta.variable != 'false' %] + [% IF meta.exists('values') %] + <select class="form-control" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> + [% FOR option IN meta.values %] + <option value="[% option.key %]"[% IF option.key == report_meta.$meta_name.value %] selected[% END %]>[% option.name %]</option> + [% END %] + </select> + [% ELSE %] + <input class="form-control" type="text" value="[% report_meta.$meta_name.value | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> + [% END %] + [% END %] + [%- END %] + </div> + [%- END %] </div> diff --git a/templates/web/base/report/new/category_wrapper.html b/templates/web/base/report/new/category_wrapper.html index f6bb618f0..85b085999 100644 --- a/templates/web/base/report/new/category_wrapper.html +++ b/templates/web/base/report/new/category_wrapper.html @@ -1,7 +1,7 @@ [% IF js %] <div id="form_category_row"> <label for="form_category">[% loc('Category') %]</label> - <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> + <select class="form-control" name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> </div> [% ELSE %] [% IF category_options.size %] diff --git a/templates/web/base/report/new/councils_extra_text.html b/templates/web/base/report/new/councils_extra_text.html deleted file mode 100644 index b77758b01..000000000 --- a/templates/web/base/report/new/councils_extra_text.html +++ /dev/null @@ -1 +0,0 @@ -[% loc('The summary and description will also be made public (see our <a href="/privacy">privacy policy</a>).') %] diff --git a/templates/web/base/report/new/councils_text.html b/templates/web/base/report/new/councils_text.html index 65e41f0d1..bab30e8f9 100644 --- a/templates/web/base/report/new/councils_text.html +++ b/templates/web/base/report/new/councils_text.html @@ -1,11 +1,10 @@ [% FILTER collapse %] -[% IF unresponsive.ALL %] - [% PROCESS 'report/new/unresponsive_body.html' body_id = unresponsive.ALL %] -[% ELSIF bodies_to_list.size == 0 %] - [% PROCESS 'report/new/councils_text_none.html' %] -[% ELSIF bodies_to_list.size == bodies.size %] - [% PROCESS 'report/new/councils_text_all.html' %] +[% IF unresponsive.$category OR unresponsive.ALL OR bodies_to_list.size == 0 %] + [% tprintf( + loc('These will be published online for others to see, in accordance with our <a href="%s">privacy policy</a>.'), + '/privacy') + %] [% ELSE %] - [% PROCESS 'report/new/councils_text_some.html' %] + [% PROCESS 'report/new/councils_text_all.html' %] [% END %] [% END -%] diff --git a/templates/web/base/report/new/councils_text_all.html b/templates/web/base/report/new/councils_text_all.html index 9947625a5..9a11eaae6 100644 --- a/templates/web/base/report/new/councils_text_all.html +++ b/templates/web/base/report/new/councils_text_all.html @@ -1,10 +1,12 @@ +[% DEFAULT list_of_names = bodies_to_list_names %] + <p> [% tprintf( - loc('All the information you provide here will be sent to <strong>%s</strong>.'), - all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) + loc('These will be sent to <strong>%s</strong> and also published online for others to see, in accordance with our <a href="%s">privacy policy</a>.'), + list_of_names.join( '</strong>' _ loc(' or ') _ '<strong>' ), '/privacy' ); %] -[% INCLUDE 'report/new/councils_extra_text.html' %] +[% TRY %][% INCLUDE 'report/new/councils_extra_text.html' %][% CATCH file %][% END %] </p> diff --git a/templates/web/base/report/new/councils_text_private.html b/templates/web/base/report/new/councils_text_private.html new file mode 100644 index 000000000..4ee7846f1 --- /dev/null +++ b/templates/web/base/report/new/councils_text_private.html @@ -0,0 +1,8 @@ +[% FILTER collapse %] +[% IF unresponsive.$category OR unresponsive.ALL OR bodies_to_list.size == 0 %] + [% loc('These will never be shown online.') %] +[% ELSE %] + [% loc('These will be sent to the council, but will never be shown online.') %] +[% END %] +(<a href="/privacy">[% loc('See our privacy policy') %]</a>.) +[% END -%] diff --git a/templates/web/base/report/new/fill_in_details_form.html b/templates/web/base/report/new/fill_in_details_form.html index 663b13e6a..f8714f573 100644 --- a/templates/web/base/report/new/fill_in_details_form.html +++ b/templates/web/base/report/new/fill_in_details_form.html @@ -4,17 +4,9 @@ <p class="change_location">[% loc('Wrong location? Just click again on the map.') %]</p> [% END %] -[% IF js %] - <p id="councils_text"> - [% tprintf( - loc('All the information you provide here will be sent to <strong>%s</strong>.'), - loc('the local council') - ); %] - [% loc('The summary and description will also be made public (see our <a href="/privacy">privacy policy</a>).') %] - </p> -[% ELSE %] - [% PROCESS 'report/new/councils_text.html' %] -[% END %] +<div id="js-top-message"> + [% PROCESS 'report/new/top_message.html' %] +</div> [% IF report.used_map && partial_token %] <p id="unknown">[% loc('Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit.') %]</p> @@ -30,10 +22,6 @@ <fieldset> <div id="problem_form"> [% PROCESS 'report/new/form_report.html' %] - [% IF c.user_exists %] - [% PROCESS "report/new/form_user_loggedin.html" %] - [% ELSE %] - [% PROCESS "report/new/form_user_loggedout.html" %] - [% END %] + [% PROCESS 'report/new/form_user.html' %] </div> </fieldset> diff --git a/templates/web/base/report/new/form_report.html b/templates/web/base/report/new/form_report.html index d9320d166..3c36bd0cc 100644 --- a/templates/web/base/report/new/form_report.html +++ b/templates/web/base/report/new/form_report.html @@ -4,25 +4,28 @@ <p class='form-error'>[% field_errors.bodies %]</p> [% END %] -[% TRY %] - [%# Useful for amending form contents based on category selection %] - [% PROCESS 'report/new/category_at_top.html' %] - [% need_to_show_category_selector = 0 %] -[% CATCH file %] - [% need_to_show_category_selector = 1 %] -[% END %] +[% PROCESS "report/new/category_wrapper.html" %] +[% TRY %][% PROCESS 'report/new/after_category.html' %][% CATCH file %][% END %] + + <h2 class="form-section-heading">Public details</h2> + <div class="form-section-description" id="js-councils_text"> + [% IF js %] + [% PROCESS 'report/new/councils_text_all.html' list_of_names = [ loc('the local council') ] %] + [% ELSE %] + [% PROCESS 'report/new/councils_text.html' %] + [% END %] + </div> - <label for="form_title">[% loc('Summarise the problem') %] [% INCLUDE 'report/public_label.html' %]</label> + <label for="form_title">[% loc('Summarise the problem') %]</label> [% IF field_errors.title %] <p class='form-error'>[% field_errors.title %]</p> [% END %] - <input type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="[% loc('10 inch pothole on Example St, near post box') %]" required> + <input class="form-control" type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="[% loc('10 inch pothole on Example St, near post box') %]" required> [% IF c.cobrand.allow_photo_upload %] <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> <label for="form_photo"> <span data-singular="[% loc('Photo') %]" data-plural="[% loc('Photos') %]">[% loc('Photo') %]</span> - [% INCLUDE 'report/public_label.html' %] </label> [% IF field_errors.photo %] @@ -46,20 +49,14 @@ [% TRY %][% PROCESS 'report/new/after_photo.html' %][% CATCH file %][% END %] - <label for="form_detail">[% loc('Explain what’s wrong') %] [% INCLUDE 'report/public_label.html' %]</label> + <label for="form_detail">[% loc('Explain what’s wrong') %]</label> [% IF field_errors.detail %] <p class='form-error'>[% field_errors.detail %]</p> [% END %] - <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('This pothole has been here for two months and…') %]" required>[% report.detail | html %]</textarea> + <textarea class="form-control" rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('This pothole has been here for two months and…') %]" required>[% report.detail | html %]</textarea> [% TRY %][% PROCESS 'report/new/inline-tips.html' %][% CATCH file %][% END %] -[% IF need_to_show_category_selector %] - [% PROCESS "report/new/category_wrapper.html" %] -[% END %] - -[% TRY %][% PROCESS 'report/new/after_category.html' %][% CATCH file %][% END %] - [% IF partial_token %] <input type="hidden" name="partial" value="[% partial_token.token %]"> [% END %] diff --git a/templates/web/base/report/new/form_user.html b/templates/web/base/report/new/form_user.html new file mode 100644 index 000000000..424660aa8 --- /dev/null +++ b/templates/web/base/report/new/form_user.html @@ -0,0 +1,15 @@ +<h2 class="form-section-heading form-section-heading--private">Private details</h2> +<p class="form-section-description" id="js-councils_text_private"> + [% IF js %] + [% loc('These will be sent to the council, but will never be shown online.') %] + (<a href="/privacy">[% loc('See our privacy policy') %]</a>.) + [% ELSE %] + [% PROCESS 'report/new/councils_text_private.html' %] + [% END %] +</p> + +[% IF c.user_exists %] + [% PROCESS "report/new/form_user_loggedin.html" %] +[% ELSE %] + [% PROCESS "report/new/form_user_loggedout.html" %] +[% END %] diff --git a/templates/web/base/report/new/form_user_loggedin.html b/templates/web/base/report/new/form_user_loggedin.html index 34dd4979c..7fc1b1b5f 100644 --- a/templates/web/base/report/new/form_user_loggedin.html +++ b/templates/web/base/report/new/form_user_loggedin.html @@ -14,7 +14,7 @@ [% BLOCK form_as %] <label for="form_as">[% loc('Report as') %]</label> - <select id="form_as" class="js-contribute-as" name="form_as"> + <select id="form_as" class="form-control js-contribute-as" name="form_as"> <option value="myself" selected>[% loc('Yourself') %]</option> [% IF js || can_contribute_as_another_user %] <option value="another_user">[% loc('Another user') %]</option> @@ -26,7 +26,7 @@ [% END %] <label for="form_email">[% loc('Email address') %]</label> - <input id="form_email" + <input class="form-control" id="form_email" [%- IF js OR can_contribute_as_another_user OR can_contribute_as_body -%] name="email" [%- ELSE -%] @@ -46,7 +46,7 @@ [% IF field_errors.name %] <p class='form-error'>[% field_errors.name %]</p> [% END %] - <input type="text" class="validName js-form-name" value="[% report.name | html %]" name="name" id="form_name"> + <input type="text" class="form-control validName js-form-name" value="[% report.name | html %]" name="name" id="form_name"> [%# if there is nothing in the name field then set check box as default on form %] <div class="checkbox-group"> @@ -55,11 +55,7 @@ </div> <label for="form_phone">[% loc('Phone number (optional)') %]</label> - <input class="" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone"> - - <div class="general-notes"> - <p>[% loc('We never show your email address or phone number.') %]</p> - </div> + <input class="form-control" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone"> <div class="form-txt-submit-box"> <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]"> diff --git a/templates/web/base/report/new/form_user_loggedout.html b/templates/web/base/report/new/form_user_loggedout.html index 889834580..c444ebce4 100644 --- a/templates/web/base/report/new/form_user_loggedout.html +++ b/templates/web/base/report/new/form_user_loggedout.html @@ -1,6 +1,4 @@ [% IF c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY %] - <h3>[% loc("Now to submit your report…") %]</h3> - [% IF c.config.FACEBOOK_APP_ID %] <div class="form-box"> <button name="facebook_sign_in" id="facebook_sign_in" value="facebook_sign_in" class="btn btn--block btn--social btn--facebook"> @@ -21,7 +19,6 @@ [% PROCESS 'report/new/form_user_loggedout_email.html' required = 0 %] [% ELSE %] [% PROCESS 'report/new/form_user_loggedout_email.html' required = 1 %] - <h3>[% loc("Now to submit your report…") %]</h3> [% END %] <div id="form_sign_in"> diff --git a/templates/web/base/report/new/form_user_loggedout_by_email.html b/templates/web/base/report/new/form_user_loggedout_by_email.html index 0b2f3859e..409fd4bbf 100644 --- a/templates/web/base/report/new/form_user_loggedout_by_email.html +++ b/templates/web/base/report/new/form_user_loggedout_by_email.html @@ -14,7 +14,7 @@ <p class='form-error'>[% field_errors.name %]</p> [% END %] - <input type="text" class="form-focus-trigger validName js-form-name" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> + <input type="text" class="form-control form-focus-trigger validName js-form-name" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> [%# if there is nothing in the name field then set check box as default on form %] <div class="checkbox-group"> @@ -23,10 +23,7 @@ </div> <label class="form-focus-hidden" for="form_phone">[% loc('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') %]"> - <div class="general-notes form-focus-hidden"> - <p>[% loc('We never show your email address or phone number.') %]</p> - </div> + <input class="form-control form-focus-hidden" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]"> <label class="form-focus-hidden" for="password_register">[% loc('Password (optional)') %]</label> @@ -35,7 +32,7 @@ </div> <div class="form-txt-submit-box form-focus-hidden"> - <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> + <input class="form-control" type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]"> </div> </div> diff --git a/templates/web/base/report/new/form_user_loggedout_email.html b/templates/web/base/report/new/form_user_loggedout_email.html index 4f816f8cc..39e9fd779 100644 --- a/templates/web/base/report/new/form_user_loggedout_email.html +++ b/templates/web/base/report/new/form_user_loggedout_email.html @@ -1,9 +1,7 @@ -<label for="form_email">[% loc('Your email') %] - <span class="muted">([% loc('We never show your email') %])</span> -</label> +<label for="form_email">[% loc('Your email') %]</label> [% IF field_errors.email %] <p class='form-error'>[% field_errors.email %]</p> [% END %] -<input type="email" value="[% report.user.email | html %]" name="email" id="form_email" placeholder="[% loc('Please enter your email address') %]" +<input class="form-control" type="email" value="[% report.user.email | html %]" name="email" id="form_email" placeholder="[% loc('Please enter your email address') %]" [% IF required %]required[% END %] class="required"> diff --git a/templates/web/base/report/new/form_user_loggedout_password.html b/templates/web/base/report/new/form_user_loggedout_password.html index 0f234aeba..a4d1aefe0 100644 --- a/templates/web/base/report/new/form_user_loggedout_password.html +++ b/templates/web/base/report/new/form_user_loggedout_password.html @@ -7,7 +7,7 @@ <p class='form-error'>[% field_errors.password %]</p> [% END %] <div class="form-txt-submit-box"> - <input type="password" name="password_sign_in" id="password_sign_in" placeholder="[% loc('Your password') %]" value=""> + <input class="form-control" type="password" name="password_sign_in" id="password_sign_in" placeholder="[% loc('Your password') %]" value=""> <input class="green-btn js-submit_sign_in" type="submit" name="submit_sign_in" value="[% loc('Submit') %]"> </div> diff --git a/templates/web/base/report/new/top_message.html b/templates/web/base/report/new/top_message.html new file mode 100644 index 000000000..2d21c9cee --- /dev/null +++ b/templates/web/base/report/new/top_message.html @@ -0,0 +1,9 @@ +[% FILTER collapse ~%] +[%~ IF unresponsive.ALL ~%] + [% PROCESS 'report/new/unresponsive_body.html' body_id = unresponsive.ALL %] +[%~ ELSIF bodies_to_list.size == 0 # On a /new page, no bodies ~%] + <div class="box-warning">[% PROCESS 'report/new/top_message_none.html' %]</div> +[%~ ELSIF bodies_to_list.size != bodies.size # On a /new page, some missing bodies ~%] + <div class="box-warning">[% PROCESS 'report/new/top_message_some.html' %]</div> +[%~ END ~%] +[%~ END ~%] diff --git a/templates/web/base/report/new/councils_text_none.html b/templates/web/base/report/new/top_message_none.html index 6a1a2bc67..85caf944c 100644 --- a/templates/web/base/report/new/councils_text_none.html +++ b/templates/web/base/report/new/top_message_none.html @@ -7,7 +7,7 @@ ); %] [% - loc("If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council."); + loc("If you submit a problem here the problem will <strong>not</strong> be reported to the council."); %] [% tprintf( diff --git a/templates/web/base/report/new/councils_text_some.html b/templates/web/base/report/new/top_message_some.html index 70cb97617..efc8fe4cc 100644 --- a/templates/web/base/report/new/councils_text_some.html +++ b/templates/web/base/report/new/top_message_some.html @@ -1,14 +1,4 @@ <p> -[% loc('All the information you provide here will be sent to') %] - -[% FOREACH body_id IN bodies_to_list %] - [% loc( ' or ') IF ! loop.first %] - <strong>[% bodies.$body_id.name %]</strong> - [%- '.' IF loop.last %] -[% END %] - -[% loc('The summary and description will also be made public (see our <a href="/privacy">privacy policy</a>).') %] - [% nget( "We do <strong>not</strong> yet have details for the other council that covers this location.", diff --git a/templates/web/base/report/public_label.html b/templates/web/base/report/public_label.html deleted file mode 100644 index 2e00a79d2..000000000 --- a/templates/web/base/report/public_label.html +++ /dev/null @@ -1 +0,0 @@ -<span class="muted label-warning public-warning">[% loc('(public)') %]</span> diff --git a/templates/web/base/report/update/form_name.html b/templates/web/base/report/update/form_name.html index dd4c12151..19c31998e 100644 --- a/templates/web/base/report/update/form_name.html +++ b/templates/web/base/report/update/form_name.html @@ -17,7 +17,7 @@ [% END %] </select> <label for="form_email">[% loc('Email address') %]</label> - <input name="rznvy" id="form_email" type="text" value="[% c.user.email | html %]"> + <input class="form-control" name="rznvy" id="form_email" type="text" value="[% c.user.email | html %]"> [% END %] <label for="form_name">[% loc('Name') %]</label> @@ -25,7 +25,7 @@ <p class='form-error'>[% field_errors.name %]</p> [% END %] -<input type="text" class="validName js-form-name" +<input type="text" class="form-control validName js-form-name" name="name" id="form_name" value="[% update.name || c.user.name | html %]" placeholder="[% loc('Your name') %]"> <div class="checkbox-group"> diff --git a/templates/web/base/report/update/form_user_loggedout_email.html b/templates/web/base/report/update/form_user_loggedout_email.html index 95a3b5578..38f172148 100644 --- a/templates/web/base/report/update/form_user_loggedout_email.html +++ b/templates/web/base/report/update/form_user_loggedout_email.html @@ -1,6 +1,4 @@ -<label for="form_rznvy">[% loc('Your email' ) %] -<span class="muted">([% loc('We never show your email') %])</span> -</label> +<label for="form_rznvy">[% loc('Your email' ) %]</label> [% IF field_errors.email %] <p class='form-error'>[% field_errors.email %]</p> [% END %] |