diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-10-26 22:00:07 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-10-26 22:00:07 +0100 |
| commit | 3e5ab3e264b104fbf236bb08cc8a330262ccfa57 (patch) | |
| tree | e6470c7f250638eb502e00937f22997c7dd6be93 | |
| parent | 15d7a8e2b24d0aafcf2b931c84b2e44688515337 (diff) | |
Move map not used text to template so we can use HTML in it
and not have it escaped when it is displayed
Fixed #350
| -rw-r--r-- | perllib/FixMyStreet/DB/Result/Problem.pm | 3 | ||||
| -rw-r--r-- | templates/web/default/report/_main.html | 1 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/_main.html | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index ad8f9bcae..ce197076b 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -546,9 +546,6 @@ sub meta_line { } - $meta .= '; <strong>' . _('there is no pin shown as the user did not use the map') . '</strong>' - unless $problem->used_map; - return $meta; } diff --git a/templates/web/default/report/_main.html b/templates/web/default/report/_main.html index c21709ed0..99c937659 100644 --- a/templates/web/default/report/_main.html +++ b/templates/web/default/report/_main.html @@ -1,6 +1,7 @@ <h1>[% problem.title | html %]</h1> <p><em>[% problem.meta_line(c) | html %] +[%- IF !problem.used_map %]; <strong>[% loc('there is no pin shown as the user did not use the map') %]</strong>[% END %] [% IF problem.council %] [% IF problem.whensent || problem.can_display_external_id %] <small class="council_sent_info"><br> diff --git a/templates/web/fixmystreet/report/_main.html b/templates/web/fixmystreet/report/_main.html index 2f54b55f5..d0cbc005e 100644 --- a/templates/web/fixmystreet/report/_main.html +++ b/templates/web/fixmystreet/report/_main.html @@ -3,6 +3,7 @@ <p><em> [% problem.meta_line(c) | html %] + [%- IF !problem.used_map %]; <strong>[% loc('there is no pin shown as the user did not use the map') %]</strong>[% END %] [% IF problem.council %] [% IF problem.whensent || problem.can_display_external_id %] <small class="council_sent_info"><br> |