diff options
Diffstat (limited to 'templates/web/default')
24 files changed, 126 insertions, 186 deletions
diff --git a/templates/web/default/admin/index.html b/templates/web/default/admin/index.html index 59722a5ed..d1ed09114 100644 --- a/templates/web/default/admin/index.html +++ b/templates/web/default/admin/index.html @@ -11,7 +11,8 @@ [% END -%] <ul> - <li>[% tprintf( loc('<strong>%d</strong> live problems'), total_problems_live ) %]</li> + <li>[% tprintf( loc('<strong>%d</strong> live problems'), total_problems_live ) %]; + [% tprintf( loc('from %d different users'), total_problems_users ) %]</li> <li>[% tprintf( loc('%d live updates'), comments.confirmed || 0 ) %]</li> <li>[% tprintf( loc('%d confirmed alerts, %d unconfirmed'), alerts.1, alerts.0) %]</li> <li>[% tprintf( loc('%d questionnaires sent – %d answered (%s%%)'), questionnaires.total, questionnaires.1, questionnaires_pc) %]</li> @@ -28,4 +29,14 @@ [% PROCESS states title=loc('Update breakdown by state') object=comments %] +[% FOREACH category IN categories %] + [% IF loop.first %] + <h2>[% loc('Category fix rate for problems > 4 weeks old') %]</h2> + <table> + <tr><th>[% loc('Category') %]</th><th>[% loc('Total') %]</th><th>[% loc('Fixed') %]</th></tr> + [% END %] + <tr><td>[% category.key %]</td><td>[% category.value.total %]</td><td>[% category.value.fixed / category.value.total * 100 | format('%.1f') %]%</td></tr> + [% '</table>' IF loop.last %] +[% END %] + [% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/default/admin/list_updates.html b/templates/web/default/admin/list_updates.html index bc871d80d..4f27b9595 100644 --- a/templates/web/default/admin/list_updates.html +++ b/templates/web/default/admin/list_updates.html @@ -29,7 +29,7 @@ <td>[% PROCESS format_time time=update.created %]</td> <td>[% IF update.anonymous %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> <td>[% IF update.user.id == update.problem.user_id %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> - <td>[% IF update.user.from_council && update.user.from_council == update.problem.council %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> + <td>[% IF update.user.belongs_to_council( update.problem.council ) %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> <td>[% update.cobrand %]<br>[% update.cobrand_data | html %]</td> <td>[% update.text | html %]</td> <td><a href="[% c.uri_for( 'update_edit', update.id ) %]">[% loc('Edit') %]</a></td> diff --git a/templates/web/default/admin/questionnaire.html b/templates/web/default/admin/questionnaire.html index baeb7c800..680e0d214 100644 --- a/templates/web/default/admin/questionnaire.html +++ b/templates/web/default/admin/questionnaire.html @@ -7,8 +7,8 @@ </tr> [% IF questionnaires.total > 0 %] <tr> - <td>[% questionnaires.1 %] ([% reported_pc %]%)</td> - <td>[% questionnaires.0 %] ([% not_reported_pc %]%)</td> + <td>[% questionnaires.1 %] ([% 100 * questionnaires.1 / questionnaires.total | format('%.1f') %]%)</td> + <td>[% questionnaires.0 %] ([% 100 * questionnaires.0 / questionnaires.total | format('%.1f') %]%)</td> </tr> [% ELSE %] <tr> @@ -18,4 +18,13 @@ [% END %] </table> +<h2>[% loc('Problem state change based on survey results') %]</h2> + +<table> +<tr><th>[% loc('Old state') %]</th><th>[% loc('New state') %]</th><th>[% loc('Total') %]</th></tr> +[% WHILE ( s = state_changes.next ) %] +<tr><td>[% s.old_state %]</td><td>[% s.new_state %]</td><td>[% s.get_column('c') %] ([% 100 * s.get_column('c') / state_changes_count | format('%.1f') %]%)</td></tr> +[% END %] +</table> + [% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/default/admin/timeline.html b/templates/web/default/admin/timeline.html index a7f4f3628..95120e48c 100644 --- a/templates/web/default/admin/timeline.html +++ b/templates/web/default/admin/timeline.html @@ -32,7 +32,7 @@ [% tprintf(loc("Questionnaire %d answered for problem %d, %s to %s"), item.obj.id, item.obj.problem_id, item.obj.old_state, item.obj.new_state ) %] [% CASE 'update' %] [% name = ( item.obj.name || 'anonymous' ) | html %] - [% tprintf(loc("Update %s created for problem %d; by %s"), "<a href='" _ c.uri_for_email( '/report', item.obj.problem_id, c.cobrand_data ) _ "#update_" _ item.obj.id _ "'>" _ item.obj.id _ "</a>", item.obj.problem_id, name) %]<[% item.obj.user.email | html %]> + [% tprintf(loc("Update %s created for problem %d; by %s"), "<a href='" _ c.uri_for_email( '/report', item.obj.problem_id, c.cobrand_data ) _ "#update_" _ item.obj.id _ "'>" _ item.obj.id _ "</a>", item.obj.problem_id, name) %] <[% item.obj.user.email | html %]> [% CASE 'alertSub' %] [% tprintf(loc("Alert %d created for %s, type %s, parameters %s / %s"), item.obj.id, item.obj.user.email, item.obj.alert_type.ref, item.obj.parameter, item.obj.parameter2) | html %] [% CASE 'alertDel' %] diff --git a/templates/web/default/around/around_map_list_items.html b/templates/web/default/around/around_map_list_items.html index e13e9ccc9..a98f25dbe 100644 --- a/templates/web/default/around/around_map_list_items.html +++ b/templates/web/default/around/around_map_list_items.html @@ -5,7 +5,7 @@ <li> <a href="[% c.uri_for('/report', p.problem.id ) %]">[% p.problem.title | html %]</a> - <small>([% prettify_epoch( p.problem.confirmed_local.epoch, 1 ) %], [% dist %]km)</small> + <small>[% prettify_epoch( p.problem.confirmed_local.epoch, 1 ) %], [% dist %]km</small> [% IF p.problem.state == 'fixed' %] <small>[% loc('(fixed)') %]</small> [% END %] diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html index 529c12eec..395054645 100755 --- a/templates/web/default/around/display_location.html +++ b/templates/web/default/around/display_location.html @@ -36,7 +36,9 @@ %] <form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm"> -<input type="hidden" name="map" value="[% c.req.params.map | html %]"> +[% IF c.req.params.map_override %] +<input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> +[% END %] <input type="hidden" name="pc" value="[% pc | html %]"> [% c.cobrand.form_elements('mapForm') %] @@ -101,7 +103,7 @@ </ul> - <h2 id="closest_problems"> + <h2> [% tprintf( loc( 'Closest nearby problems <small>(within %skm)</small>' ), diff --git a/templates/web/default/around/on_map_list_items.html b/templates/web/default/around/on_map_list_items.html index 9db3d9492..2db7d00d2 100644 --- a/templates/web/default/around/on_map_list_items.html +++ b/templates/web/default/around/on_map_list_items.html @@ -2,7 +2,7 @@ [% FOREACH p IN on_map %] <li> <a href="[% c.uri_for('/report', p.id ) %]">[% p.title | html %]</a> - <small>([% prettify_epoch( p.confirmed_local.epoch, 1 ) %])</small> + <small>[% prettify_epoch( p.confirmed_local.epoch, 1 ) %]</small> [% IF p.state == 'fixed' %] <small>[% loc('(fixed)') %]</small> [% END %] diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html index 5f9a09199..234aadf52 100644 --- a/templates/web/default/auth/general.html +++ b/templates/web/default/auth/general.html @@ -20,7 +20,7 @@ [% IF loc_email_error %] <div class="form-error">[% loc_email_error %]</div> [% ELSIF sign_in_error %] - <div class="form-error">[% loc('There was a problem with your email/password combination. Please try again.') %]</div> + <div class="form-error">[% loc('There was a problem with your email/password combination. Passwords and user accounts are a brand <strong>new</strong> service, so you probably do not have one yet – please fill in the right hand side of this form to get one.') %]</div> [% END %] <div class="form-field"> diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html index e69dac27d..f9048b067 100644 --- a/templates/web/default/common_header_tags.html +++ b/templates/web/default/common_header_tags.html @@ -1,11 +1,13 @@ <meta http-equiv="content-type" content="text/html; charset=utf-8"> -<script type="text/javascript" src="/yui/utilities.js"></script> +<script type="text/javascript" src="/jslib/jquery-1.6.2.min.js"></script> <script type="text/javascript" src="/js/fixmystreet.js"></script> [% map_js %] [% IF robots %] <meta name="robots" content="[% robots %]"> +[% ELSIF c.config.STAGING_SITE %] + <meta name="robots" content="noindex,nofollow"> [% END %] [% IF rss %] diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index 0907d6275..e943bf28f 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -17,13 +17,15 @@ or clearing</strong>, such as: <li>Flyposting or graffiti <li>Flytipping or litter <li>Streetcleaning, such as broken glass in a cycle lane + [% IF c.cobrand.moniker != 'southampton' %] <li>Unlit lamposts + [% END %] <li>Potholes </ul> </dd> <dt>What isn’t FixMyStreet for?</dt> - <dd>FixMyStreet is not a way of getting in touch with your council for all + <dd>FixMyStreet is not a way of getting in touch with [% c.cobrand.moniker == 'southampton' ? '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 @@ -49,10 +51,10 @@ 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 relevant council by email. The + <dd>They are reported to the [% IF c.cobrand.moniker != 'southampton' %]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, and -then together lobby the council to fix it, or fix it directly yourselves.</dd> +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> <dt>Is it free?</dt> <dd>The site is free to use, yes. FixMyStreet is run by a registered charity, though, so if you want to make a contribution, <a @@ -90,6 +92,8 @@ href="https://secure.mysociety.org/donate/">please do</a>.</dd> <dd>You can either leave a test report or <a href="/contact">contact us</a> to find out where reports go at the moment. Also <a href="/contact">contact us</a> to update the address or addresses we use.</dd> + <dt>I’m from a council, can we have FixMyStreet on our website?</dt> + <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. <a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">Full details</a>.</dd> <dt>Do you remove silly or illegal content?</dt> <dd>FixMyStreet is not responsible for the content and accuracy of material submitted by its users. We reserve the right to edit or remove any diff --git a/templates/web/default/header.html b/templates/web/default/header.html index 4221de86b..431e6db65 100644 --- a/templates/web/default/header.html +++ b/templates/web/default/header.html @@ -9,6 +9,10 @@ <style type="text/css">@import url("/css/ie6.css");</style> <![endif]--> + [% IF c.req.uri.host == 'osm.fixmystreet.com' %] + <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]"> + [% END %] + </head> <body> diff --git a/templates/web/default/index.html b/templates/web/default/index.html index 4443e060f..131701b0e 100644 --- a/templates/web/default/index.html +++ b/templates/web/default/index.html @@ -82,11 +82,4 @@ </div> [% END %] -[% IF c.cobrand.moniker == 'emptyhomes' %] -<div id="eha_advert"> - Now is the best time to turn empty properties into empty homes... Don't miss it! - <a href="http://www.emptyhomes.com/EHConference2011.html">Home Again: Empty Homes National Conference 2011</a> -</div> -[% END %] - [% INCLUDE 'footer.html' %] diff --git a/templates/web/default/maps/fms.html b/templates/web/default/maps/fms.html index 36fd48467..6e6d747bf 100644 --- a/templates/web/default/maps/fms.html +++ b/templates/web/default/maps/fms.html @@ -3,6 +3,9 @@ <script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script> <script type="text/javascript" src="/js/map-OpenLayers.js"></script> <script type="text/javascript" src="/js/map-bing-ol.js"></script> +<!--[if lte IE 6]> + <link rel="stylesheet" href="/jslib/OpenLayers-2.10/theme/default/ie6-style.css" type="text/css" /> +<![endif]--> [% END %] [% map_html = BLOCK %] diff --git a/templates/web/default/maps/openlayers.html b/templates/web/default/maps/openlayers.html index 45551c3d5..b84799fdd 100644 --- a/templates/web/default/maps/openlayers.html +++ b/templates/web/default/maps/openlayers.html @@ -86,7 +86,7 @@ var fixmystreet = { <a title="[% pin.title | html %]" href="[% c.uri_for('/report/' _ pin.id) %]"> [%- END -%] <img border="0" class="pin" src="[% c.uri_for('/i/pin' _ cols.${pin.colour} _ '.gif') %]" - alt="[% loc('Problem') %]" style="top:[% pin.py - 59 %]px; left:[% pin.px %]px; position: absolute;"> + alt="[% loc('Problem') %]" style="top:[% pin.py - 59 %]px; left:[% pin.px - 2 %]px; position: absolute;"> [%- IF pin.id -%] </a> [% END %] diff --git a/templates/web/default/maps/osm-streetview.html b/templates/web/default/maps/osm-streetview.html index ba8d1fba4..9de99c253 100644 --- a/templates/web/default/maps/osm-streetview.html +++ b/templates/web/default/maps/osm-streetview.html @@ -2,6 +2,9 @@ <script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script> <script type="text/javascript" src="/js/map-OpenLayers.js"></script> <script type="text/javascript" src="/js/map-streetview.js"></script> +<!--[if lte IE 6]> + <link rel="stylesheet" href="/jslib/OpenLayers-2.10/theme/default/ie6-style.css" type="text/css" /> +<![endif]--> [% END %] [% map_html = BLOCK %] diff --git a/templates/web/default/maps/osm.html b/templates/web/default/maps/osm.html index c6529566e..e2762ee26 100644 --- a/templates/web/default/maps/osm.html +++ b/templates/web/default/maps/osm.html @@ -2,6 +2,9 @@ <script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script> <script type="text/javascript" src="/js/map-OpenLayers.js"></script> <script type="text/javascript" src="/js/map-OpenStreetMap.js"></script> +<!--[if lte IE 6]> + <link rel="stylesheet" href="/jslib/OpenLayers-2.10/theme/default/ie6-style.css" type="text/css" /> +<![endif]--> [% END %] [% map_html = BLOCK %] diff --git a/templates/web/default/maps/pins_js.html b/templates/web/default/maps/pins_js.html index 4a5814b15..355fffaba 100644 --- a/templates/web/default/maps/pins_js.html +++ b/templates/web/default/maps/pins_js.html @@ -1,4 +1,4 @@ [ [% FOR pin IN map.pins -%] - [ [% pin.latitude %], [% pin.longitude %], '[% pin.colour %]', '[% pin.id %]', '[% pin.title %]' ] + [ [% pin.latitude %], [% pin.longitude %], '[% pin.colour %]', '[% pin.id %]', "[% pin.title | escape_js %]" ] [%- IF !loop.last %],[% END %] [% END %] ] diff --git a/templates/web/default/maps/tilma/openlayers.html b/templates/web/default/maps/tilma/openlayers.html deleted file mode 100644 index c8ae53bfe..000000000 --- a/templates/web/default/maps/tilma/openlayers.html +++ /dev/null @@ -1,26 +0,0 @@ -[% map_js = BLOCK %] -<script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script> -<script type="text/javascript" src="/js/map-OpenLayers.js"></script> -<script type="text/javascript" src="/js/map-tilma-ol.js"></script> -<script type="text/javascript" src="/js/OpenLayers.Projection.OrdnanceSurvey.js"></script> -[% END %] - -[% map_html = BLOCK %] -<script type="text/javascript"> -var fixmystreet = { - 'tilewidth': [% map.tilewidth %], - 'tileheight': [% map.tilewidth %], - 'latitude': [% map.latitude %], - 'longitude': [% map.longitude %], - 'pins': [% INCLUDE maps/pins_js.html %], - 'tile_type': '[% map.tile_type %]', - 'maxResolution': [% map.maxResolution %] -}; -</script> -<div id="map_box"> - [% pre_map %] - <div id="map"> - [% '<div id="watermark"></div>' IF map.watermark %] - </div> - <p id="copyright">[% map.copyright %]</p> -[% END %] diff --git a/templates/web/default/maps/tilma/original.html b/templates/web/default/maps/tilma/original.html deleted file mode 100644 index 5a07683ac..000000000 --- a/templates/web/default/maps/tilma/original.html +++ /dev/null @@ -1,89 +0,0 @@ -[% map_js = BLOCK %] -<script type="text/javascript" src="/js/map-tilma.js"></script> -[% END %] - -[% map_html = BLOCK %] - -[% IF !map.tiles %] - <div id="map_box"> - <div id="map"><div id="drag"> - [% loc("Unable to fetch the map tiles from the tile server.") %] - </div></div> - [% RETURN %] -[% END %] - -[% IF map.clickable %] -<input type="hidden" name="x" id="formX" value="[% map.x %]"> -<input type="hidden" name="y" id="formY" value="[% map.y %]"> - [% map.img_type = 'input type="image"' %] -[% ELSE %] - [% map.img_type = 'img' %] -[% END %] -<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 %], - 'start_y': [% map.py %], - 'tile_type': '[% map.tile_type %]', - 'tilewidth': [% map.tilewidth %], - 'tileheight': [% map.tilewidth %] -}; -</script> -<div id="map_box"> - [% pre_map %] - <div id="map"><div id="drag"> - <[% map.img_type %] - alt="NW map tile" id="t2.2" name="tile_[% map.x - 1 %].[% map.y %]" src="[% map.url %][% map.tileids.0.0 %]" style="top:0px; left:0;"><[% map.img_type %] - alt="NE map tile" id="t2.3" name="tile_[% map.x %].[% map.y %]" src="[% map.url %][% map.tileids.0.1 %]" style="top:0px; left:[% map.tilewidth %]px;"><br><[% map.img_type %] - alt="SW map tile" id="t3.2" name="tile_[% map.x - 1 %].[% map.y - 1 %]" src="[% map.url %][% map.tileids.1.0 %]" style="top:[% map.tilewidth %]px; left:0;"><[% map.img_type %] - alt="SE map tile" id="t3.3" name="tile_[% map.x %].[% map.y - 1 %]" src="[% map.url %][% map.tileids.1.1 %]" style="top:[% map.tilewidth %]px; left:[% map.tilewidth %]px;"> - <div id="pins">[% FOR pin IN map.pins %][% INCLUDE pin %][% END %]</div> - </div> - [% '<div id="watermark"></div>' IF map.watermark %] - [% INCLUDE compass %] - </div> - <p id="copyright">[% map.copyright %]</p> -[% END %] - - -[% BLOCK pin %] - -[% num = '' IF !num or num > 9; - cols = { - red = 'R', green = 'G', blue = 'B', purple = 'P', - } -%] -[% IF pin.id %] -<a title="[% pin.title | html %]" href="[% c.uri_for('/report/' _ pin.id) %]"> -[%- END -%] -<img class="pin" src="[% c.uri_for('/i/pin' _ cols.${pin.colour} _ num _ '.gif') %]" - alt="[% loc('Problem') %]" style="top:[% pin.py - 59 %]px; left:[% pin.px %]px; position: absolute;"> -[%- IF pin.id -%] -</a> -[% END %] - -[% END %] - - -[% BLOCK compass %] - <table cellpadding="0" cellspacing="0" border="0" id="compass"> - <tr valign="bottom"> - <td align="right"><a href="[% c.req.uri_with( { x => map.x - 1, y => map.y + 1 } ) %]"><img src="[% c.uri_for('/i/arrow-northwest.gif') %]" alt="NW" width=11 height=11></a></td> - <td align="center"><a href="[% c.req.uri_with( { x => map.x, y => map.y + 1 } ) %]"><img src="[% c.uri_for('/i/arrow-north.gif') %]" vspace="3" alt="N" width=13 height=11></a></td> - <td><a href="[% c.req.uri_with( { x => map.x + 1, y => map.y + 1 } ) %]"><img src="[% c.uri_for('/i/arrow-northeast.gif') %]" alt="NE" width=11 height=11></a></td> - </tr> - <tr> - <td><a href="[% c.req.uri_with( { x => map.x - 1, y => map.y } ) %]"><img src="[% c.uri_for('/i/arrow-west.gif') %]" hspace="3" alt="W" width=11 height=13></a></td> - <td align="center"><a href="$recentre"><img src="[% c.uri_for('/i/rose.gif') %]" alt="Recentre" width=35 height=34></a></td> - <td><a href="[% c.req.uri_with( { x => map.x + 1, y => map.y } ) %]"><img src="[% c.uri_for('/i/arrow-east.gif') %]" hspace="3" alt="E" width=11 height=13></a></td> - </tr> - <tr valign="top"> - <td align="right"><a href="[% c.req.uri_with( { x => map.x - 1, y => map.y - 1 } ) %]"><img src="[% c.uri_for('/i/arrow-southwest.gif') %]" alt="SW" width=11 height=11></a></td> - <td align="center"><a href="[% c.req.uri_with( { x => map.x, y => map.y - 1 } ) %]"><img src="[% c.uri_for('/i/arrow-south.gif') %]" vspace="3" alt="S" width=13 height=11></a></td> - <td><a href="[% c.req.uri_with( { x => map.x + 1, y => map.y - 1 } ) %]"><img src="[% c.uri_for('/i/arrow-southeast.gif') %]" alt="SE" width=11 height=11></a></td> - </tr> - </table> -[% END %] diff --git a/templates/web/default/my/my.html b/templates/web/default/my/my.html index e7f4ca72d..2147ef5f2 100644 --- a/templates/web/default/my/my.html +++ b/templates/web/default/my/my.html @@ -13,7 +13,10 @@ <h1>[% loc('Your Reports') %]</h1> -[% INCLUDE pagination, pager = problems_pager %] +[% INCLUDE 'pagination.html', + pager = problems_pager, + param = 'p' +%] [% FOREACH p = problems.confirmed %] [% IF loop.first %]<h2>[% loc('Open reports') %]</h2>[% END %] @@ -35,7 +38,10 @@ END %] [% FOREACH u IN updates %] [% IF loop.first %] <h2>[% loc('Your updates') %]</h2> - [% INCLUDE pagination, pager = updates_pager %] + [% INCLUDE 'pagination.html', + pager = updates_pager, + param = 'u' + %] <ul> [% END %] @@ -68,22 +74,3 @@ END %] [% "</ul>" IF loop.last %] [% END %] -[% BLOCK pagination %] - [% IF pager.last_page > 1 %] - <p> - [% IF pager.previous_page %] - <a href="[% c.req.uri_with({'p_page' => 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_page' => pager.next_page}) %]">Next →</a> - [% ELSE %] - Next → - [% END %] - </p> - [% END %] -[% END %] diff --git a/templates/web/default/pagination.html b/templates/web/default/pagination.html new file mode 100644 index 000000000..f5a1192d1 --- /dev/null +++ b/templates/web/default/pagination.html @@ -0,0 +1,17 @@ +[% IF pager.last_page > 1 %] + <p> + [% IF pager.previous_page %] + <a href="[% c.req.uri_with({ $param => 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({ $param => pager.next_page }) %]">Next →</a> + [% ELSE %] + Next → + [% END %] + </p> +[% END %] diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index 72927da20..fe26ec60d 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -85,7 +85,7 @@ <textarea name="update" id="form_update" rows="7" cols="30">[% update.text | html %]</textarea> </div> - [% IF c.user && c.user.from_council && c.user.from_council == problem.council %] + [% IF c.user && c.user.belongs_to_council( problem.council ) %] <div class="form-field"> <label for="form_state">[% loc( 'State:' ) %]</label> <select name="state" id="form_state"> diff --git a/templates/web/default/report/new/fill_in_details.html b/templates/web/default/report/new/fill_in_details.html index 32d4a733b..8150ba894 100644 --- a/templates/web/default/report/new/fill_in_details.html +++ b/templates/web/default/report/new/fill_in_details.html @@ -5,7 +5,9 @@ [% IF report.used_map %] <form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %]> -<input type="hidden" name="map" value="[% c.req.params.map | html %]"> +[% IF c.req.params.map_override %] +<input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> +[% END %] <input type="hidden" name="pc" value="[% pc | html %]"> [% c.cobrand.form_elements('mapForm') %] [% ELSE %] diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html index d2578f9f2..2b004cf50 100755 --- a/templates/web/default/reports/council.html +++ b/templates/web/default/reports/council.html @@ -18,12 +18,12 @@ [% map_html %] -[% IF children %] +[% IF children.size %] <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> +[% FOR child IN children.values.sort('name') %] +<li><a href="[% child.url %]">[% child.name %]</a></p> [% END %] </ul> [% END %] @@ -31,7 +31,35 @@ </div> <div id="side"> +[% IF council.generation_high == 10 AND c.cobrand.country == 'GB' %] +<p id="unknown">This council no longer exists. +[% IF council.name.match('Penwith|Kerrier|Carrick|Restormel|Caradon|North Cornwall') %] +Its area is now covered by <a href="/reports/Cornwall">Cornwall Council</a>. +[% ELSIF council.name.match('Durham|Easington|Sedgefield|Teesdale|Wear Valley|Derwentside|Chester le Street') %] +Its area is now covered by <a href="/reports/Durham+County">Durham County Council</a>. +[% ELSIF council.name.match('Blyth Valley|Wansbeck|Castle Morpeth|Tynedale|Alnwick|Berwick upon Tweed') %] +Its area is now covered by <a href="/reports/Northumberland">Northumberland County Council</a>. +[% ELSIF council.name.match('North Shropshire|Oswestry|Shrewsbury and Atcham|South Shropshire|Bridgnorth') %] +Its area is now covered by <a href="/reports/Shropshire">Shropshire Council</a>. +[% ELSIF council.name.match('Salisbury|West Wiltshire|Kennet|North Wiltshire') %] +Its area is now covered by <a href="/reports/Wiltshire">Wiltshire Council</a>. +[% ELSIF council.name.match('Ellesmere Port and Neston|Vale Royal|Chester') %] +Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a>. +[% ELSIF council.name.match('Macclesfield|Congleton|Crewe and Nantwich') %] +Its area is now covered by <a href="/reports/Cheshire+East">Cheshire East Council</a>. +[% ELSIF council.name.match('Mid Bedfordshire|South Bedfordshire') %] +Its area is now covered by <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. +[% ELSIF council.name.match('Cheshire') %] +Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a> or +<a href="/reports/Cheshire+East">Cheshire East Council</a>. +[% ELSIF council.name.match('Bedfordshire') %] +Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a> or +<a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. +[% END %] +</p> +[% ELSE %] <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> +[% END %] [% IF c.cobrand.all_councils_report %] [% tprintf( loc('This is a summary of all reports for one %s.'), thing ) %] @@ -47,7 +75,14 @@ <h2>[% name %]</h2> - [% INCLUDE 'pagination' %] +[% IF c.cobrand.moniker == '' %] +<p class="promo"> + FixMyStreet is now available for local council websites. + <a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">Find out more</a>. +</p> +[% END %] + + [% INCLUDE 'pagination.html', param = 'p' %] [% INCLUDE column title = loc('Recently fixed') @@ -104,23 +139,3 @@ [% 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 %] - |