diff options
Diffstat (limited to 'templates/web/default')
4 files changed, 14 insertions, 13 deletions
diff --git a/templates/web/default/report/new/councils_text.html b/templates/web/default/report/new/councils_text.html index 1da5746c1..f526beb28 100644 --- a/templates/web/default/report/new/councils_text.html +++ b/templates/web/default/report/new/councils_text.html @@ -1,7 +1,7 @@ [% FILTER collapse %] -[% IF area_ids_to_list.size == 0 %] +[% IF bodies_to_list.size == 0 %] [% PROCESS 'report/new/councils_text_none.html' %] -[% ELSIF area_ids_to_list.size == all_councils.size %] +[% ELSIF bodies_to_list.size == bodies.size %] [% PROCESS 'report/new/councils_text_all.html' %] [% ELSE %] [% PROCESS 'report/new/councils_text_some.html' %] diff --git a/templates/web/default/report/new/councils_text_all.html b/templates/web/default/report/new/councils_text_all.html index af5d822b0..e9a008e90 100644 --- a/templates/web/default/report/new/councils_text_all.html +++ b/templates/web/default/report/new/councils_text_all.html @@ -1,23 +1,24 @@ +[%# XXX The below type checking is assuming that a body ID can be used to look up a mapit type. %] <p> -[% IF area_ids_to_list.0 != 2489 && area_ids_to_list.0 != 2482 && all_councils.${area_ids_to_list.0}.type == 'LBO' %] +[% IF bodies_to_list.0 != 2489 && bodies_to_list.0 != 2482 && all_areas.${bodies_to_list.0}.type == 'LBO' %] [% tprintf( loc('All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system.'), - all_council_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) + all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) ); %] -[% ELSIF all_councils.${area_ids_to_list.0}.type == 'LGD' %] +[% ELSIF all_areas.${bodies_to_list.0}.type == 'LGD' %] [% tprintf( loc('All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>.'), - all_council_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) + all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) ); %] [% ELSE %] [% tprintf( loc('All the information you provide here will be sent to <strong>%s</strong>.'), - all_council_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) + all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) ); %] [% END %] diff --git a/templates/web/default/report/new/councils_text_none.html b/templates/web/default/report/new/councils_text_none.html index 06a4bbe49..bd9d25922 100644 --- a/templates/web/default/report/new/councils_text_none.html +++ b/templates/web/default/report/new/councils_text_none.html @@ -5,7 +5,7 @@ nget( "We do not yet have details for the council that covers this location.", "We do not yet have details for the councils that cover this location.", - all_councils.size + all_areas.size ); %] [% @@ -14,7 +14,7 @@ [% tprintf( loc("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."), - all_council_names.join( loc(' or ') ), + all_area_names.join( loc(' or ') ), c.cobrand.contact_email, c.cobrand.contact_email ); diff --git a/templates/web/default/report/new/councils_text_some.html b/templates/web/default/report/new/councils_text_some.html index 042e89914..eda26e5b3 100644 --- a/templates/web/default/report/new/councils_text_some.html +++ b/templates/web/default/report/new/councils_text_some.html @@ -1,9 +1,9 @@ <p> [% loc('All the information you provide here will be sent to') %] -[% FOREACH council_id IN area_ids_to_list %] +[% FOREACH body_id IN bodies_to_list %] [% loc( ' or ') IF ! loop.first %] - <strong>[% all_councils.$council_id.name %]</strong> + <strong>[% bodies.$body_id.name %]</strong> [%- '.' IF loop.last %] [% END %] @@ -14,13 +14,13 @@ nget( "We do <strong>not</strong> yet have details for the other council that covers this location.", "We do <strong>not</strong> yet have details for the other councils that cover this location.", - missing_details_councils.size + missing_details_body.size ); %] [% tprintf( loc("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."), - missing_details_council_names.join( loc(' or ') ), + missing_details_body_names.join( loc(' or ') ), c.cobrand.contact_email, c.cobrand.contact_email ); |