diff options
16 files changed, 239 insertions, 279 deletions
diff --git a/templates/web/fixmystreet/around/around_index.html b/templates/web/fixmystreet/around/around_index.html index c07eb2ca2..53deec871 100644 --- a/templates/web/fixmystreet/around/around_index.html +++ b/templates/web/fixmystreet/around/around_index.html @@ -14,12 +14,15 @@ %] <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> - <label for="pc">[% question %]:</label> <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200"> <input type="submit" value="[% loc('Go') %]" id="submit"> - -[% IF partial_token %] - <input type="hidden" name="partial" value="[% partial_token.token %]"> -[% END %] + <fieldset> + <label for="pc">[% question %]:</label> + <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200"> + <input type="submit" value="[% loc('Go') %]" id="submit"> + [% IF partial_token %] + <input type="hidden" name="partial" value="[% partial_token.token %]"> + [% END %] + </fieldset> </form> [% IF location_offshore %] @@ -46,4 +49,4 @@ -[% INCLUDE 'footer.html' %] +[% INCLUDE 'footer.html' %]
\ No newline at end of file diff --git a/templates/web/fixmystreet/around/around_map_list_items.html b/templates/web/fixmystreet/around/around_map_list_items.html index e248ce3ed..bd57d0a26 100644 --- a/templates/web/fixmystreet/around/around_map_list_items.html +++ b/templates/web/fixmystreet/around/around_map_list_items.html @@ -13,4 +13,4 @@ [% END %] [% ELSE %] <li>[% loc('No problems found.') %]</li> -[% END %] +[% END %]
\ No newline at end of file diff --git a/templates/web/fixmystreet/around/display_location.html b/templates/web/fixmystreet/around/display_location.html index b5705a77b..3c17a2ec7 100755 --- a/templates/web/fixmystreet/around/display_location.html +++ b/templates/web/fixmystreet/around/display_location.html @@ -36,91 +36,78 @@ %] <form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm" enctype="multipart/form-data" class="validate"> -[% IF c.req.params.map_override %] -<input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> -[% END %] -<input type="hidden" name="pc" value="[% pc | html %]"> + [% IF c.req.params.map_override %] + <input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> + [% END %] + <input type="hidden" name="pc" value="[% pc | html %]"> -<input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> -<input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> + <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> + <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> -[% map_html %] + [% map_html %] -<p id='sub_map_links'> - [% IF c.req.params.no_pins %] - <a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 0 } ) %]'>[% loc('Show pins') %]</a> - [% ELSE %] - <a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 1 } ) %]'>[% loc('Hide pins') %]</a> - [% END %] - [% IF c.cobrand.country == 'GB' || c.cobrand.country == 'NO' %] - | - [% IF c.req.params.all_pins %] - <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => undef } ) %]'>[% loc('Hide stale reports') %]</a> - [% ELSE %] - <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => 1 } ) %]'>[% loc('Include stale reports') %]</a> - [% END %] - [% END %] -</p> - -</div> -<div id="side"> - -<p id="text_map" class="banner"> - [% loc( 'To <strong>report a problem</strong>, click on the map at the correct location.' ) %] - [% - tprintf( - loc("<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"), - url_skip - ) - %] - <span id="text_map_arrow"></span> -</p> - -<h1>[% loc('Problems in this area') %]</h1> - -<p id="alert_links_area"> - <a id="email_alert" rel="nofollow" href="[% email_url | html %]"> - [%- loc('Email me new local problems') -%] -</a> | - <a href="[% rss_url | html %]" id="rss_alert"> - <span>[% rss_alt %]</span> - <img src="/i/feed.png" width="16" height="16" title="[% rss_title %]" alt="[% rss_alt %]" border="0" style="vertical-align: top"> - </a> -</p> - -<div id="nearby_lists"> - - <h2>[% loc('Reports on and around the map') %]</h2> - - <ul id="current"> - [% INCLUDE "around/on_map_list_items.html" %] - </ul> - - - <h2> - [% - tprintf( - loc( 'Closest nearby problems <small>(within %skm)</small>' ), - distance - ) - %] - </h2> - - <ul id="current_near"> - [% INCLUDE "around/around_map_list_items.html" %] - </ul> + <p id='sub_map_links'> + [% IF c.req.params.no_pins %] + <a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 0 } ) %]'>[% loc('Show pins') %]</a> + [% ELSE %] + <a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 1 } ) %]'>[% loc('Hide pins') %]</a> + [% END %] + [% IF c.cobrand.country == 'GB' || c.cobrand.country == 'NO' %] + | + [% IF c.req.params.all_pins %] + <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => undef } ) %]'>[% loc('Hide stale reports') %]</a> + [% ELSE %] + <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => 1 } ) %]'>[% loc('Include stale reports') %]</a> + [% END %] + [% END %] + </p> -</div> + </div> -</div> -<div style="display:none" id="side-form"> -[% INCLUDE "report/new/fill_in_details_form.html" - js = 1, - report.used_map = 1 -%] -</div> + + + + <h1>[% loc( 'Click on the map to report a problem.' ) %]</h1> + + <p> + [% + tprintf( + loc("<small>Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>.</small>"), + url_skip + ) + %] + </p> + + <div class="shadow-wrap"> + <ul id="key-tools"> + <li><a href="[% rss_url | html %]" id="rss_alert">[% rss_alt %]</a></li> + <li><a id="email_alert" rel="nofollow" href="[% email_url | html %]">[%- loc('Email me new local problems') -%]</a></li> + </ul> + </div> + + + <section class="full-width"> + <h4 class="static-with-rule">[% loc('Problems on the map') %]</h4> + + <ul class="issue-list"> + [% INCLUDE "around/on_map_list_items.html" %] + </ul> + + <h4 class="static-with-rule">[% loc( 'Problems nearby' ) %]</h4> + + <ul class="issue-list"> + [% INCLUDE "around/around_map_list_items.html" %] + </ul> + </section> + + <div style="display:none" id="side-form"> + [% INCLUDE "report/new/fill_in_details_form.html" + js = 1, + report.used_map = 1 + %] + </div> </form> -[% INCLUDE 'footer.html' %] +[% INCLUDE 'footer.html' %]
\ No newline at end of file diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index 653cf75f4..4d5b0243a 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -45,7 +45,7 @@ <li>[% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] <li class="last"><a href="/auth/sign_out">[% loc('Sign out') %]</a></li> [% ELSE %] - <li> </li> + <li><a href="/auth">[% loc('Sign in') %]</a></li> [% END %] </ul> </div> diff --git a/templates/web/fixmystreet/report/_main.html b/templates/web/fixmystreet/report/_main.html index 8cc1efec2..60bf60d57 100644 --- a/templates/web/fixmystreet/report/_main.html +++ b/templates/web/fixmystreet/report/_main.html @@ -1,6 +1,7 @@ <h1>[% problem.title | html %]</h1> -<p><em>[% problem.meta_line(c) | html %] +<p><em> +[% problem.meta_line(c) | html %] [% IF problem.council %] [% IF problem.whensent %] <small class="council_sent_info"><br>[% problem.duration_string(c) %]</small> @@ -8,11 +9,8 @@ [% ELSE %] <br><small>[% loc('Not reported to council') %]</small> [% END %] - </em></p> [% add_links( problem.detail ) | html_para %] -[% INCLUDE 'report/photo.html' object=problem center=1 %] - - +[% INCLUDE 'report/photo.html' object=problem center=1 %]
\ No newline at end of file diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 0cdfae49f..f8224ab12 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -11,7 +11,7 @@ [% map_html %] </div> -<div id="side"> + [% IF banner.id %] <p class="banner" id="[% banner.id %]">[% banner.text %]</p> @@ -162,7 +162,7 @@ </form> </div> -</div> + [% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/report/new/category_extras.html b/templates/web/fixmystreet/report/new/category_extras.html index 7be69e30c..8cb169522 100644 --- a/templates/web/fixmystreet/report/new/category_extras.html +++ b/templates/web/fixmystreet/report/new/category_extras.html @@ -5,22 +5,22 @@ [%- FOR meta IN category_extras.$category %] [%- meta_name = meta.code -%] -[% IF field_errors.$meta_name %] - <div class='form-error'>[% field_errors.$meta_name %]</div> -[% END -%] + [% IF field_errors.$meta_name %] + <p class='form-error'>[% field_errors.$meta_name %]</p> + [% END -%] - <div class="form-field"> - <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label> - [% IF meta.exists('values') %] - <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> - [% FOR option IN meta.values.value.keys %] - <option value="[% meta.values.value.$option.key %]">[% option %]</option> + <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label> + + [% IF meta.exists('values') %] + <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> + [% FOR option IN meta.values.value.keys %] + <option value="[% meta.values.value.$option.key %]">[% option %]</option> + [% END %] + </select> + [% ELSE %] + <input type="text" value="[% report_meta.$meta_name | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> [% END %] - </select> - [% ELSE %] - <input type="text" value="[% report_meta.$meta_name | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> - [% END %] - </div> + [%- END %] [%- END %] -</div> +</div>
\ No newline at end of file diff --git a/templates/web/fixmystreet/report/new/councils_text_all.html b/templates/web/fixmystreet/report/new/councils_text_all.html index 8514e0b0a..fb10ec4fd 100644 --- a/templates/web/fixmystreet/report/new/councils_text_all.html +++ b/templates/web/fixmystreet/report/new/councils_text_all.html @@ -16,4 +16,4 @@ [% END %] [% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %] -</p> +</p>
\ No newline at end of file diff --git a/templates/web/fixmystreet/report/new/councils_text_none.html b/templates/web/fixmystreet/report/new/councils_text_none.html index 06a4bbe49..992d030c0 100644 --- a/templates/web/fixmystreet/report/new/councils_text_none.html +++ b/templates/web/fixmystreet/report/new/councils_text_none.html @@ -1,5 +1,3 @@ - - <p>[% nget( @@ -19,4 +17,4 @@ c.cobrand.contact_email ); -%]</p> +%]</p>
\ No newline at end of file diff --git a/templates/web/fixmystreet/report/new/councils_text_some.html b/templates/web/fixmystreet/report/new/councils_text_some.html index 042e89914..9f123fb9a 100644 --- a/templates/web/fixmystreet/report/new/councils_text_some.html +++ b/templates/web/fixmystreet/report/new/councils_text_some.html @@ -25,4 +25,4 @@ c.cobrand.contact_email ); %] -</p> +</p>
\ No newline at end of file diff --git a/templates/web/fixmystreet/report/new/fill_in_details.html b/templates/web/fixmystreet/report/new/fill_in_details.html index 22d1ee739..83865d9fe 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details.html +++ b/templates/web/fixmystreet/report/new/fill_in_details.html @@ -4,32 +4,31 @@ %] [% IF report.used_map %] + <form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %] class="validate"> -[% IF c.req.params.map_override %] -<input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> -[% END %] -<input type="hidden" name="pc" value="[% pc | html %]"> + [% IF c.req.params.map_override %] + <input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> + [% END %] + + <input type="hidden" name="pc" value="[% pc | html %]"> + [% ELSE %] -<form action="[% c.uri_for('/report/new') %]" method="post" name="mapSkippedForm"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %] class="validate"> -<input type="hidden" name="pc" value="[% pc | html %]"> -<input type="hidden" name="skipped" value="1"> -[% END %] -<input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> -<input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> +<form action="[% c.uri_for('/report/new') %]" method="post" name="mapSkippedForm"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %] class="validate"> + <input type="hidden" name="pc" value="[% pc | html %]"> + <input type="hidden" name="skipped" value="1"> -[% IF report.used_map %] - [% map_html %] - </div> - <div id="side"> -[% ELSE %] - <div id="skipped-map"> [% END %] -[% PROCESS 'report/new/fill_in_details_form.html' %] + <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> + <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> -</div> -</form> + [% IF report.used_map %] + [% map_html %] + </div> + [% END %] -[% INCLUDE 'footer.html' %] + [% PROCESS 'report/new/fill_in_details_form.html' %] +</form> +[% INCLUDE 'footer.html' %]
\ No newline at end of file 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 2809b9c0e..f7a18c48c 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -29,160 +29,137 @@ </p> [% INCLUDE 'errors.html' %] +<fieldset> + <div id="problem_form"> -<div id="problem_form"> + [% INCLUDE 'report/new/form_heading.html' %] -[% INCLUDE 'report/new/form_heading.html' %] -<div class="fieldset"> - - - - - -[% IF field_errors.council %] - <div class='form-error'>[% field_errors.council %]</div> -[% END %] - -[% IF field_errors.title %] - <div class='form-error'>[% field_errors.title %]</div> -[% END %] + [% IF field_errors.council %] + <p class='form-error'>[% field_errors.council %]</p> + [% END %] -<div class="form-field"> - <label for="form_title">[% loc('Subject:') %]</label> - <input type="text" value="[% report.title | html %]" name="title" id="form_title" size="25" required> -</div> + [% IF field_errors.title %] + <p class='form-error'>[% field_errors.title %]</p> + [% END %] -[% IF field_errors.detail %] - <div class='form-error'>[% field_errors.detail %]</div> -[% END %] -<div class="form-field"> - <label for="form_detail">[% loc('Details:') %]</label> - <textarea name="detail" id="form_detail" rows="7" cols="26" required>[% report.detail | html %]</textarea> -</div> + <label for="form_title">[% loc('Subject:') %]</label> + <input type="text" value="[% report.title | html %]" name="title" id="form_title" required> -[% IF js %] - <div class="form-field" id="form_category_row"> - <label for="form_category">[% loc('Category:') %]</label> - <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> - </div> -[% ELSE %] - [% IF category_options.size %] - [% IF field_errors.category %] - <div class='form-error'>[% field_errors.category %]</div> + [% IF field_errors.detail %] + <p class='form-error'>[% field_errors.detail %]</p> [% END %] - <div class="form-field"> - [% PROCESS "report/new/category.html" %] - </div> - [% END %] -[% END %] -[%- IF category_extras %] -[% PROCESS "report/new/category_extras.html" %] -[%- END %] + <label for="form_detail">[% loc('Details:') %]</label> + <textarea name="detail" id="form_detail" required>[% report.detail | html %]</textarea> -[% IF c.cobrand.allow_photo_upload %] - [% IF field_errors.photo %] - <div class='form-error'>[% field_errors.photo %]</div> - [% END %] - - <div class='form-field'> - [% IF upload_fileid || report.photo %] - <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p> - [% IF upload_fileid %] - <input type="hidden" name="upload_fileid" value="[% upload_fileid %]" /> - [% END %] - [% IF report.photo %] - <img align="right" src="/photo?id=[% report.id %]" hspace="5"> + [% 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> + </div> + [% ELSE %] + [% IF category_options.size %] + [% IF field_errors.category %] + <p class='form-error'>[% field_errors.category %]</p> + [% END %] + + [% PROCESS "report/new/category.html" %] + [% END %] [% END %] - [% END %] - - <label for="form_photo">[% loc('Photo:') %]</label> - <input type="file" name="photo" id="form_photo" style="width:20em"> - </div> -[% END %] - -[% IF c.user_exists %] - - [% INCLUDE name_phone %] - [% INCLUDE 'report/new/notes.html' %] + [%- IF category_extras %] + [% PROCESS "report/new/category_extras.html" %] + [%- END %] + + [% IF c.cobrand.allow_photo_upload %] + [% IF field_errors.photo %] + <p class='form-error'>[% field_errors.photo %]</p> + [% END %] + + + [% IF upload_fileid || report.photo %] + <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p> + + [% IF upload_fileid %] + <input type="hidden" name="upload_fileid" value="[% upload_fileid %]" /> + [% END %] + + [% IF report.photo %] + <img align="right" src="/photo?id=[% report.id %]"> + [% END %] + [% END %] + + <label for="form_photo">[% loc('Photo:') %]</label> + <input type="file" name="photo" id="form_photo"> + [% END %] - <p id="problem_submit"> - <input type="submit" value="[% loc('Submit') %]"> - </p> + [% IF c.user_exists %] -[% ELSE %] + [% INCLUDE name_phone %] - [% IF field_errors.email %] - <div class='form-error'>[% field_errors.email %]</div> - [% END %] + [% INCLUDE 'report/new/notes.html' %] - <div class="form-field"> - <label for="form_email">[% loc('Your email:') %]</label> - <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" size="25" required> - </div> + <p id="problem_submit"> + <input type="submit" value="[% loc('Submit') %]"> + </p> -[% INCLUDE 'report/new/notes.html' %] + [% ELSE %] -<div id="form_sign_in"> - <h3>[% loc("Now to submit your report… do you have a FixMyStreet password?") %]</h3> + [% IF field_errors.email %] + <p class='form-error'>[% field_errors.email %]</p> + [% END %] - <div id="form_sign_in_yes"> + <label for="form_email">[% loc('Your email:') %]</label> + <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" size="25" required> - [% IF field_errors.password %] - <div class='form-error'>[% field_errors.password %]</div> - [% END %] + [% INCLUDE 'report/new/notes.html' %] - <div class="form-field"> - <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="" size="25"> - </div> + <div id="form_sign_in"> + <h3>[% loc("Now to submit your report… do you have a FixMyStreet password?") %]</h3> - <div class="fieldset"> + <div id="form_sign_in_yes"> + [% IF field_errors.password %] + <p class='form-error'>[% field_errors.password %]</p> + [% END %] - <p> - <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> - <label class="n" for="remember_me"> - [% loc('Keep me signed in on this computer') %] - </label> - </p> + <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> - <input type="submit" id="submit_sign_in" name="submit_sign_in" value="[% loc('Submit') %]"> - </p> + <p> + <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> + <label class="n" for="remember_me">[% loc('Keep me signed in on this computer') %]</label> + </p> - </div> + <p> + <input type="submit" id="submit_sign_in" name="submit_sign_in" value="[% loc('Submit') %]"> + </p> + </div> - </div> - <div id="form_sign_in_no"> + <div id="form_sign_in_no"> + <p>[% loc('<strong>No</strong>, let me confirm my report by email:') %]</p> - <p>[% loc('<strong>No</strong>, let me confirm my report by email:') %]</p> + [% INCLUDE name_phone %] + + <label for="password_register">[% loc('Enter a new password:') %]</label> + <input type="password" name="password_register" id="password_register" value=""> + - <div class="fieldset"> + <p><small>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</small></p> - [% INCLUDE name_phone %] + <p> + <input type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]"> + </p> - <div class="form-field"> - <label for="password_register">[% loc('Enter a new password:') %]</label> - <input type="password" name="password_register" id="password_register" value="" size="25"> </div> - <p style="clear:both"><small>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</small></p> - - <p> - <input type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]"> - </p> - </div> + [% END %] </div> - -</div> - -[% END %] +</fieldset> [% IF partial_token %] <input type="hidden" name="partial" value="[% partial_token.token %]"> @@ -190,31 +167,22 @@ <input type="hidden" name="submit_problem" value="1"> -</div> -</div> - [% BLOCK name_phone %] [% IF field_errors.name %] - <div class='form-error'>[% field_errors.name %]</div> + <p class='form-error'>[% field_errors.name %]</p> [% END %] - <div class="form-field"> - <label for="form_name">[% loc('Your name:') %]</label> - <input type="text" class="validName" value="[% report.name | html %]" name="name" id="form_name" size="25"> - </div> + <label for="form_name">[% loc('Your name:') %]</label> + <input type="text" class="validName" value="[% report.name | html %]" name="name" id="form_name"> - <div class="checkbox"> - [%# if there is nothing in the name field then set check box as default on form %] - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous %]> - <label for="form_may_show_name">[% loc('Show my name publicly') %]</label> - <br><small>[% loc('(we never show your email address or phone number)') %]</small> - </div> + [%# if there is nothing in the name field then set check box as default on form %] + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous %]> + <label for="form_may_show_name">[% loc('Show my name publicly') %]</label> + <p><small>[% loc('(we never show your email address or phone number)') %]</small></p> - <div> - <label for="form_phone">[% loc('Phone:') %]</label> - <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" size="15"> - <small>[% loc('(optional)') %]</small> - </div> -[% END %] + <label for="form_phone">[% loc('Phone:') %]</label> + <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" size="15"> + <p><small>[% loc('(optional)') %]</small></p> +[% END %]
\ No newline at end of file diff --git a/templates/web/fixmystreet/report/new/fill_in_details_text.html b/templates/web/fixmystreet/report/new/fill_in_details_text.html index 5d9716915..4838168ee 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_text.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_text.html @@ -10,4 +10,4 @@ photo of the problem if you have one), etc.'); ELSE; loc('Please fill in details of the problem below.'); END; -%] +%]
\ No newline at end of file diff --git a/templates/web/fixmystreet/report/new/notes.html b/templates/web/fixmystreet/report/new/notes.html index be605ddaa..36b6bfbbd 100644 --- a/templates/web/fixmystreet/report/new/notes.html +++ b/templates/web/fixmystreet/report/new/notes.html @@ -1,11 +1,9 @@ -<p style="clear:both">[% loc("Please note:") %]</p> +<p>[% loc("Please note:") %]</p> <ul> - <li>[% loc("We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>") %]</li> <li>[% loc("Please be polite, concise and to the point.") %]</li> <li>[% loc("Please do not be abusive — abusing your council devalues the service for all users.") %]</li> <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li> <li>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li> - -</ul> +</ul>
\ No newline at end of file diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index e11122757..0b59b7cdb 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -240,7 +240,10 @@ fieldset{ margin: 1em; } -input[type=text], textarea{ +input[type=text], +input[type=password], +input[type=email], +textarea{ width: 100%; padding: 0.5em; margin: 0 0 0 -0.5em; @@ -257,7 +260,9 @@ textarea{ font-family: 'helvetica', 'arial',sans-serif; } -input[type=text]{ +input[type=text], +input[type=password], +input[type=email] { border: 0.125em solid #888888; @include border-radius(0.25em); display: block; diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index b289847cd..bcb4fa84a 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -194,6 +194,8 @@ /*FORMS*/ input[type=text], +input[type=password], +input[type=email], textarea{ width: 25em; } @@ -207,6 +209,8 @@ textarea{ } /*FORMS*/ input[type=text], + input[type=password], + input[type=email], textarea{ width: 95%; } |