diff options
Diffstat (limited to 'templates/web/default')
| -rwxr-xr-x | templates/web/default/around/display_location.html | 4 | ||||
| -rw-r--r-- | templates/web/default/auth/general.html | 2 | ||||
| -rw-r--r-- | templates/web/default/maps/openlayers.html | 6 | ||||
| -rw-r--r-- | templates/web/default/maps/tilma/original.html | 1 | ||||
| -rw-r--r-- | templates/web/default/report/display.html | 2 | ||||
| -rw-r--r-- | templates/web/default/report/new/fill_in_details.html | 2 | ||||
| -rwxr-xr-x | templates/web/default/reports/council.html | 71 |
7 files changed, 59 insertions, 29 deletions
diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html index aa1dc86d6..529c12eec 100755 --- a/templates/web/default/around/display_location.html +++ b/templates/web/default/around/display_location.html @@ -61,10 +61,6 @@ [% END %] </p> -[% IF c.cobrand.country == 'GB' %] -<input type='hidden' id='all_pins' name='all_pins' value='[% all_pins | html %]'> -[% END %] - </div> <div id="side"> diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html index ffc85b3dc..5f9a09199 100644 --- a/templates/web/default/auth/general.html +++ b/templates/web/default/auth/general.html @@ -39,7 +39,7 @@ </p> <p> - <input type="checkbox" name="remember_me" value='1'[% ' checked' IF remember_me %]> + <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> <label class="n" for="remember_me"> [% loc('Keep me signed in on this computer') %] </label> diff --git a/templates/web/default/maps/openlayers.html b/templates/web/default/maps/openlayers.html index 7da732913..45551c3d5 100644 --- a/templates/web/default/maps/openlayers.html +++ b/templates/web/default/maps/openlayers.html @@ -7,8 +7,14 @@ <input type="hidden" name="zoom" value="[% map.zoom %]"> <script type="text/javascript"> var fixmystreet = { + 'page': '[% page %]', + 'area': '[% map.area %]', + 'all_pins': [% all_pins || "''" | html %], 'latitude': [% map.latitude %], 'longitude': [% map.longitude %], +[% IF map.any_zoom -%] + 'zoomToBounds': 1, +[%- END %] [% IF map.zoom -%] 'zoom': [% map.zoom %], [%- END %] diff --git a/templates/web/default/maps/tilma/original.html b/templates/web/default/maps/tilma/original.html index e02a974f8..5a07683ac 100644 --- a/templates/web/default/maps/tilma/original.html +++ b/templates/web/default/maps/tilma/original.html @@ -22,6 +22,7 @@ <script type="text/javascript"> [% c.cobrand.root_path_js %] var fixmystreet = { + 'all_pins': [% all_pins || "''" | html %], 'x': [% map.x - 3 %], 'y': [% map.y - 3 %], 'start_x': [% map.px %], diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index 92ca7ff34..a9ce12dd4 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -156,7 +156,7 @@ </p> <p> - <input type="checkbox" name="remember_me" value='1'[% ' checked' IF remember_me %]> + <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> <label class="n" for="remember_me"> [% loc('Keep me signed in on this computer') %] </label> diff --git a/templates/web/default/report/new/fill_in_details.html b/templates/web/default/report/new/fill_in_details.html index 68443770d..32d4a733b 100644 --- a/templates/web/default/report/new/fill_in_details.html +++ b/templates/web/default/report/new/fill_in_details.html @@ -159,7 +159,7 @@ </p> <p> - <input type="checkbox" name="remember_me" value='1'[% ' checked' IF remember_me %]> + <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> <label class="n" for="remember_me"> [% loc('Keep me signed in on this computer') %] </label> diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html index 1c35481e7..d2578f9f2 100755 --- a/templates/web/default/reports/council.html +++ b/templates/web/default/reports/council.html @@ -8,12 +8,29 @@ %] [% END %] -[% INCLUDE 'header.html', +[% + PROCESS "maps/${map.type}.html"; + INCLUDE 'header.html', title = tprintf(loc('%s - Summary reports'), name) context = 'reports' rss = [ tprintf(loc('Problems within %s, FixMyStreet'), name), rss_url ] %] +[% map_html %] + +[% IF children %] +<h2 style="clear:right">[% loc('Wards of this council') %]</h2> +<p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> +<ul> +[% FOR c IN children.values.sort('name') %] +<li><a href="[% c.url %]">[% c.name %]</a></p> +[% END %] +</ul> +[% END %] + +</div> +<div id="side"> + <p><a href="[% rss_url %]"><img align="right" src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% tprintf(loc('RSS feed of problems in this %s'), thing) %]" border="0" hspace="4"></a> [% IF c.cobrand.all_councils_report %] @@ -22,24 +39,21 @@ [% tprintf( loc('This is a summary of all reports for this %s.'), thing ) %] [% END %] -[%# FIXME: It should link to council from a ward page, and should have list of wards on a council page. And a map? - The reason c.req.base/path is used below is that passing undef to uri_with - in a template actually passes "", and so the key still appears in the URL. -%] - -[% IF c.req.parameters.all AND !c.cobrand.all_councils_report %] - [% tprintf( loc('You can <a href="%s">see less detail</a>.'), c.req.base _ c.req.path ) %] -[% ELSIF !c.cobrand.all_councils_report %] - [% tprintf( loc('You can <a href="%s">see more details</a>.'), c.req.uri_with( { all = 1 } ) ) %] -[% ELSIF c.req.parameters.all %] - [% tprintf( loc('You can <a href="%s">see less detail</a> or go back and <a href="/reports">show all councils</a>.'), c.req.base _ c.req.path ) %] +[% IF ward %] +[% tprintf( loc('You can <a href="%s">view all reports for the council</a> or <a href="/reports">show all councils</a>.'), council_url ) %] [% ELSE %] - [% tprintf( loc('You can <a href="%s">see more details</a> or go back and <a href="/reports">show all councils</a>.'), c.req.uri_with( { all = 1 } ) ) %] +[% loc('You can <a href="/reports">show all councils</a>.') %] [% END %] <h2>[% name %]</h2> -<div id="col_problems"> + [% INCLUDE 'pagination' %] + + [% INCLUDE column + title = loc('Recently fixed') + problems = fixed.${council.id}.new + %] + [% INCLUDE column title = loc('New problems') problems = open.${council.id}.new @@ -62,19 +76,13 @@ problems = open.${council.id}.unknown %] [% END %] -</div> -<div id="col_fixed"> - [% INCLUDE column - title = loc('Recently fixed') - problems = fixed.${council.id}.new - %] [% INCLUDE column title = loc('Old fixed') problems = fixed.${council.id}.old %] -</div> +</div> [% INCLUDE 'footer.html' %] [% BLOCK column %] @@ -89,7 +97,6 @@ [% IF c.cobrand.moniker != 'emptyhomes' %] [% IF problem.councils == 0 %] <small>[% loc('(not sent to council)') %]</small> [% END %] [% END %] - [% IF all %] <br><small>[% problem.detail %]</small> [% END %] </li> [% END %] </ul> @@ -97,3 +104,23 @@ [% END %] [% END %] +[% BLOCK pagination %] + [% IF pager.last_page > 1 %] + <p> + [% IF pager.previous_page %] + <a href="[% c.req.uri_with({'p' => pager.previous_page}) %]">← Previous</a> + [% ELSE %] + ← Previous + [% END %] + | + [% pager.first %] to [% pager.last %] of [% pager.total_entries %] + | + [% IF pager.next_page %] + <a href="[% c.req.uri_with({'p' => pager.next_page}) %]">Next →</a> + [% ELSE %] + Next → + [% END %] + </p> + [% END %] +[% END %] + |