diff options
Diffstat (limited to 'templates/web/bromley')
| -rw-r--r-- | templates/web/bromley/footer.html | 4 | ||||
| -rw-r--r-- | templates/web/bromley/report/_item.html | 25 | ||||
| -rw-r--r-- | templates/web/bromley/report/display.html | 14 | ||||
| -rw-r--r-- | templates/web/bromley/report/new/fill_in_details_form.html | 4 |
4 files changed, 37 insertions, 10 deletions
diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html index d60854daa..31b566047 100644 --- a/templates/web/bromley/footer.html +++ b/templates/web/bromley/footer.html @@ -1,6 +1,6 @@ </div><!-- .content role=main --> <p id="bromley-powered-by" class="desk-only"> - <a href="http://www.fixmystreet.com/">Powered by <img src="/cobrands/bromley/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a> + <a href="http://www.mysociety.org/for-councils/fixmystreet/">Powered by <img src="/cobrands/bromley/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a> </p> </div><!-- .container --> @@ -10,7 +10,7 @@ <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> <ul id="mysoc-menu"> - <li><a href="http://www.fixmystreet.com/">Powered by <img src="/cobrands/bromley/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a></li> + <li><a href="http://www.mysociety.org/for-councils/fixmystreet/">Powered by <img src="/cobrands/bromley/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a></li> </ul> <ul id="main-menu"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" diff --git a/templates/web/bromley/report/_item.html b/templates/web/bromley/report/_item.html new file mode 100644 index 000000000..cd3fbc18c --- /dev/null +++ b/templates/web/bromley/report/_item.html @@ -0,0 +1,25 @@ +<li> +<a class="text" href="[% c.uri_for('/report', problem.id ) %]"> + [% IF problem.photo; + photo = problem.get_photo_params + %] + <img class="img" height="60" width="90" src="[% photo.url_fp %]" alt=""> + [% END %] + <span>[% problem.title | html %]</span><br /> + <small>[% prettify_dt( problem.confirmed, 1 ) %] + [%- IF dist %], [% dist %]km[% END %] + [%- IF include_lastupdate AND problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %], + [% tprintf(loc('last updated %s'), prettify_dt( problem.lastupdate, 1 ) ) %] + [%- END %] + [% IF include_lastupdate %] + [% IF problem.bodies_str_ids.size > 1 %] [% loc('(sent to both)') %] + [% ELSIF problem.bodies_str_ids.size == 0 %] [% loc('(not sent to council)') %] + [% END %] + [% END %] + [% IF NOT no_fixed AND problem.is_fixed %] + [% loc('(fixed)') %] + [% ELSIF NOT no_fixed AND problem.is_closed %] + [% loc('(closed)') %] + [% END %]</small> +</a> +</li> diff --git a/templates/web/bromley/report/display.html b/templates/web/bromley/report/display.html index 13bc5f960..67802e82a 100644 --- a/templates/web/bromley/report/display.html +++ b/templates/web/bromley/report/display.html @@ -2,7 +2,7 @@ PROCESS "report/photo-js.html"; PROCESS "maps/${map.type}.html"; - problem_title = problem.title _ ' - ' _ loc('Viewing a problem'); + problem_title = problem.title_safe _ ' - ' _ loc('Viewing a problem'); INCLUDE 'header.html' title = problem_title rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] @@ -20,7 +20,7 @@ <div class="shadow-wrap"> <ul id="key-tools"> - [% IF c.user_exists AND c.user.council == 'Bromley Council' %] + [% IF c.user_exists AND c.user.body == 'Bromley Council' %] <li><form method="post" action="/report/delete/[% problem.id %]"> <input type="submit" class="abuse" value="Remove from site"> </form></li> @@ -74,12 +74,14 @@ <br><a href="http://www.bromley.gov.uk/report">Report a different issue</a> </div> - [% IF c.user && c.user.belongs_to_council( problem.council ) %] + [% IF c.user && c.user.belongs_to_body( problem.bodies_str ) %] <label for="form_state">[% loc( 'State' ) %]</label> <select name="state" id="form_state"> - [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', - loc('Investigating')], ['planned', loc('Planned')], ['in progress', - loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] + [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', + loc('Investigating')], ['action scheduled', loc('Action Scheduled')], + ['in progress', loc('In Progress')], ['duplicate', loc('Duplicate')], + ['unable to fix', loc('Unable to fix')], ['not responsible', loc('Not Responsible')], + ['fixed', loc('Fixed')] ] %] <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> [% END %] </select> diff --git a/templates/web/bromley/report/new/fill_in_details_form.html b/templates/web/bromley/report/new/fill_in_details_form.html index 2c5abb874..b60935f47 100644 --- a/templates/web/bromley/report/new/fill_in_details_form.html +++ b/templates/web/bromley/report/new/fill_in_details_form.html @@ -39,8 +39,8 @@ [% INCLUDE 'report/new/form_heading.html' %] - [% IF field_errors.council %] - <p class='form-error'>[% field_errors.council %]</p> + [% IF field_errors.bodies %] + <p class='form-error'>[% field_errors.bodies %]</p> [% END %] |