diff options
| -rw-r--r-- | templates/web/default/report/_council_sent_info.html | 5 | ||||
| -rw-r--r-- | templates/web/default/report/_main.html | 6 | ||||
| -rw-r--r-- | templates/web/oxfordshire/report/_council_sent_info.html | 16 | ||||
| -rw-r--r-- | templates/web/oxfordshire/report/_main.html | 38 |
4 files changed, 22 insertions, 43 deletions
diff --git a/templates/web/default/report/_council_sent_info.html b/templates/web/default/report/_council_sent_info.html new file mode 100644 index 000000000..958562dc2 --- /dev/null +++ b/templates/web/default/report/_council_sent_info.html @@ -0,0 +1,5 @@ +[% IF problem.whensent || problem.can_display_external_id %] + <small class="council_sent_info"><br> + [% problem.processed_summary_string(c) %] + </small> +[% END %] diff --git a/templates/web/default/report/_main.html b/templates/web/default/report/_main.html index 789f8e43e..0124052c0 100644 --- a/templates/web/default/report/_main.html +++ b/templates/web/default/report/_main.html @@ -5,11 +5,7 @@ [% problem.meta_line(c) | html %] [%- IF !problem.used_map AND c.cobrand.moniker != 'emptyhomes' %]; <strong>[% loc('there is no pin shown as the user did not use the map') %]</strong>[% END %] [% IF problem.bodies_str %] - [% IF problem.whensent || problem.can_display_external_id %] - <small class="council_sent_info"><br> - [% problem.processed_summary_string(c) %] - </small> - [% END %] + [% INCLUDE 'report/_council_sent_info.html' %] [% ELSE %] <br><small>[% loc('Not reported to council') %]</small> [% END %] diff --git a/templates/web/oxfordshire/report/_council_sent_info.html b/templates/web/oxfordshire/report/_council_sent_info.html new file mode 100644 index 000000000..464c10256 --- /dev/null +++ b/templates/web/oxfordshire/report/_council_sent_info.html @@ -0,0 +1,16 @@ +[% IF problem.whensent || problem.can_display_external_id %] + <small class="council_sent_info"><br> + [% IF problem.whensent %] + [% problem.duration_string(c) %]<br> + [% END %] + <strong> + [% IF problem.can_display_external_id %] + [% IF problem.whensent %] + Council ref: [% problem.external_id %] + [% ELSE %] + [% problem.external_body %] ref: [% problem.external_id %] + [% END %] + [% END %] + </strong> + </small> +[% END %] diff --git a/templates/web/oxfordshire/report/_main.html b/templates/web/oxfordshire/report/_main.html deleted file mode 100644 index 42450b260..000000000 --- a/templates/web/oxfordshire/report/_main.html +++ /dev/null @@ -1,38 +0,0 @@ -<div class="problem-header cf"> - <h1>[% problem.title | html %]</h1> - - <p><em> - [% problem.meta_line(c) | html %] - [%- IF !problem.used_map AND c.cobrand.moniker != 'emptyhomes' %]; <strong>[% loc('there is no pin shown as the user did not use the map') %]</strong>[% END %] - [% IF problem.bodies_str %] - [% IF problem.whensent || problem.can_display_external_id %] - <small class="council_sent_info"><br> - [% IF problem.whensent %] - [% problem.duration_string(c) %]<br> - [% END %] - <strong> - [% IF problem.can_display_external_id %] - [% IF problem.whensent %] - Council ref: [% problem.external_id %] - [% ELSE %] - [% problem.external_body %] ref: [% problem.external_id %] - [% END %] - [% END %] - </strong> - </small> - [% END %] - [% ELSE %] - <br><small>[% loc('Not reported to council') %]</small> - [% END %] - </em></p> - [% INCLUDE 'report/_support.html' %] - - [% IF c.cobrand.moniker == 'southampton' %] - [% add_links( problem.detail ) | html_para %] - [% INCLUDE 'report/photo.html' object=problem %] - [% ELSE %] - [% INCLUDE 'report/photo.html' object=problem %] - [% add_links( problem.detail ) | html_para %] - [% END %] - -</div> |