diff options
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | templates/web/base/questionnaire/index.html | 40 |
2 files changed, 21 insertions, 22 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c7db840e3..45267a57e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,7 @@ * Unreleased - Front end improvements: - - Include don't know link in questionnaire email, and - prefill form question. #1939 + - Improve questionnaire process. #1939 #1998 * v2.3.1 (12th February 2018) - Front end improvements: diff --git a/templates/web/base/questionnaire/index.html b/templates/web/base/questionnaire/index.html index 12ca36cf2..2f5b9b277 100644 --- a/templates/web/base/questionnaire/index.html +++ b/templates/web/base/questionnaire/index.html @@ -13,22 +13,6 @@ <h1>[% loc('Questionnaire') %]</h1> -<h2 class="questionnaire-report-header">[% loc('Your report') %]</h2> -<div class="questionnaire-report-reminder"> - [% INCLUDE 'report/photo.html' object=problem %] - <h3 class="questionnaire-report-reminder__report-title"> - <a href="/report/[% problem.id %]">[% problem.title | html %]</a> - </h3> - <p class="questionnaire-report-reminder__report-meta">[% problem.meta_line(c) | html %]</p> - [% IF updates.size %] - <p class="questionnaire-report-reminder__last-update-header"> - <strong>[% loc('Last update') %]</strong> - <a href="/report/[% problem.id %]">[% loc('Show all updates') %]</a> - </p> - <p class="questionnaire-report-reminder__last-update">“[% updates.last.text | add_links %]”</p> - [% END %] -</div> - <form method="post" action="/questionnaire/submit" id="questionnaire" [%- IF c.cobrand.allow_photo_upload -%] enctype="multipart/form-data" @@ -43,7 +27,7 @@ </ul> [% END %] -<p> +<p>1. [% loc('An update marked this problem as fixed.') IF problem.is_fixed %] [% loc('Has this problem been fixed?') %] </p> @@ -57,8 +41,24 @@ <label class="btn" for="been_fixed_unknown">[% loc('Don’t know') %]</label> </p> +<h2 class="questionnaire-report-header">[% loc('Your report') %]</h2> +<div class="questionnaire-report-reminder"> + [% INCLUDE 'report/photo.html' object=problem %] + <h3 class="questionnaire-report-reminder__report-title"> + <a href="/report/[% problem.id %]">[% problem.title | html %]</a> + </h3> + <p class="questionnaire-report-reminder__report-meta">[% problem.meta_line(c) | html %]</p> + [% IF updates.size %] + <p class="questionnaire-report-reminder__last-update-header"> + <strong>[% loc('Last update') %]</strong> + <a href="/report/[% problem.id %]">[% loc('Show all updates') %]</a> + </p> + <p class="questionnaire-report-reminder__last-update">“[% updates.last.text | add_links %]”</p> + [% END %] +</div> + [% UNLESS answered_ever_reported %] -<p>[% loc('Have you ever reported a problem to a council before, or is this your first time?') %]</p> +<p>2. [% loc('Have you ever reported a problem to a council before, or is this your first time?') %]</p> <p class="segmented-control segmented-control--radio"> <input type="radio" name="reported" id="reported_yes" value="Yes"[% ' checked' IF reported == 'Yes' %]> <label class="btn" for="reported_yes">[% loc('Reported before') %]</label> @@ -67,7 +67,7 @@ </p> [% END %] -<p>[% loc('If you wish to leave a public update on the problem, please enter it here +<p>3. [% 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 class="form-control" name="update" rows="7" cols="30" placeholder="[% loc('What was your experience of getting the problem fixed?') %]">[% update | html %]</textarea></p> @@ -98,7 +98,7 @@ [% END %] <div class="js-another-questionnaire"> - <p>[% loc('Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?') %]</p> + <p>4. [% loc('Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?') %]</p> <p class="segmented-control segmented-control--radio"> <input type="radio" name="another" id="another_yes" value="Yes"[% ' checked' IF another == 'Yes' %]> <label class="btn" for="another_yes">[% loc('Yes') %]</label> |