diff options
Diffstat (limited to 'templates/web/default')
| -rwxr-xr-x | templates/web/default/faq/faq-en-gb.html | 6 | ||||
| -rwxr-xr-x | templates/web/default/reports/council.html | 28 |
2 files changed, 18 insertions, 16 deletions
diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index 2c1c43799..4302add0d 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -25,11 +25,11 @@ or clearing</strong>, such as: </dd> <dt>What isn’t FixMyStreet for?</dt> - <dd>FixMyStreet is not a way of getting in touch with [% c.cobrand.moniker == 'southampton' ? 'the' : 'your' %] council for all + <dd>FixMyStreet is not a way of getting in touch with [% c.cobrand.is_council ? 'the' : 'your' %] council for all issues – please use FixMyStreet only for problems such as the above. We often route problem reports via cleansing services or highways and so using FixMyStreet for other matters may result in a delay in your report getting - to the right department. <strong>You will need to contact [% c.cobrand.moniker == 'southampton' ? 'the' : 'your' %] council + to the right department. <strong>You will need to contact [% c.cobrand.is_council ? 'the' : 'your' %] council directly for problems such as</strong>: <ul><li>Anti-social behaviour @@ -51,7 +51,7 @@ with a map of that area. You can view problems already reported in that area, or report ones of your own simply by clicking on the map at the location of the problem.</dd> <dt>How are the problems solved?</dt> - <dd>They are reported to the [% IF c.cobrand.moniker != 'southampton' %]relevant[% END %] council by email. The + <dd>They are reported to the [% IF !c.cobrand.is_council %]relevant[% END %] council by email. The council can then resolve the problem the way they normally would. Alternatively, you can discuss the problem on the website with others[% IF c.cobrand.moniker != 'southampton' %], and then together lobby the council to fix it, or fix it directly yourselves[% END %].</dd> diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html index d1c2241c7..75c379bd6 100755 --- a/templates/web/default/reports/council.html +++ b/templates/web/default/reports/council.html @@ -14,6 +14,12 @@ %] [% END %] +[% IF c.cobrand.is_council %] + [% ward_text = loc( 'View reports by ward' ) %] +[% ELSE %] + [% ward_text = loc( 'Wards of this council' ) %] +[% END %] + [% PROCESS "maps/${map.type}.html"; INCLUDE 'header.html', @@ -25,8 +31,8 @@ [% map_html %] -[% IF style != 'new' AND children.size %] -<h2 style="clear:right">[% loc('Wards of this council') %]</h2> +[% IF c.cobrand.all_reports_style != 'detailed' AND children.size %] +<h2 style="clear:right">[% ward_text %]</h2> <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> <ul> [% FOR child IN children.values.sort('name') %] @@ -72,7 +78,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. [% END %] </p> -[% ELSIF style == 'new' %] +[% ELSIF c.cobrand.all_reports_style == 'detailed' %] <div class="shadow-wrap"> <ul id="key-tools"[% IF NOT children.size %] class="singleton"[% END %]> <li><a rel="nofollow" id="key-tool-updates-area" class="feed" href="[% rss_url %]">[% @@ -80,18 +86,14 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a 'Get updates of reports in Bromley'; ELSIF c.cobrand.moniker == 'bromley'; 'Get updates of reports in this ward'; + ELSIF c.cobrand.is_council; + tprintf(loc('Get updates of %s problems'), thing); ELSE; tprintf(loc('Get updates of problems in this %s'), thing); END %]</a></li> [% IF children.size %] - <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% - IF c.cobrand.moniker == 'bromley'; - 'View reports by ward'; - ELSE; - loc('Wards of this council'); - END - %]</a></li> + <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% ward_text %]</a></li> [% END %] </ul> </div> @@ -101,9 +103,9 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a [% TRY %][% INCLUDE 'reports/cobrand_stats.html' %][% CATCH file %][% END %] -[% IF style == 'new' AND children.size %] +[% IF c.cobrand.all_reports_style == 'detailed' AND children.size %] <section id="council_wards" class="hidden-js"> - <h2>[% loc('Wards of this council') %]</h2> +<h2>[% ward_text %]</h2> <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> <ul class="issue-list-a full-width"> [% FOR child IN children.values.sort('name') %] @@ -137,7 +139,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a [% IF problems %] <ul class="issue-list-a"> -[% IF style == 'new' %] +[% IF c.cobrand.all_reports_style == 'detailed' %] [% FOREACH problem IN problems %] <li> |