diff options
| author | Dave Arter <davea@mysociety.org> | 2016-04-11 17:12:23 +0100 |
|---|---|---|
| committer | Dave Arter <davea@mysociety.org> | 2016-07-08 15:28:21 +0100 |
| commit | a145cd1dd0613cc141e541dfc9a3c9a1756161f5 (patch) | |
| tree | da4a2fbbe4a71a9d21957064d3fba62dda8f97f0 | |
| parent | 680893b2489830b0c06a6ffdbf8c9f15ddb22487 (diff) | |
Show actual report destination in confirm message
For two-tier authorities, it is possible to send a report
from a cobrand to an authority other than the cobrand's owner.
If this is the case, then highlight it on the confirmation message
along with a link to view the problem report on the main fixmystreet.com
site.
The Hart-specific template is no longer required.
| -rw-r--r-- | templates/web/base/tokens/confirm_problem.html | 7 | ||||
| -rw-r--r-- | templates/web/hart/tokens/confirm_problem.html | 19 |
2 files changed, 6 insertions, 20 deletions
diff --git a/templates/web/base/tokens/confirm_problem.html b/templates/web/base/tokens/confirm_problem.html index 5892d0f9e..ce7f751e5 100644 --- a/templates/web/base/tokens/confirm_problem.html +++ b/templates/web/base/tokens/confirm_problem.html @@ -5,7 +5,12 @@ <h1><a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]">[% report.title %]</a></h1> [% IF c.cobrand.is_council %] - <h2>Your issue is on its way to the council.</h2> + [% IF c.cobrand.owns_problem( report ) %] + <h2>Your issue is on its way to the council.</h2> + [% ELSE %] + <h2>Your issue is on its way to [% report.body %].</h2> + <p>Note that [% c.cobrand.council_name %] is not responsible for this type of problem.</p> + [% END %] <p>Your reference for this report is [% report.id %], please quote it in any enquiries.</p> [% ELSE %] diff --git a/templates/web/hart/tokens/confirm_problem.html b/templates/web/hart/tokens/confirm_problem.html deleted file mode 100644 index 68223e92b..000000000 --- a/templates/web/hart/tokens/confirm_problem.html +++ /dev/null @@ -1,19 +0,0 @@ -[% INCLUDE 'header.html', title = loc('Confirmation') %] - -<h1>[% loc('Confirmation') %]</h1> - -<p class="confirmed"> -Thank you. You have successfully confirmed your report -[% IF c.cobrand.owns_problem( report ) %] -and this will now be investigated by the council. -You can <a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]">view the report on this site</a>. -[% ELSE %] -and this has now been passed on to [%# TODO make this generic %] <b>Hampshire County Council</b> to investigate. -Note that Hart District Council is not responsible for this type of problem. However you can continue to view your report on the <a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]"><i>fixmystreet.com</i> website</a>. -[% END %] -</p> - -<p>Your reference for this report is [% report.id %], please quote it in any enquiries. -</p> - -[% INCLUDE 'footer.html' %] |