diff options
Diffstat (limited to 'templates/web/default')
20 files changed, 166 insertions, 134 deletions
diff --git a/templates/web/default/alert/index.html b/templates/web/default/alert/index.html index d8478cf98..274d61780 100644 --- a/templates/web/default/alert/index.html +++ b/templates/web/default/alert/index.html @@ -30,7 +30,7 @@ postcode or street name and area:' ) %] <h2>[% loc('Some photos of recent reports') %]</h2> [% FOREACH p IN photos %] <a href="/report/[% p.id %]"><img border="0" height="100" - src="/photo?tn=1;id=[% p.id %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a> + src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> [% END %] </div> [% END %] diff --git a/templates/web/default/alert/list.html b/templates/web/default/alert/list.html index c763331cc..9f2bd69d0 100644 --- a/templates/web/default/alert/list.html +++ b/templates/web/default/alert/list.html @@ -27,7 +27,7 @@ <h2>[% loc('Photos of recent nearby reports') %]</h2> [% FOREACH p IN photos %] <a href="/report/[% p.id %]"><img border="0" height="100" - src="/photo?tn=1;id=[% p.id %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a> + src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> [% END %] </div> [% END %] diff --git a/templates/web/default/around/around_index.html b/templates/web/default/around/around_index.html index c07eb2ca2..012354f4a 100644 --- a/templates/web/default/around/around_index.html +++ b/templates/web/default/around/around_index.html @@ -39,7 +39,7 @@ [% IF partial_token %] <p style="margin-top: 0; color: #cc0000;"> - <img align="right" src="/photo?id=[% report.id %]" hspace="5"> + <img align="right" src="/photo/[% report.id %].jpeg" hspace="5"> [% loc("Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box below :") %] </p> [% END %] diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html index b5705a77b..27f54f346 100755 --- a/templates/web/default/around/display_location.html +++ b/templates/web/default/around/display_location.html @@ -55,9 +55,9 @@ [% IF c.cobrand.country == 'GB' || c.cobrand.country == 'NO' %] | [% IF c.req.params.all_pins %] - <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => undef } ) %]'>[% loc('Hide stale reports') %]</a> + <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => undef } ) %]'>[% loc('Hide old') %]</a> [% ELSE %] - <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => 1 } ) %]'>[% loc('Include stale reports') %]</a> + <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => 1 } ) %]'>[% loc('Show old') %]</a> [% END %] [% END %] </p> diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html index 5407e56e1..f5e2e423f 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. 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> + <div class="form-error">[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form.') %]</div> [% END %] <div class="form-field"> @@ -34,7 +34,7 @@ <div id="form_sign_in_yes"> <p> - <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password:') %]</label> + <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> <input type="password" name="password_sign_in" id="password_sign_in" value=""> </p> diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html index 95b59d9dd..e74ae7b70 100644 --- a/templates/web/default/common_header_tags.html +++ b/templates/web/default/common_header_tags.html @@ -1,12 +1,13 @@ -[% INCLUDE 'js_validation_msgs.html' %] - +[% USE date %][% USE Math %] <meta http-equiv="content-type" content="text/html; charset=utf-8"> -<script type="text/javascript" src="/jslib/jquery-1.7.0.min.js"></script> +<script type="text/javascript" src="/js/validation_strings.[% lang_code %].js?[% Math.int( date.now / 3600 ) %]"></script> + +<script type="text/javascript" src="/jslib/jquery-1.7.0.min.js"></script> <script src="[% version('/js/jquery.validate.min.js') %]" type="text/javascript" charset="utf-8"></script> <script type="text/javascript" src="[% version('/js/geo.min.js') %]"></script> -<script type="text/javascript" src="[% version('/js/fixmystreet.js') %]"></script> +<script type="text/javascript" src="[% version(js_override || '/js/fixmystreet.js') %]"></script> [% map_js %] diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index 599d3a37e..ed9d53c24 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -93,7 +93,7 @@ href="https://secure.mysociety.org/donate/">please do</a>.</dd> 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> + <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. <a href="/for-councils">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/index.html b/templates/web/default/index.html index 06f3ef771..e5f98b0c5 100644 --- a/templates/web/default/index.html +++ b/templates/web/default/index.html @@ -63,7 +63,7 @@ <p id="front_photos"> [% FOREACH p IN recent_photos %] <a href="/report/[% p.id %]"><img border="0" height="100" - src="/photo?tn=1;id=[% p.id %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a> + src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> [% END %] </p> [% END %] diff --git a/templates/web/default/js_validation_msgs.html b/templates/web/default/js/validation_strings.html index 0263f75ce..70a0ed41c 100644 --- a/templates/web/default/js_validation_msgs.html +++ b/templates/web/default/js/validation_strings.html @@ -1,11 +1,10 @@ -<script type="text/javascript"> validation_strings = { update: '[% loc('Please enter a message') %]', title: '[% loc('Please enter a subject') %]', detail: '[% loc('Please enter some details') %]', name: { required: '[% loc('Please enter your name') %]', - validName: '[% loc('Please enter your full name, councils need this information - if you do not wish your name to be shown on the site, untick the box') %]' + validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') %]' }, category: '[% loc('Please choose a category') %]', rznvy: { @@ -17,4 +16,3 @@ email: '[% loc('Please enter a valid email') %]' } }; -</script> diff --git a/templates/web/default/maps/openlayers.html b/templates/web/default/maps/openlayers.html index 1c0a32278..e815642f1 100644 --- a/templates/web/default/maps/openlayers.html +++ b/templates/web/default/maps/openlayers.html @@ -59,8 +59,8 @@ var fixmystreet = { east = c.uri_with( { lat = map.compass.east.0, lon = map.compass.east.1, zoom = map.zoom } ) west = c.uri_with( { lat = map.compass.west.0, lon = map.compass.west.1, zoom = map.zoom } ) world = c.uri_with( { zoom = 0 } ); - SET zoom_in = c.uri_with( { zoom = map.zoom + 1 } ) IF map.zoom < map.numZoomLevels - 1; - SET zoom_out = c.uri_with( { zoom = map.zoom - 1 } ) IF map.zoom > 0; + SET zoom_in = c.uri_with( { lat = map.latitude, lon = map.longitude, zoom = map.zoom + 1 } ) IF map.zoom < map.numZoomLevels - 1; + SET zoom_out = c.uri_with( { lat = map.latitude, lon = map.longitude, zoom = map.zoom - 1 } ) IF map.zoom > 0; SET zoom_in = '#' IF map.zoom >= map.numZoomLevels - 1; SET zoom_out = '#' IF map.zoom <= 0; %] @@ -78,15 +78,11 @@ var fixmystreet = { [% BLOCK pin %] -[% 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 border="0" class="pin" src="[% c.uri_for('/i/pin' _ cols.${pin.colour} _ '.png') %]" - alt="[% loc('Problem') %]" style="top:[% pin.py - 58 %]px; left:[% pin.px - 22 %]px; position: absolute;"> +<img border="0" class="pin" src="[% c.uri_for('/i/pin-' _ pin.colour _ '.png') %]" + alt="[% loc('Problem') %]" style="top:[% pin.py - 64 %]px; left:[% pin.px - 24 %]px; position: absolute;"> [%- IF pin.id -%] </a> [% END %] diff --git a/templates/web/default/maps/pins_js.html b/templates/web/default/maps/pins_js.html index 355fffaba..d9c6b3531 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 | escape_js %]" ] + [ [% pin.latitude %], [% pin.longitude %], '[% pin.colour %]', '[% pin.id %]', "[% pin.title | escape_js %]", '[% pin.type %]' ] [%- IF !loop.last %],[% END %] [% END %] ] diff --git a/templates/web/default/questionnaire/creator_fixed.html b/templates/web/default/questionnaire/creator_fixed.html index 0d3181ec1..5b6d1254a 100644 --- a/templates/web/default/questionnaire/creator_fixed.html +++ b/templates/web/default/questionnaire/creator_fixed.html @@ -11,9 +11,9 @@ <p align="center"> <input type="radio" name="reported" id="reported_yes" value="Yes"[% ' checked' IF reported == 'Yes' %]> -<label for="reported_yes">[% loc('Yes') %]</label> +<label class="inline" for="reported_yes">[% loc('Yes') %]</label> <input type="radio" name="reported" id="reported_no" value="No"[% ' checked' IF reported == 'No' %]> -<label for="reported_no">[% loc('No') %]</label> +<label class="inline" for="reported_no">[% loc('No') %]</label> </p> <p><input type="submit" name="submit" value="[% loc('Submit') %]"></p> diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index 999d332d2..fac3ef0b2 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -1,7 +1,7 @@ [% PROCESS "maps/${map.type}.html"; - problem_title = problem.title _ ' - ' _ loc('Viewing a problem') | html; + problem_title = problem.title _ ' - ' _ loc('Viewing a problem'); INCLUDE 'header.html' title = problem_title rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] @@ -144,7 +144,7 @@ [% END %] <p> - <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password:') %]</label> + <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> <input type="password" name="password_sign_in" id="password_sign_in" value="" size="25"> </p> diff --git a/templates/web/default/report/new/fill_in_details_form.html b/templates/web/default/report/new/fill_in_details_form.html index 2809b9c0e..9c9451914 100644 --- a/templates/web/default/report/new/fill_in_details_form.html +++ b/templates/web/default/report/new/fill_in_details_form.html @@ -4,7 +4,7 @@ [% IF partial_token %] <p id="unknown">[% loc('Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit.') %]</p> [% END %] -<p>[% loc('You have located the problem at the point marked with a purple pin on the map. If this is not the correct location, simply click on the map again. ') %]</p> +<p>[% loc('You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. ') %]</p> [% END %] [% IF js %] @@ -95,7 +95,7 @@ <input type="hidden" name="upload_fileid" value="[% upload_fileid %]" /> [% END %] [% IF report.photo %] - <img align="right" src="/photo?id=[% report.id %]" hspace="5"> + <img align="right" src="/photo/[% report.id %].jpeg" hspace="5"> [% END %] [% END %] @@ -137,7 +137,7 @@ [% END %] <div class="form-field"> - <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password:') %]</label> + <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> <input type="password" name="password_sign_in" id="password_sign_in" value="" size="25"> </div> diff --git a/templates/web/default/report/update.html b/templates/web/default/report/update.html new file mode 100644 index 000000000..048968eae --- /dev/null +++ b/templates/web/default/report/update.html @@ -0,0 +1,22 @@ +[% IF loop.first %] +<div id="updates"> + <h2 class="problem-update-list-header">[% loc('Updates') %]</h2> +[% END %] + <div><div class="problem-update"><p><a name="update_[% update.id %]"></a><em> + [% INCLUDE meta_line %] + </em></p></div> +[% IF NOT update.whenanswered %] + <div class="update-text"> + [% add_links( update.text ) | html_para %] + + [% INCLUDE 'report/photo.html' object=update %] + + [% IF c.cobrand.allow_update_reporting %] + <p align="right"> + <small><a rel="nofollow" class="unsuitable-problem" href="[% c.uri_for( '/contact', { id => update.problem_id, update_id => update.id } ) %]">[% loc('Offensive? Unsuitable? Tell us') %]</a></small> + </p> + [% END %] + </div> +[% END %] + </div> +[% '</div>' IF loop.last %] diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html index 4fd3c75d4..374a7c570 100644 --- a/templates/web/default/report/updates.html +++ b/templates/web/default/report/updates.html @@ -1,36 +1,26 @@ -[% FOREACH update IN updates.all %] -[% IF loop.first %] -<div id="updates"> - <h2 class="problem-update-list-header">[% loc('Updates') %]</h2> +[% FOREACH update IN updates %] +[% INCLUDE 'report/update.html' %] [% END %] - <div><div class="problem-update"><p><a name="update_[% update.id %]"></a><em> - [% IF update.anonymous || update.name == '' %] - [% tprintf( loc( 'Posted anonymously at %s' ), prettify_epoch( update.confirmed_local.epoch ) ) -%] - [%- ELSIF update.user.from_council %] - [% user_name = update.user.name | html %] - [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, update.user.council, prettify_epoch( update.confirmed_local.epoch ) ) -%] - [%- ELSE %] - [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_epoch( update.confirmed_local.epoch ) ) | html -%] - [%- END -%] - [%- c.cobrand.extra_update_meta_text(update) -%] - [%- ", " _ loc( 'marked as fixed' ) IF update.mark_fixed %] - [%- ", " _ loc( 'reopened' ) IF update.mark_open %] - [%- ", " _ tprintf(loc( 'marked as %s' ), update.meta_problem_state) IF update.problem_state %] - </em></p> - </div> +[% BLOCK meta_line %] - <div class="update-text"> - [% add_links( update.text ) | html_para %] + [% IF update.whenanswered %] + [%# A questionnaire update, currently saying report is still open %] + [% tprintf( loc( 'Still open, via questionnaire, %s' ), prettify_epoch( update.whenanswered_local.epoch ) ) %] + [% RETURN %] + [% END %] - [% INCLUDE 'report/photo.html' object=update %] - - [% IF c.cobrand.allow_update_reporting %] - <p align="right"> - <small><a rel="nofollow" class="unsuitable-problem" href="[% c.uri_for( '/contact', { id => update.problem_id, update_id => update.id } ) %]">[% loc('Offensive? Unsuitable? Tell us') %]</a></small> - </p> - [% END %] - </div> - </div> -[% '</div>' IF loop.last %] + [% IF update.anonymous || update.name == '' %] + [% tprintf( loc( 'Posted anonymously at %s' ), prettify_epoch( update.confirmed_local.epoch ) ) -%] + [%- ELSIF update.user.from_council %] + [% user_name = update.user.name | html %] + [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, update.user.council, prettify_epoch( update.confirmed_local.epoch ) ) -%] + [%- ELSE %] + [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_epoch( update.confirmed_local.epoch ) ) | html -%] + [%- END -%] + [%- c.cobrand.extra_update_meta_text(update) -%] + [%- ", " _ loc( 'marked as fixed' ) IF update.mark_fixed %] + [%- ", " _ loc( 'reopened' ) IF update.mark_open %] + [%- ", " _ tprintf(loc( 'marked as %s' ), update.meta_problem_state) IF update.problem_state %] [% END %] + diff --git a/templates/web/default/reports/cobrand_stats.html b/templates/web/default/reports/cobrand_stats.html deleted file mode 100644 index e69de29bb..000000000 --- a/templates/web/default/reports/cobrand_stats.html +++ /dev/null diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html index 797d34d6b..0d3d43d82 100755 --- a/templates/web/default/reports/council.html +++ b/templates/web/default/reports/council.html @@ -13,12 +13,13 @@ INCLUDE 'header.html', title = tprintf(loc('%s - Summary reports'), name) context = 'reports' + bodyclass = 'mappage' rss = [ tprintf(loc('Problems within %s, FixMyStreet'), name), rss_url ] %] [% map_html %] -[% IF children.size %] +[% IF c.cobrand.moniker != 'fixmystreet' AND 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> @@ -31,8 +32,16 @@ </div> <div id="side"> +<h1 id="reports_heading"> + [% IF ward %] + [% ward.name %]<span>, </span><a href="[% council_url %]">[% council.name %]</a> + [% ELSE %] + [% council.name %] + [% END %] +</h1> + [% IF council.generation_high == 10 AND c.cobrand.country == 'GB' %] -<p id="unknown">This council no longer exists. +<p id="unknown" class="alert">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') %] @@ -57,67 +66,49 @@ 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 c.cobrand.moniker == 'fixmystreet' %] + <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 %]">[% tprintf(loc('Get updates of problems in this %s'), thing) %]</a></li> + [% IF children.size %] + <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% loc('Wards of this council') %]</a></li> + [% END %] + </ul> + </div> [% 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> + <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 ) %] -[% ELSE %] - [% tprintf( loc('This is a summary of all reports for this %s.'), thing ) %] -[% END %] - -[% 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 %] -[% loc('You can <a href="/reports">show all councils</a>.') %] +[% TRY %][% INCLUDE 'reports/cobrand_stats.html' %][% CATCH file %][% END %] + +[% IF c.cobrand.moniker == 'fixmystreet' AND children.size %] +<section id="council_wards" class="hidden-js"> + <h2>[% loc('Wards of this council') %]</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') %] + <li><a href="[% child.url %]"><span class="text">[% child.name %]</span></a></li> + [% END %] + </ul> +</section> [% END %] -<h2>[% name %]</h2> - -[% INCLUDE 'reports/cobrand_stats.html' %] - [% IF c.cobrand.moniker == 'fixmystreet' %] <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>. + <a href="/for-councils">Find out more</a>. </p> [% END %] - [% INCLUDE 'pagination.html', param = 'p' %] +[% INCLUDE 'pagination.html', param = 'p' %] +<section class="full-width"> [% INCLUDE column - title = loc('Recently fixed') - problems = fixed.${council.id}.new + problems = problems.${council.id} %] +</section> - [% INCLUDE column - title = loc('New problems') - problems = open.${council.id}.new - %] - - [%# This doesn't really need a whole separate template %] - [% IF c.cobrand.moniker == 'emptyhomes' %] - [% - INCLUDE column - title = loc('Older problems') - problems = open.${council.id}.older.merge( open.${council.id}.unknown ) - %] - [% ELSE %] - [% INCLUDE column - title = loc('Older problems') - problems = open.${council.id}.older - %] - [% INCLUDE column - title = loc('Old problems, state unknown') - problems = open.${council.id}.unknown - %] - [% END %] - - [% INCLUDE column - title = loc('Old fixed') - problems = fixed.${council.id}.old - %] +[% INCLUDE 'pagination.html', param = 'p' %] </div> [% INCLUDE 'footer.html' %] @@ -125,9 +116,35 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a [% BLOCK column %] [% IF problems %] -<h3>[% title %]</h3> +<ul class="issue-list-a"> +[% IF c.cobrand.moniker == 'fixmystreet' %] + +[% FOREACH problem IN problems %] + <li> + <a href="[% c.uri_for('/report/' _ problem.id) %]"> + <div class="text"> + <h4>[% problem.title | html %]</h4> + <small>[% prettify_epoch( problem.confirmed, 1 ) %] + [%- IF problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %], last updated [% prettify_epoch( problem.lastupdate, 1 ) %] + [%- END %]</small> + [% IF problem.councils > 1 %] <small>[% loc('(sent to both)') %]</small> + [% ELSIF problem.councils == 0 %] <small>[% loc('(not sent to council)') %]</small> + [% END %] + [% IF problem.is_fixed %] + <small>[% loc('(fixed)') %]</small> + [% END %] + </div> + [% IF problem.photo %] + <div class="img"> + <img height="60" width="90" src="/photo/[% problem.id %].fp.jpeg" alt=""> + </div> + [% END %] + </a> + </li> +[% END %] + +[% ELSE %] -<ul> [% FOREACH problem IN problems %] <li><a href="[% c.uri_for('/report/' _ problem.id) %]">[% problem.title | html %]</a> [% IF problem.councils > 1 %] <small>[% loc('(sent to both)') %]</small> [% END %] @@ -136,6 +153,8 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a [% END %] </li> [% END %] + +[% END %] </ul> [% END %] diff --git a/templates/web/default/reports/index.html b/templates/web/default/reports/index.html index f14fd079e..283df5285 100755 --- a/templates/web/default/reports/index.html +++ b/templates/web/default/reports/index.html @@ -1,35 +1,41 @@ -[% INCLUDE 'header.html', title = loc('Summary reports') %] +[% INCLUDE 'header.html', title = loc('Summary reports'), bodyclass => 'fullwidthpage' %] +<h1>[% loc('All Reports') %]</h1> + +<div class="intro"> <p> [% loc('This is a summary of all reports on this site; select a particular council to see the reports sent there.') %] [% loc('Greyed-out lines are councils that no longer exist.') %] </p> +</div> -<table cellpadding="3" cellspacing="1" border="0"> +<table cellpadding="3" cellspacing="1" border="0" class="nicetable"> +<thead> <tr> -<th>[% loc('Name') %]</th> -<th>[% loc('New problems') %]</th> -<th>[% loc('Older problems') %]</th> -<th>[% loc('Old problems,<br>state unknown') %]</th> -<th>[% loc('Recently fixed') %]</th> -<th>[% loc('Older fixed') %]</th> +<th class="title">[% loc('Name') %]</th> +<th class="data">[% loc('New <br>problems') %]</th> +<th class="data">[% loc('Older <br>problems') %]</th> +<th class="data">[% loc('Old / unknown <br>problems') %]</th> +<th class="data">[% loc('Recently <br>fixed') %]</th> +<th class="data">[% loc('Older <br>fixed') %]</th> </tr> +</thead> +<tbody> [% FOREACH area IN areas_info_sorted %] <tr align="center" [%- IF area.generation_high == 10 %] class="gone" -[%- ELSIF loop.count % 2 %] class="a" -[%- END -%] -> -<td align="left"><a href="[% area.url %]">[% area.name %]</a></td> -<td>[% open.${area.id}.new or 0 %]</td> -<td>[% open.${area.id}.older or 0 %]</td> -<td>[% open.${area.id}.unknown or 0 %]</td> -<td>[% fixed.${area.id}.new or 0 %]</td> -<td>[% fixed.${area.id}.old or 0 %]</td> +[%- ELSIF ! (loop.count % 2) %] class="a" +[%- END %]> +<td class="title"><a href="[% area.url %]">[% area.name %]</a></td> +<td class="data">[% open.${area.id}.new or 0 %]</td> +<td class="data">[% open.${area.id}.older or 0 %]</td> +<td class="data">[% open.${area.id}.unknown or 0 %]</td> +<td class="data">[% fixed.${area.id}.new or 0 %]</td> +<td class="data">[% fixed.${area.id}.old or 0 %]</td> </tr> [% END %] +</tbody> </table> -[% INCLUDE 'footer.html' %] - +[% INCLUDE 'footer.html', pagefooter = 'yes' %] diff --git a/templates/web/default/static/fun.html b/templates/web/default/static/fun.html index abe9d4028..00976f3ec 100644 --- a/templates/web/default/static/fun.html +++ b/templates/web/default/static/fun.html @@ -10,7 +10,7 @@ Do let us know if you find any more.</p> <ul style='list-style-type: none; margin:0; padding:0'> -<li><img src='http://www.fixmystreet.com/photo?id=9468' align='right' hspace=8> +<li><img src='http://www.fixmystreet.com/photo/9468.jpeg' align='right' hspace=8> <h2>Dumped Piano (right)</h2> <p>The reporter of this problem summed it up with their report, which consisted solely of the one character “!”. — @@ -20,7 +20,7 @@ Do let us know if you find any more.</p> <p>“A seagull is attacking various cars within this road. He starts at around 05:45 every morning and continues until around 19:30. This causes a lot of noisy banging and wakes up children.” — <a href='http://www.fixmystreet.com/report/2722'>Problem report</a> -<li><img src='http://www.fixmystreet.com/photo?id=6553' align='right' hspace=8> +<li><img src='http://www.fixmystreet.com/photo/6553.jpeg' align='right' hspace=8> <h2>Boxes full of cheese dumped (right)</h2> <p>“About a dozen boxes full of mozzarella cheese have been dumped opposite 3 rufford street. if it warms up we could have nasty road topping problem (seriously there is a lot of cheese)” — <a href='http://www.fixmystreet.com/report/6553'>Problem report</a> |