diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2018-04-03 09:40:14 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2018-04-03 09:40:14 +0100 |
| commit | 2be38837422387ec0c71ff88ff3d3cc0f986b48c (patch) | |
| tree | 7b47b7d8216b037b033ecbfd55056b6d1c53546f /templates/web/base | |
| parent | 322df9f5002fdc8532c353c614b3e5e03a04a8b8 (diff) | |
| parent | 089a3451fdcb8e1086313a63dbdb1e7930c4698e (diff) | |
Merge branch 'jonkri-2.3'
Diffstat (limited to 'templates/web/base')
| -rw-r--r-- | templates/web/base/around/_error_multiple.html | 11 | ||||
| -rw-r--r-- | templates/web/base/front/stats.html | 12 |
2 files changed, 17 insertions, 6 deletions
diff --git a/templates/web/base/around/_error_multiple.html b/templates/web/base/around/_error_multiple.html index 751d81173..6a43eac32 100644 --- a/templates/web/base/around/_error_multiple.html +++ b/templates/web/base/around/_error_multiple.html @@ -5,9 +5,14 @@ [% IF possible_location_matches %] <p>[% loc('We found more than one match for that location.') %]</p> <ul class="pc_alternatives"> - [% FOREACH match IN possible_location_matches %] - <li><a href="/around?latitude=[% match.latitude | uri %];longitude=[% match.longitude | uri %][% IF c.req.params.category %];category=[% c.req.params.category | uri %][% END %]">[% match.address | html %]</a></li> - [% END %] + [% FOREACH match IN possible_location_matches %] + <li> + [% IF match.icon %] + <img src="[% match.icon %]" alt=""> + [% END %] + <a href="/around?latitude=[% match.latitude | uri %];longitude=[% match.longitude | uri %][% IF c.req.params.category %];category=[% c.req.params.category | uri %][% END %]">[% match.address | html %]</a> + </li> + [% END %] </ul> <p>[% loc('We show up to ten matches, please try a different search if yours is not here.') %]</p> [% END %] diff --git a/templates/web/base/front/stats.html b/templates/web/base/front/stats.html index 41358c869..8bef17d1f 100644 --- a/templates/web/base/front/stats.html +++ b/templates/web/base/front/stats.html @@ -34,11 +34,17 @@ %] <div id="front_stats"> + [% SWITCH c.cobrand.moniker %] + [% CASE 'fixamingata' %] + <div>[% tprintf( new_text, decode(new_n).replace(" ", " ").replace(",", " ") ) %]</div> + <div>[% tprintf( fixed_text, decode(fixed_n).replace(" ", " ").replace(",", " ") ) %]</div> + <div>[% tprintf( updates_text, decode(updates_n).replace(" ", " ").replace(",", " ") ) %]</div> + [% CASE 'zurich' %] + <div>[% tprintf( new_text, decode(new_n) ) %]</div> + <div>[% tprintf( fixed_text, decode(fixed_n) ) %]</div> + [% CASE %] <div>[% tprintf( new_text, decode(new_n) ) %]</div> - [% IF has_fixed_state %] <div>[% tprintf( fixed_text, decode(fixed_n) ) %]</div> - [% END %] - [% IF c.cobrand.moniker != 'zurich' %] <div>[% tprintf( updates_text, decode(updates_n) ) %]</div> [% END %] </div> |