diff options
Diffstat (limited to 'templates')
77 files changed, 761 insertions, 643 deletions
diff --git a/templates/email/barnet/site-name.txt b/templates/email/barnet/site-name.txt new file mode 100644 index 000000000..78563bdf3 --- /dev/null +++ b/templates/email/barnet/site-name.txt @@ -0,0 +1 @@ +Barnet Council FixMyStreet diff --git a/templates/email/bromley/site-name.txt b/templates/email/bromley/site-name.txt new file mode 100644 index 000000000..fc49c6865 --- /dev/null +++ b/templates/email/bromley/site-name.txt @@ -0,0 +1 @@ +Bromley FixMyStreet diff --git a/templates/email/default/alert-confirm.txt b/templates/email/default/alert-confirm.txt index abf7801f5..0d23d7733 100644 --- a/templates/email/default/alert-confirm.txt +++ b/templates/email/default/alert-confirm.txt @@ -1,9 +1,9 @@ -Subject: Confirm your alert on [% c.cobrand.site_name %] +Subject: Confirm your alert on [% INCLUDE 'site-name.txt' | trim %] Hi, Please click on the link below to confirm the alert you just -asked to subscribe to on [% c.cobrand.site_name %]: +asked to subscribe to on [% INCLUDE 'site-name.txt' | trim %]: [% token_url %] diff --git a/templates/email/default/problem-confirm.txt b/templates/email/default/problem-confirm.txt index 5f5bd511a..3a6bbe03a 100644 --- a/templates/email/default/problem-confirm.txt +++ b/templates/email/default/problem-confirm.txt @@ -1,9 +1,9 @@ -Subject: Confirm your problem on [% c.cobrand.site_name %] +Subject: Confirm your problem on [% INCLUDE 'site-name.txt' | trim %] Hi [% report.name %], Please click on the link below to confirm the problem you just -added to [% c.cobrand.site_name %]: +added to [% INCLUDE 'site-name.txt' | trim %]: [% token_url %] diff --git a/templates/email/default/site-name.txt b/templates/email/default/site-name.txt new file mode 100644 index 000000000..4e9a24bb9 --- /dev/null +++ b/templates/email/default/site-name.txt @@ -0,0 +1 @@ +FixMyStreet diff --git a/templates/email/default/update-confirm.txt b/templates/email/default/update-confirm.txt index fdcd68edb..beefac9c1 100644 --- a/templates/email/default/update-confirm.txt +++ b/templates/email/default/update-confirm.txt @@ -1,4 +1,4 @@ -Subject: Confirm your update on [% c.cobrand.site_name %] +Subject: Confirm your update on [% INCLUDE 'site-name.txt' | trim %] Hi [% update.name %], diff --git a/templates/email/lichfielddc/site-name.txt b/templates/email/lichfielddc/site-name.txt new file mode 100644 index 000000000..97ebd69a3 --- /dev/null +++ b/templates/email/lichfielddc/site-name.txt @@ -0,0 +1 @@ +Lichfield District Council FixMyStreet diff --git a/templates/email/reading/site-name.txt b/templates/email/reading/site-name.txt new file mode 100644 index 000000000..a0cf6367c --- /dev/null +++ b/templates/email/reading/site-name.txt @@ -0,0 +1 @@ +Reading City Council FixMyStreet diff --git a/templates/email/southampton/site-name.txt b/templates/email/southampton/site-name.txt new file mode 100644 index 000000000..48f5deeb3 --- /dev/null +++ b/templates/email/southampton/site-name.txt @@ -0,0 +1 @@ +Southampton City Council FixMyStreet diff --git a/templates/web/barnet/header.html b/templates/web/barnet/header.html index 5c6a19d89..d7cc01f4b 100644 --- a/templates/web/barnet/header.html +++ b/templates/web/barnet/header.html @@ -30,7 +30,7 @@ <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% version('/cobrands/barnet/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'Barnet Council FixMyStreet' %] <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> </head> diff --git a/templates/web/barnet/index.html b/templates/web/barnet/index.html deleted file mode 100644 index 82600625e..000000000 --- a/templates/web/barnet/index.html +++ /dev/null @@ -1,100 +0,0 @@ -[%# Assumes fixmystreet cobrand is using FMS map template - for bonus points preload all the right map elements. %] -[% map_js = BLOCK %] -<script> -yepnope.addPrefix( 'preload', function ( resource ) { - resource.noexec = true; - return resource; -}); -Modernizr.load({ - load: [ - "preload![% version('/js/OpenLayers.fixmystreet.js') %]", - "preload![% version('/js/map-OpenLayers.js') %]", - "preload![% version('/js/map-bing-ol.js') %]", - "preload![% version('/js/jquery.ba-hashchange.min.js') %]" - ] -}); -</script> -[% END %] - -[% pre_container_extra = BLOCK %] -<div id="front-main"> - <div id="front-main-container"> - <h1>[% loc('Report, view, or discuss local problems') %]</h1> - - <h2>[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]</h2> - - [% - question - = c.cobrand.enter_postcode_text() - || loc("Enter a nearby GB postcode, or street name and area"); - %] - - <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> - <label for="pc">[% question %]:</label> - <div> - <input type="text" name="pc" value="" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> - <input type="submit" value="[% loc('Go') %]" id="submit"> - </div> - </form> - </div> -</div> -[% END %] - -[% INCLUDE 'header.html', title => '' , bodyclass => 'frontpage fullwidthpage' %] - -[% IF error %] - <p class="error">[% error %]</p> -[% END %] - -<div class="tablewrapper"> - <div id="front-howto"> - <h2>[% loc('How to report a problem') %]</h2> - - <ol class="big-numbers"> - <li>[% question %]</li> - <li>[% loc('Locate the problem on a map of the area') %]</li> - <li>[% loc('Enter details of the problem') %]</li> - </ol> - - <section class="full-width"> - [% INCLUDE "front/stats.html" %] - [% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %] - </section> - </div> - - - [% - recent_photos = c.cobrand.recent_photos('front', 5); - %] - - [% IF recent_photos.size %] - <div id="front-recently"> - <h2>[% loc('Recently reported problems') %]</h2> - - <section class="full-width"> - <ul class="issue-list-a"> - [% FOREACH p IN recent_photos %] - <li> - <a href="/report/[% p.id %]"> - <div class="text"> - <h4>[% p.title | html %]</h4> - <small>[% prettify_epoch( p.confirmed_local.epoch, 1 ) %]</small> - </div> - <div class="img"> - <img alt="[% p.title | html %]" title="[% p.title | html %]" height="60" width="90" src="/photo/[% p.id %].fp.jpeg"> - </div> - </a> - </li> - [% END %] - </ul> - </section> - - </div> - [% END %] -</div> - - -<!-- [% TRY %][% INCLUDE 'front/news.html' %][% CATCH file %][% END %] --> - - -[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/bromley/faq/faq-en-gb.html b/templates/web/bromley/faq/faq-en-gb.html index f0b5e1a7e..3dfd26483 100755 --- a/templates/web/bromley/faq/faq-en-gb.html +++ b/templates/web/bromley/faq/faq-en-gb.html @@ -23,11 +23,18 @@ <li>complaining about your neighbours <li>complaining or commenting about the council </ul> - <p>Do not use this to report urgent or emergency problems because reports are not always dealt with immediately outside of working hours.</p> + <p>Note, the council does not maintain responsibility for problems on private land or TFL roads (A21 and part of the A232, West Wickham to Locksbottom). TFL road enquiries should be directed to <a href="http://reportit.tfl.gov.uk/">http://reportit.tfl.gov.uk/</a>. </dd> + <dt><a name="emergencies"></a>Reporting emergencies (out of hours)</dt> + <dd> + <p>Please do not report problems which present an immediate risk to life, for example missing manhole covers or a fallen lamp column.</p> + <p>Please direct your enquiry to our <a href="http://www.bromley.gov.uk/info/200039/emergencies/460/emergency_contacts">Out of Hours service</a></p> + + </dd> + <dt>How do I report a problem here?</dt> <dd>After entering a postcode or location, you are shown a map of that area. You can view problems already reported in that area, diff --git a/templates/web/bromley/header.html b/templates/web/bromley/header.html index 69a595923..55304a280 100644 --- a/templates/web/bromley/header.html +++ b/templates/web/bromley/header.html @@ -20,9 +20,24 @@ <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% version('/cobrands/bromley/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = "London Borough of Bromley - Report a problem in Bromley’s streets or parks" %] + <script type="text/javascript"> + + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-12543967-1']); + _gaq.push(['_setDomainName', 'bromley.gov.uk']); + _gaq.push(['_trackPageview']); + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + + </script> + [% extra_js %] - + <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/bromley/favicon.ico"> </head> diff --git a/templates/web/bromley/report/display.html b/templates/web/bromley/report/display.html index 89b74277f..13bc5f960 100644 --- a/templates/web/bromley/report/display.html +++ b/templates/web/bromley/report/display.html @@ -15,12 +15,7 @@ </div> -[% IF banner.id %] - <div class="banner"> - <p id="[% banner.id %]">[% banner.text %]</p> - </div> -[% END %] - +[% INCLUDE 'report/banner.html' %] [% INCLUDE 'report/_main.html' %] <div class="shadow-wrap"> diff --git a/templates/web/bromley/report/new/councils_extra_text.html b/templates/web/bromley/report/new/councils_extra_text.html new file mode 100644 index 000000000..91cceca11 --- /dev/null +++ b/templates/web/bromley/report/new/councils_extra_text.html @@ -0,0 +1 @@ +Do not use this to <a href="/faq#emergencies">report emergencies outside of working hours</a>. 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 1ceb0ac10..2c5abb874 100644 --- a/templates/web/bromley/report/new/fill_in_details_form.html +++ b/templates/web/bromley/report/new/fill_in_details_form.html @@ -55,14 +55,13 @@ [% IF report.used_map %] <p> We won’t be able to help unless you leave as much -detail as you can. Please describe the exact location of the problem (e.g. on a -wall). + detail as you can. <strong>Please remember the content of this report will be public.</strong> </p> [% END %] [% IF field_errors.detail %] <p class='form-error'>[% field_errors.detail %]</p> [% END %] - <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem.') %]" required>[% report.detail | html %]</textarea> + <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”') %]" required>[% report.detail | html %]</textarea> [% IF js %] <div id="form_category_row"> diff --git a/templates/web/default/alert/_list.html b/templates/web/default/alert/_list.html new file mode 100644 index 000000000..2ffcfae39 --- /dev/null +++ b/templates/web/default/alert/_list.html @@ -0,0 +1,100 @@ + <input type="hidden" name="type" value="local"> + <input type="hidden" name="pc" value="[% pc | html %]"> + + <p> + [% IF pretty_pc %] + [% tprintf( loc('Here are the types of local problem alerts for ‘%s’.'), pretty_pc ) %] + [% END %] + [% loc('Select which type of alert you\'d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert.') %] + </p> + + [% INCLUDE 'errors.html' %] + + <p> + [% loc('The simplest alert is our geographic one:') %] + </p> + + <p id="rss_local"> + <input type="radio" name="feed" id="[% rss_feed_id %]" value="[% rss_feed_id %]"[% IF rss_feed_id == selected_feed || selected_feed == '' %] checked[% END %]> + <label for="[% rss_feed_id %]">[% tprintf( loc('Problems within %.1fkm of this location'), population_radius ) %]</label> + [% loc('(a default distance which covers roughly 200,000 people)') %] <a href='[% rss_feed_uri %]'> + <img src='/i/feed.png' width='16' height='16' title='[% loc('RSS feed of nearby problems') %]' alt='[% loc('RSS feed') %]' border='0'></a> + </p> + + <p id="rss_local_alt"> + [% loc('(alternatively the RSS feed can be customised, within') %] + <a href="[% rss_feed_2k %]">2km</a> / <a href="[% rss_feed_5k %]">5km</a> / <a href="[% rss_feed_10k %]">10km</a> / <a href="[% rss_feed_20k %]">20km</a>) + </p> + + <p> + [% IF c.cobrand.is_council %] + Or you can subscribe to an alert for all council problems or one based upon what ward you’re in: + [% ELSE %] + [% loc("Or you can subscribe to an alert based upon what ward or council you’re in:") %] + [% END %] + </p> + + [% IF reported_to_options %] + <div id="rss_list"> + <p><strong> + [% loc('Problems within the boundary of:') %] + </strong></p> + <ul class="plain-list"> + [% ELSE %] + <div><ul id="rss_feed"> + [% END %] + + [% FOREACH option IN options %] + <li[% IF ! (loop.count % 2) %] class="a"[% END %]> + <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> + <label class="inline" for="[% option.id %]">[% option.text %]</label> + <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" +title="[% option.rss_text %]" alt="RSS feed" border="0"></a> + </li> + [% END %] +</ul> + [% IF reported_to_options %] + <p><strong> + [% loc('Or problems reported to:') %] + </strong></p> + <ul class="plain-list"> + [% FOREACH option IN reported_to_options %] + <li[% IF ! (loop.count % 2) %] class="a"[% END %]> + <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> + <label class="inline" for="[% option.id %]">[% option.text %]</label> + <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" + title="[% option.rss_text %]" alt="RSS feed" border="0"></a> + </li> + [% END %] + </ul> + <p><small> + [% loc( 'FixMyStreet sends different categories of problem +to the appropriate council, so problems within the boundary of a particular council +might not match the problems sent to that council. For example, a graffiti report +will be sent to the district council, so will appear in both of the district +council’s alerts, but will only appear in the "Within the boundary" alert +for the county council.' ) %] + </small></p> +</div> +<div id="rss_buttons"> + [% END %] + + <p> + <input type="submit" name="rss" value="[% loc('Give me an RSS feed') %]"> + <p> + + <p id="alert_or"> + [% loc('or') %] + </p> + + [% UNLESS c.user_exists %] + <p> + [% loc('Your email:') %] <input type="text" id="rznvy" name="rznvy" value="[% rznvy | html %]" size="30"> + </p> + [% END %] + + <p> + <input type="submit" name="alert" value="[% loc('Subscribe me to an email alert') %]"> + </p> + </div> <!-- ???? --> + diff --git a/templates/web/default/alert/choose.html b/templates/web/default/alert/choose.html index fad365088..312b9f520 100644 --- a/templates/web/default/alert/choose.html +++ b/templates/web/default/alert/choose.html @@ -4,7 +4,7 @@ [% IF possible_location_matches %] <p>[% loc('We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here.') %]</p> - <ul class="pc_alternatives"> + <ul class="pc_alternatives plain-list"> [% FOREACH match IN possible_location_matches %] <li><a href="[% choose_target_uri %]?latitude=[% match.latitude | uri %];longitude=[% match.longitude | uri %]">[% match.address | html %]</a></li> [% END %] diff --git a/templates/web/default/alert/index.html b/templates/web/default/alert/index.html index 274d61780..1f0635ae4 100644 --- a/templates/web/default/alert/index.html +++ b/templates/web/default/alert/index.html @@ -1,37 +1,50 @@ -[% INCLUDE 'header.html', title => loc('Local RSS feeds and email alerts') %] +[% INCLUDE 'header.html', title = loc('Local RSS feeds and email alerts'), bodyclass = 'twothirdswidthpage' %] <h1>[% loc('Local RSS feeds and email alerts') %]</h1> <p> +[% IF c.cobrand.is_council %] +FixMyStreet has a variety of RSS feeds and email alerts for local problems, including +alerts for all problems within a particular ward, or all problems +within a certain distance of a particular location. +[% ELSE %] [% loc('FixMyStreet has a variety of RSS feeds and email alerts for local problems, including alerts for all problems within a particular ward or council, or all problems within a certain distance of a particular location.') %] +[% END %] </p> -[% IF location_offshore %] - <ul class="error"><li>[% loc('That location does not appear to be covered by a council, perhaps it is offshore - please try somewhere more specific.') %]</li></ul> -[% ELSIF location_error %] - <ul class="error"><li>[% location_error %]</li></ul> +[% IF location_error %] + <div class="error">[% location_error %]</div> [% ELSE %] [% INCLUDE 'errors.html' %] [% END %] -<form method="get" action="/alert/list"> - <p> - [% loc('To find out what local alerts we have for you, please enter your GB -postcode or street name and area:' ) %] - <input type="text" name="pc" value="[% pc | html %]"> - <input type="submit" value="[% loc('Go') %]"> - </p> +<p> +[% IF c.cobrand.is_council %] +To find out what local alerts we have for you, please enter your [% c.cobrand.council_area %] postcode or street name and area: +[% ELSE %] +[% loc('To find out what local alerts we have for you, please enter your postcode or street name and area' ) %] +[% END %] +</p> +<form method="get" action="/alert/list" class="full-width"> + <fieldset> + <div class="form-txt-submit-box"> + <input type="text" name="pc" value="[% pc | html %]" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> + <input class="green-btn" type="submit" value="[% loc('Go') %]"> + </div> + </fieldset> </form> [% IF photos.size %] -<div id="alert_recent"> - <h2>[% loc('Some photos of recent reports') %]</h2> +<div class="sticky-sidebar" id="alert_recent"> + <aside> + <h2>[% loc('Some photos of recent reports') %]</h2> [% FOREACH p IN photos %] <a href="/report/[% p.id %]"><img border="0" height="100" src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> [% END %] + </aside> </div> [% END %] diff --git a/templates/web/default/alert/list.html b/templates/web/default/alert/list.html index 9f2bd69d0..20ebbf455 100644 --- a/templates/web/default/alert/list.html +++ b/templates/web/default/alert/list.html @@ -6,7 +6,7 @@ END; %] -[% INCLUDE 'header.html', title => title %] +[% INCLUDE 'header.html', title = title, bodyclass = 'twothirdswidthpage' %] [% IF pretty_pc %] [% @@ -19,113 +19,21 @@ <h1>[% title %]</h1> <form id="alerts" name="alerts" method="post" action="/alert/subscribe"> - <input type="hidden" name="type" value="local"> - <input type="hidden" name="pc" value="[% pc | html %]"> [% IF photos.size %] - <div id="alert_photos"> - <h2>[% loc('Photos of recent nearby reports') %]</h2> + <div id="alert_photos" class="sticky-sidebar"> + <aside> + <h2>[% loc('Photos of recent nearby reports') %]</h2> [% FOREACH p IN photos %] <a href="/report/[% p.id %]"><img border="0" height="100" src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> [% END %] + </aside> </div> [% END %] - <p> - [% IF pretty_pc %] - [% tprintf( loc('Here are the types of local problem alerts for ‘%s’.'), pretty_pc ) %] - [% END %] - [% loc('Select which type of alert you\'d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert.') %] - </p> - - [% INCLUDE 'errors.html' %] - - <p> - [% loc('The simplest alert is our geographic one:') %] - </p> - - <p id="rss_local"> - <input type="radio" name="feed" id="[% rss_feed_id %]" value="[% rss_feed_id %]"[% IF rss_feed_id == selected_feed || selected_feed == '' %] checked[% END %]> - <label for="[% rss_feed_id %]">[% tprintf( loc('Problems within %.1fkm of this location'), population_radius ) %]</label> - [% loc('(a default distance which covers roughly 200,000 people)') %] <a href='[% rss_feed_uri %]'> - <img src='/i/feed.png' width='16' height='16' title='[% loc('RSS feed of nearby problems') %]' alt='[% loc('RSS feed') %]' border='0'></a> - </p> - - <p id="rss_local_alt"> - [% loc('(alternatively the RSS feed can be customised, within') %] - <a href="[% rss_feed_2k %]">2km</a> / <a href="[% rss_feed_5k %]">5km</a> / <a href="[% rss_feed_10k %]">10km</a> / <a href="[% rss_feed_20k %]">20km</a>) - </p> - - <p> - [% loc("Or you can subscribe to an alert based upon what ward or council you’re in:") %] - </p> - - [% IF reported_to_options %] - <div id="rss_list"> - <p><strong> - [% loc('Problems within the boundary of:') %] - </strong></p> - <ul> - [% ELSE %] - <div><ul id="rss_feed"> - [% END %] - - [% FOREACH option IN options %] - <li> - <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> - <label for="[% option.id %]">[% option.text %]</label> - <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" -title="[% option.rss_text %]" alt="RSS feed" border="0"></a> - </li> - [% END %] -</ul> - [% IF reported_to_options %] - <p><strong> - [% loc('Or problems reported to:') %] - </strong></p> - <ul> - [% FOREACH option IN reported_to_options %] - <li> - <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> - <label for="[% option.id %]">[% option.text %]</label> - <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" - title="[% option.rss_text %]" alt="RSS feed" border="0"></a> - </li> - [% END %] - </ul> - <p><small> - [% loc( 'FixMyStreet sends different categories of problem -to the appropriate council, so problems within the boundary of a particular council -might not match the problems sent to that council. For example, a graffiti report -will be sent to the district council, so will appear in both of the district -council’s alerts, but will only appear in the "Within the boundary" alert -for the county council.' ) %] - </small></p> -</div> -<div id="rss_buttons"> - [% END %] - - <p> - <input type="submit" name="rss" value="[% loc('Give me an RSS feed') %]"> - <p> - - <p id="alert_or"> - [% loc('or') %] - </p> - -[% UNLESS c.user_exists %] - - <p> - [% loc('Your email:') %] <input type="text" id="rznvy" name="rznvy" value="[% rznvy | html %]" size="30"> - </p> - -[% END %] + [% INCLUDE 'alert/_list.html' %] - <p> - <input type="submit" name="alert" value="[% loc('Subscribe me to an email alert') %]"> - </p> - </div> <!-- ???? --> - </form> +</form> [% INCLUDE 'footer.html' %] diff --git a/templates/web/default/around/around_index.html b/templates/web/default/around/around_index.html index 55ed38341..f58d13d80 100644 --- a/templates/web/default/around/around_index.html +++ b/templates/web/default/around/around_index.html @@ -7,22 +7,9 @@ # '/report/new' and the partial hidden field is added to the form. %] -[% - question = c.cobrand.enter_postcode_text(); -%] - -<form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> - <label for="pc">[% question %]:</label> <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200"> <input type="submit" value="[% loc('Go') %]" id="submit"> - -[% IF partial_token %] - <input type="hidden" name="partial" value="[% partial_token.token %]"> -[% END %] - -</form> +[% INCLUDE 'around/postcode_form.html' %] -[% IF location_offshore %] - <p class="error">[% loc('That spot does not appear to be covered by a council. If you have tried to report an issue past the shoreline, for example, please specify the closest point on land.') %]</p> -[% ELSIF location_error %] +[% IF location_error %] <p class="error">[% location_error %]</p> [% END %] diff --git a/templates/web/default/around/around_map_list_items.html b/templates/web/default/around/around_map_list_items.html index e248ce3ed..f598a9ba9 100644 --- a/templates/web/default/around/around_map_list_items.html +++ b/templates/web/default/around/around_map_list_items.html @@ -8,6 +8,8 @@ <small>[% prettify_epoch( p.problem.confirmed_local.epoch, 1 ) %], [% dist %]km</small> [% IF p.problem.is_fixed %] <small>[% loc('(fixed)') %]</small> + [% ELSIF p.problem.is_closed %] + <small>[% loc('(closed)') %]</small> [% END %] </li> [% END %] diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html index 27f54f346..88f8b89ae 100755 --- a/templates/web/default/around/display_location.html +++ b/templates/web/default/around/display_location.html @@ -76,6 +76,8 @@ <span id="text_map_arrow"></span> </p> +[% TRY %][% INCLUDE 'around/extra_text.html' %][% CATCH file %][% END %] + <h1>[% loc('Problems in this area') %]</h1> <p id="alert_links_area"> diff --git a/templates/web/default/around/on_map_list_items.html b/templates/web/default/around/on_map_list_items.html index 245be7190..e0f8eea08 100644 --- a/templates/web/default/around/on_map_list_items.html +++ b/templates/web/default/around/on_map_list_items.html @@ -5,6 +5,8 @@ <small>[% prettify_epoch( p.confirmed_local.epoch, 1 ) %]</small> [% IF p.is_fixed %] <small>[% loc('(fixed)') %]</small> + [% ELSIF p.is_closed %] + <small>[% loc('(closed)') %]</small> [% END %] </li> [% END %] diff --git a/templates/web/default/around/postcode_form.html b/templates/web/default/around/postcode_form.html new file mode 100644 index 000000000..935995cfe --- /dev/null +++ b/templates/web/default/around/postcode_form.html @@ -0,0 +1,13 @@ +[% + question = c.cobrand.enter_postcode_text || loc('Enter a nearby street name and area'); +%] + +<form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> + <label for="pc">[% question %]:</label> + <span><input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200"> + <input type="submit" value="[% loc('Go') %]" id="submit"> + </span> + [% IF partial_token %] + <input type="hidden" name="partial" value="[% partial_token.token %]"> + [% END %] +</form> diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html index 582afd422..9d32164f7 100644 --- a/templates/web/default/common_header_tags.html +++ b/templates/web/default/common_header_tags.html @@ -30,5 +30,5 @@ <title> [% "$title :: " | html IF title %] - [% c.cobrand.site_title %] + [% site_title || 'FixMyStreet' %] </title> diff --git a/templates/web/default/dashboard/index.html b/templates/web/default/dashboard/index.html index 308042d0d..c2bfa9ea3 100644 --- a/templates/web/default/dashboard/index.html +++ b/templates/web/default/dashboard/index.html @@ -1,39 +1,52 @@ -[% +[% extra_css = BLOCK %] + <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/dashboard.css') %]"> +[% END %] + +[% INCLUDE 'header.html' title = loc('Dashboard') robots = 'noindex, nofollow' bodyclass = 'fullwidthpage' %] -<style> - th[scope=row] { text-align: left; } - tr.subtotal { background-color: #eee; } - #overview tr:nth-child(2) { background-color: #fee; } - select { width: auto; } -</style> - <form> -<p>Ward: <select name="ward"><option value=''>All</option> - [% FOR w IN children.values.sort('name') %] - <option value="[% w.id %]"[% ' selected' IF w.id == ward %]>[% w.name %]</option> - [% END %] -</select> - -<p>Report category: <select name="category"><option value=''>All</option> - [% FOR cat_op IN category_options %] - <option value='[% cat_op | html %]'[% ' selected' IF category == cat_op %]>[% cat_op | html %]</option> - [% END %] - </select> - -<p><input type="submit" value="Look up"> +<hgroup> + <h2>Reports, Statistics and Actions for</h2> + <h1>[% council.name %]</h1> +</hgroup> + +<div class="filters"> + <p> + <label for="ward">Ward:</label> + <select name="ward"><option value=''>All</option> + [% FOR w IN children.values.sort('name') %] + <option value="[% w.id %]"[% ' selected' IF w.id == ward %]>[% w.name %]</option> + [% END %] + </select> + </p> + + <p> + <label for="category">Report category:</label> + <select name="category"><option value=''>All</option> + [% FOR cat_op IN category_options %] + <option value='[% cat_op | html %]'[% ' selected' IF category == cat_op %]>[% cat_op | html %]</option> + [% END %] + </select> + </p> + + <p> + <input type="submit" value="Look up"> + </p> + + <br clear="all" /> +</div> -<h2>Summary Statistics for [% council.name %]</h2> <table width="100%" id="overview"> <tr> - <td> </td> - <th scope="col">WTD</th> + <th> </th> + <th scope="col"><abbr title="Week To Date">WTD</abbr></th> <th scope="col">Last 7 days</th> <th scope="col">Last 4 weeks</th> <th scope="col">YTD</th> @@ -147,6 +160,6 @@ [% BLOCK list %] [% FOR p IN list %] -<li><a href="/report/[% p.id %]">[% p.title | html %]</a></li> +<li><a href="/report/[% p.id %]">[% p.title | html %]</a> <date>[% p.confirmed.dmy('/') %]</date></li> [% END %] [% END %] diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index 1e52cc3b0..f0030dcb9 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -77,11 +77,6 @@ href="https://secure.mysociety.org/donate/">please do</a>.</dd> </ul> </dd> - <dt>Why do you only cover the countries of Great Britain?</dt> - <dd>We would love to cover Northern Ireland, but we have only been able - to locate boundaries for Great Britain (from Ordnance Survey). If you - know of a source for Northern Ireland council boundaries - so that we can add them to the site, that'd be great.</dd> </dl> <h2>Practical Questions</h2> diff --git a/templates/web/default/index.html b/templates/web/default/index.html index 8f755d4d5..159a595bc 100644 --- a/templates/web/default/index.html +++ b/templates/web/default/index.html @@ -21,16 +21,7 @@ [% TRY %][% INCLUDE 'front/news.html' %][% CATCH file %][% END %] -[% - question = c.cobrand.enter_postcode_text(); -%] - -<form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> - <label for="pc">[% question %]:</label> - <span><input type="text" name="pc" value="" id="pc" size="10" maxlength="200"> - <input type="submit" value="[% loc('Go') %]" id="submit"> - </span> -</form> +[% PROCESS 'around/postcode_form.html' %] <div id="front_intro"> diff --git a/templates/web/default/my/my.html b/templates/web/default/my/my.html index b96823df2..3d418cda7 100644 --- a/templates/web/default/my/my.html +++ b/templates/web/default/my/my.html @@ -1,6 +1,6 @@ [% PROCESS "maps/${map.type}.html" IF problems.size; - INCLUDE 'header.html', title = loc('Your Reports') + INCLUDE 'header.html', title = loc('Your Reports'), bodyclass = 'mappage' %] [% IF problems.size %] @@ -47,7 +47,7 @@ END %] pager = updates_pager, param = 'u' %] - <ul> + <ul class="issue-list full-width"> [% END %] <li>“[% u.text | html %]” @@ -64,7 +64,7 @@ END %] [% INCLUDE 'footer.html' %] [% BLOCK problem %] - [% "<ul>" IF loop.first %] + [% "<ul class='issue-list-a full-width'>" IF loop.first %] <li><a href="[% c.uri_for( '/report', p.id ) %]">[% p.title | html %]</a> <em class="council_sent_info"> – diff --git a/templates/web/default/questionnaire/completed-open.html b/templates/web/default/questionnaire/completed-open.html new file mode 100644 index 000000000..7c5469259 --- /dev/null +++ b/templates/web/default/questionnaire/completed-open.html @@ -0,0 +1,5 @@ +[% loc('<p style="font-size:150%">We’re sorry to hear that. We have two +suggestions: why not try writing to your local representative or, if it’s +a problem that could be fixed by local people working together, why not +<a href="http://www.pledgebank.com/new">make and publicise a pledge</a>? +</p>') %] diff --git a/templates/web/default/questionnaire/completed.html b/templates/web/default/questionnaire/completed.html index fe896b383..a125d48bd 100644 --- a/templates/web/default/questionnaire/completed.html +++ b/templates/web/default/questionnaire/completed.html @@ -12,12 +12,7 @@ site and leave an update.</p>') %] [% ELSIF new_state == 'confirmed' OR (!new_state AND problem.is_open) %] -[% tprintf( loc('<p style="font-size:150%%">We’re sorry to hear that. We have two suggestions: why not try -<a href="%s">writing direct to your councillor(s)</a> -or, if it’s a problem that could be fixed by local people working together, -why not <a href="http://www.pledgebank.com/new">make and publicise a pledge</a>? -</p>'), c.cobrand.writetothem_url || 'http://www.writetothem.com/' ) %] - +[% INCLUDE 'questionnaire/completed-open.html' %] [% advert_outcome = 0 %] [% ELSE %] diff --git a/templates/web/default/report/banner.html b/templates/web/default/report/banner.html new file mode 100644 index 000000000..85aaed82d --- /dev/null +++ b/templates/web/default/report/banner.html @@ -0,0 +1,22 @@ +[% USE date %] +[% BLOCK banner %] +<p class="banner" id="[% id %]"> + [% text %] +</p> +[% END %] + +[% IF problem.is_open AND date.now - problem.lastupdate_local.epoch > 8 * 7 * 24 * 60 * 60 %] + [% INCLUDE banner, id = 'unknown', text = loc('This problem is old and of unknown status.') %] +[% END %] +[% IF problem.is_fixed %] + [% INCLUDE banner, id = 'fixed', text = loc('This problem has been fixed') %] +[% END %] +[% IF problem.is_closed %] + [% INCLUDE banner, id = 'closed', text = loc('This problem has been closed') %] +[% END %] +[% states = [ 'investigating', 'in progress', 'planned' ]; + IF states.grep(problem.state).size %] + [% INCLUDE banner, id = 'progress', text = loc('This problem is in progress') %] +[% END %] + + diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index fac3ef0b2..6b93539f2 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -13,12 +13,7 @@ </div> <div id="side"> -[% IF banner.id %] -<p class="banner" id="[% banner.id %]"> - [% banner.text %] -</p> -[% END %] - +[% INCLUDE 'report/banner.html' %] [% INCLUDE 'report/_main.html' %] <p align="right"> diff --git a/templates/web/default/report/new/category.html b/templates/web/default/report/new/category.html index 095cd7c2e..8bff539c4 100644 --- a/templates/web/default/report/new/category.html +++ b/templates/web/default/report/new/category.html @@ -1,9 +1,13 @@ [% FILTER collapse %] [% IF category_options.size %] + [% IF category; + category = category | lower; + END; %] <label for='form_category'>[% category_label | html %]</label> <select name='category' id='form_category'[% ' onchange="form_category_onchange()"' IF category_extras.size %]> [% FOREACH cat_op IN category_options %] - <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op %]>[% cat_op | html %]</option> + [% cat_op_lc = cat_op | lower %] + <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op || category == cat_op_lc %]>[% cat_op | html %]</option> [% END %] </select> [% END %] diff --git a/templates/web/default/report/new/councils_extra_text.html b/templates/web/default/report/new/councils_extra_text.html new file mode 100644 index 000000000..1088b9f8b --- /dev/null +++ b/templates/web/default/report/new/councils_extra_text.html @@ -0,0 +1 @@ +[% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %] diff --git a/templates/web/default/report/new/councils_text_all.html b/templates/web/default/report/new/councils_text_all.html index df3388bf3..af5d822b0 100644 --- a/templates/web/default/report/new/councils_text_all.html +++ b/templates/web/default/report/new/councils_text_all.html @@ -6,6 +6,13 @@ all_council_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) ); %] +[% ELSIF all_councils.${area_ids_to_list.0}.type == 'LGD' %] +[% + tprintf( + loc('All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>.'), + all_council_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) + ); +%] [% ELSE %] [% tprintf( @@ -15,5 +22,5 @@ %] [% END %] -[% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %] +[% INCLUDE 'report/new/councils_extra_text.html' %] </p> diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html index 2a65a3e3e..de873e2ed 100644 --- a/templates/web/default/report/updates.html +++ b/templates/web/default/report/updates.html @@ -22,7 +22,6 @@ [%- 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 %] diff --git a/templates/web/default/reports/_list-entry.html b/templates/web/default/reports/_list-entry.html new file mode 100755 index 000000000..14863c4a1 --- /dev/null +++ b/templates/web/default/reports/_list-entry.html @@ -0,0 +1,6 @@ +<li><a href="[% c.uri_for('/report/' _ problem.id) %]">[% problem.title | html %]</a> + [% IF problem.councils > 1 %] <small>[% loc('(sent to both)') %]</small> [% END %] + [% IF c.cobrand.moniker != 'emptyhomes' %] + [% IF problem.councils == 0 %] <small>[% loc('(not sent to council)') %]</small> [% END %] + [% END %] +</li> diff --git a/templates/web/default/reports/_rss.html b/templates/web/default/reports/_rss.html new file mode 100644 index 000000000..9756f131d --- /dev/null +++ b/templates/web/default/reports/_rss.html @@ -0,0 +1,2 @@ +<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> + diff --git a/templates/web/default/reports/_ward-list.html b/templates/web/default/reports/_ward-list.html new file mode 100755 index 000000000..e78ac7d90 --- /dev/null +++ b/templates/web/default/reports/_ward-list.html @@ -0,0 +1,9 @@ +[% IF location == 'before' AND children.size %] +<h2 style="clear:right">[% ward_text %]</h2> +<p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> +<ul> +[% FOR child IN children.values.sort('name') %] +<li><a href="[% child.url %]">[% child.name %]</a></li> +[% END %] +</ul> +[% END %] diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html index b837bcee9..134c9d4fc 100755 --- a/templates/web/default/reports/council.html +++ b/templates/web/default/reports/council.html @@ -31,15 +31,7 @@ [% map_html %] -[% IF c.cobrand.all_reports_style != 'detailed' AND children.size %] -<h2 style="clear:right">[% ward_text %]</h2> -<p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> -<ul> -[% FOR child IN children.values.sort('name') %] -<li><a href="[% child.url %]">[% child.name %]</a></li> -[% END %] -</ul> -[% END %] +[% INCLUDE 'reports/_ward-list.html', location = 'before' %] </div> <div id="side"> @@ -53,67 +45,38 @@ </h1> [% IF council.generation_high == 10 AND c.cobrand.country == 'GB' %] -<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') %] -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> -[% ELSIF c.cobrand.all_reports_style == 'detailed' %] - <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 %]">[% - IF c.cobrand.moniker == 'bromley' AND thing == 'council'; - 'Get updates of reports in Bromley'; - ELSIF c.cobrand.moniker == 'bromley'; - 'Get updates of reports in this ward'; - ELSIF c.cobrand.is_council; - tprintf(loc('Get updates of %s problems'), thing); - ELSE; - tprintf(loc('Get updates of problems in this %s'), thing); - END - %]</a></li> - [% IF children.size %] - <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% ward_text %]</a></li> - [% END %] - </ul> - </div> + <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') %] + 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> + [% INCLUDE 'reports/_rss.html' %] [% END %] [% TRY %][% INCLUDE 'reports/cobrand_stats.html' %][% CATCH file %][% END %] -[% IF c.cobrand.all_reports_style == 'detailed' AND children.size %] -<section id="council_wards" class="hidden-js"> -<h2>[% ward_text %]</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 %] +[% INCLUDE 'reports/_ward-list.html', location = 'after' %] [% IF c.cobrand.moniker == 'fixmystreet' %] <p class="promo"> @@ -139,43 +102,8 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a [% IF problems %] <ul class="issue-list-a"> -[% IF c.cobrand.all_reports_style == 'detailed' %] - [% 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 %] - -[% 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 %] - [% IF c.cobrand.moniker != 'emptyhomes' %] - [% IF problem.councils == 0 %] <small>[% loc('(not sent to council)') %]</small> [% END %] - [% END %] - </li> -[% END %] - + [% INCLUDE 'reports/_list-entry.html' %] [% END %] </ul> diff --git a/templates/web/default/tokens/confirm_problem.html b/templates/web/default/tokens/confirm_problem.html index 1e3c6c535..b6d82968f 100644 --- a/templates/web/default/tokens/confirm_problem.html +++ b/templates/web/default/tokens/confirm_problem.html @@ -6,7 +6,7 @@ [% IF c.cobrand.is_council %] Thank you. You have successfully confirmed your report and this will now be investigated by the council. -You can <a href="[% c.uri_for( '/report', problem.id ) %]">view the problem on this site</a>. +You can <a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]">view the problem on this site</a>. </p> <p>Your reference for this problem is [% problem.id %], please quote it in any enquiries. @@ -19,8 +19,9 @@ You can <a href="[% c.uri_for( '/report', problem.id ) %]">view the problem on t END; tprintf( - loc( '. You can <a href="%s">view the problem on this site</a>.' ), - c.uri_for( '/report', problem.id ) + loc( '. You can <a href="%s%s">view the problem on this site</a>.' ), + c.cobrand.base_url_for_report( problem ), + problem.url ); %] [% END %] diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html index 063cbba18..96ad1040c 100644 --- a/templates/web/emptyhomes/header.html +++ b/templates/web/emptyhomes/header.html @@ -7,7 +7,7 @@ <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> <link rel="stylesheet" type="text/css" href="[% version('/cobrands/emptyhomes/css.css') %]"> - [% INCLUDE 'common_header_tags.html' %] + [% INCLUDE 'common_header_tags.html', site_title = loc('Report Empty Homes') %] </head> <body> diff --git a/templates/web/emptyhomes/index.html b/templates/web/emptyhomes/index.html index 60bdee70c..be6a14b95 100644 --- a/templates/web/emptyhomes/index.html +++ b/templates/web/emptyhomes/index.html @@ -38,7 +38,7 @@ The TV series launched a campaign for action and while this is running, our <a h </p> [% - question = c.cobrand.enter_postcode_text(); + question = loc("Enter a nearby GB postcode, or street name and area"); %] <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> diff --git a/templates/web/emptyhomes/report/display.html b/templates/web/emptyhomes/report/display.html index bcce6789d..e9a101e3e 100644 --- a/templates/web/emptyhomes/report/display.html +++ b/templates/web/emptyhomes/report/display.html @@ -7,9 +7,9 @@ <div id="side"> -[% IF banner.id %] -<p class="banner" id="[% banner.id %]"> - [% banner.text %] +[% IF problem.is_fixed %] +<p class="banner" id="fixed"> + [% loc('This problem has been fixed') . '.' %]; </p> [% END %] diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html index 5449eff81..e2ea1f684 100644 --- a/templates/web/fiksgatami/header.html +++ b/templates/web/fiksgatami/header.html @@ -8,7 +8,7 @@ <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> <link rel="stylesheet" type="text/css" href="[% version('/cobrands/fiksgatami/css.css') %]"> - [% INCLUDE 'common_header_tags.html' %] + [% INCLUDE 'common_header_tags.html', site_title = 'FiksGataMi' %] </head> <body> diff --git a/templates/web/fiksgatami/questionnaire/completed-open.html b/templates/web/fiksgatami/questionnaire/completed-open.html new file mode 100644 index 000000000..72fa507b2 --- /dev/null +++ b/templates/web/fiksgatami/questionnaire/completed-open.html @@ -0,0 +1,6 @@ +[% loc('<p style="font-size:150%">We’re sorry to hear that. We have two +suggestions: why not try <a href="http://www.norge.no/styresmakter/">writing +direct to your councillor(s)</a> or, if it’s a problem that could be +fixed by local people working together, why not +<a href="http://www.pledgebank.com/new">make and publicise a pledge</a>? +</p>') %] diff --git a/templates/web/fiksgatami/reports/index.html b/templates/web/fiksgatami/reports/index.html index 3cbb2bf8d..1ba90ece3 100755 --- a/templates/web/fiksgatami/reports/index.html +++ b/templates/web/fiksgatami/reports/index.html @@ -15,7 +15,6 @@ </tr> [% FOREACH area IN areas_info_sorted %] -[% NEXT IF area.id == 301 %] <tr align="center" [%- IF loop.count % 2 %] class="a" [%- END -%] diff --git a/templates/web/fixmystreet/alert/_list.html b/templates/web/fixmystreet/alert/_list.html index e14d394f2..f376e3c66 100644 --- a/templates/web/fixmystreet/alert/_list.html +++ b/templates/web/fixmystreet/alert/_list.html @@ -15,8 +15,8 @@ <p> [% loc('The simplest alert is our geographic one:') %] </p> - - <p> + + <p id="rss_local"> <input type="radio" name="feed" id="[% rss_feed_id %]" value="[% rss_feed_id %]"[% IF rss_feed_id == selected_feed || selected_feed == '' %] checked[% END %]> <label class="inline" for="[% rss_feed_id %]">[% tprintf( loc('Problems within %.1fkm of this location'), population_radius ) %]</label> <a href='[% rss_feed_uri %]'><img src='/i/feed.png' width='16' height='16' title='[% loc('RSS feed of nearby problems') %]' alt='[% loc('RSS feed') %]' border='0'></a> diff --git a/templates/web/fixmystreet/alert/choose.html b/templates/web/fixmystreet/alert/choose.html deleted file mode 100644 index 312b9f520..000000000 --- a/templates/web/fixmystreet/alert/choose.html +++ /dev/null @@ -1,14 +0,0 @@ -[% INCLUDE 'header.html', title => loc('Local RSS feeds and email alerts') %] - -<h1>[% loc('Local RSS feeds and email alerts') %]</h1> - -[% IF possible_location_matches %] - <p>[% loc('We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here.') %]</p> - <ul class="pc_alternatives plain-list"> - [% FOREACH match IN possible_location_matches %] - <li><a href="[% choose_target_uri %]?latitude=[% match.latitude | uri %];longitude=[% match.longitude | uri %]">[% match.address | html %]</a></li> - [% END %] - </ul> -[% END %] - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/alert/index.html b/templates/web/fixmystreet/alert/index.html deleted file mode 100644 index 03d9843f6..000000000 --- a/templates/web/fixmystreet/alert/index.html +++ /dev/null @@ -1,53 +0,0 @@ -[% INCLUDE 'header.html', title = loc('Local RSS feeds and email alerts'), bodyclass = 'twothirdswidthpage' %] - -<h1>[% loc('Local RSS feeds and email alerts') %]</h1> - -<p> -[% IF c.cobrand.is_council %] -FixMyStreet has a variety of RSS feeds and email alerts for local problems, including -alerts for all problems within a particular ward, or all problems -within a certain distance of a particular location. -[% ELSE %] -[% loc('FixMyStreet has a variety of RSS feeds and email alerts for local problems, including -alerts for all problems within a particular ward or council, or all problems -within a certain distance of a particular location.') %] -[% END %] -</p> - -[% IF location_offshore %] - <div class="error">[% loc('That location does not appear to be covered by a council, perhaps it is offshore - please try somewhere more specific.') %]</div> -[% ELSIF location_error %] - <div class="error">[% location_error %]</div> -[% ELSE %] - [% INCLUDE 'errors.html' %] -[% END %] - -<p> -[% IF c.cobrand.is_council %] -To find out what local alerts we have for you, please enter your [% c.cobrand.council_area %] postcode or street name and area: -[% ELSE %] -[% loc('To find out what local alerts we have for you, please enter your GB postcode or street name and area' ) %] -[% END %] -</p> -<form method="get" action="/alert/list" class="full-width"> - <fieldset> - <div class="form-txt-submit-box"> - <input type="text" name="pc" value="[% pc | html %]" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> - <input class="green-btn" type="submit" value="[% loc('Go') %]"> - </div> - </fieldset> -</form> - -[% IF photos.size %] -<div class="sticky-sidebar"> - <aside> - <h2>[% loc('Some photos of recent reports') %]</h2> - [% FOREACH p IN photos %] - <a href="/report/[% p.id %]"><img border="0" height="100" - src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> - [% END %] - </aside> -</div> -[% END %] - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/alert/list.html b/templates/web/fixmystreet/alert/list.html deleted file mode 100644 index 84899d457..000000000 --- a/templates/web/fixmystreet/alert/list.html +++ /dev/null @@ -1,39 +0,0 @@ -[% - IF pretty_pc; - title = tprintf( loc("Local RSS feeds and email alerts for ‘%s’"), pretty_pc ); - ELSE; - title = loc('Local RSS feeds and email alerts'); - END; -%] - -[% INCLUDE 'header.html', title = title, bodyclass = 'twothirdswidthpage' %] - -[% IF pretty_pc %] - [% - pretty_pc = pretty_pc | html | replace(' ', ' '); - title = tprintf( loc("Local RSS feeds and email alerts for ‘%s’"), pretty_pc ); - %] -[% END %] - - -<h1>[% title %]</h1> - -<form id="alerts" name="alerts" method="post" action="/alert/subscribe"> - - [% IF photos.size %] - <div class="sticky-sidebar"> - <aside> - <h2>[% loc('Photos of recent nearby reports') %]</h2> - [% FOREACH p IN photos %] - <a href="/report/[% p.id %]"><img border="0" height="100" - src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> - [% END %] - </aside> - </div> - [% END %] - - [% INCLUDE 'alert/_list.html' %] - -</form> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/around/around_index.html b/templates/web/fixmystreet/around/around_index.html index 5ffddad4f..c547b7ba9 100644 --- a/templates/web/fixmystreet/around/around_index.html +++ b/templates/web/fixmystreet/around/around_index.html @@ -1,22 +1,4 @@ -[% pre_container_extra = BLOCK %] -<div id="front-main"><div id="front-main-container"> -[% - question = c.cobrand.enter_postcode_text(); -%] -<form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> - <label for="pc">[% question %]:</label> - <div> - <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200"> - <input type="submit" value="[% loc('Go') %]" id="submit"> - </div> - - [% IF partial_token %] - <input type="hidden" name="partial" value="[% partial_token.token %]"> - [% END %] -</form> -</div></div> -[% END %] - +[% pre_container_extra = INCLUDE 'around/postcode_form.html' %] [% INCLUDE 'header.html', title = loc('Reporting a problem'), bodyclass = 'frontpage fullwidthpage' %] [% @@ -26,9 +8,7 @@ # '/report/new' and the partial hidden field is added to the form. %] -[% IF location_offshore %] - <p class="form-error">[% loc('That spot does not appear to be covered by a council. If you have tried to report an issue past the shoreline, for example, please specify the closest point on land.') %]</p> -[% ELSIF location_error %] +[% IF location_error %] <p class="form-error">[% location_error %]</p> [% END %] diff --git a/templates/web/fixmystreet/around/around_map_list_items.html b/templates/web/fixmystreet/around/around_map_list_items.html index 7dce76ce1..612b37d00 100644 --- a/templates/web/fixmystreet/around/around_map_list_items.html +++ b/templates/web/fixmystreet/around/around_map_list_items.html @@ -1,24 +1,8 @@ [% IF around_map.size %] [% FOREACH p IN around_map %] - - [% dist = tprintf("%.1f", (p.distance || 0) ) %] - - <li> - <a href="[% c.uri_for('/report', p.problem.id ) %]"> - <div class="text"> - <h4>[% p.problem.title | html %]</h4> - <small>[% prettify_epoch( p.problem.confirmed_local.epoch, 1 ) %], [% dist %]km</small> - [% IF p.problem.is_fixed %] - <small>[% loc('(fixed)') %]</small> - [% END %] - </div> - [% IF p.problem.photo %] - <div class="img"> - <img height="60" width="90" src="/photo/[% p.problem.id %].fp.jpeg" alt=""> - </div> - [% END %] - </a> - </li> + [% INCLUDE 'report/_item.html' + problem = p.problem, + dist = tprintf("%.1f", (p.distance || 0) ) %] [% END %] [% ELSE %] <li><p>[% loc('No problems found.') %]</p></li> diff --git a/templates/web/fixmystreet/around/on_map_list_items.html b/templates/web/fixmystreet/around/on_map_list_items.html index 9329e6833..7b66d4267 100644 --- a/templates/web/fixmystreet/around/on_map_list_items.html +++ b/templates/web/fixmystreet/around/on_map_list_items.html @@ -1,21 +1,6 @@ [% IF on_map.size %] - [% FOREACH p IN on_map %] - <li> - <a href="[% c.uri_for('/report', p.id ) %]"> - <div class="text"> - <h4>[% p.title | html %]</h4> - <small>[% prettify_epoch( p.confirmed_local.epoch, 1 ) %]</small> - [% IF p.is_fixed %] - <small>[% loc('(fixed)') %]</small> - [% END %] - </div> - [% IF p.photo %] - <div class="img"> - <img height="60" width="90" src="/photo/[% p.id %].fp.jpeg" alt=""> - </div> - [% END %] - </a> - </li> + [% FOREACH problem IN on_map %] + [% INCLUDE 'report/_item.html' %] [% END %] [% ELSE %] <li><p>[% loc('No problems have been reported yet.') %]</p></li> diff --git a/templates/web/fixmystreet/around/postcode_form.html b/templates/web/fixmystreet/around/postcode_form.html new file mode 100644 index 000000000..3b63a52d4 --- /dev/null +++ b/templates/web/fixmystreet/around/postcode_form.html @@ -0,0 +1,37 @@ +<div id="front-main"> + <div id="front-main-container"> + [% IF c.cobrand.moniker == 'bromley' %] + <h1 class="main mob-only">Reporting a problem in Bromley’s streets or parks</h1> + [% ELSIF c.cobrand.moniker == 'fixmybarangay' %] + <h1>View local problems</h1> + <h2>(potholes or street lighting)</h2> + [% ELSE %] + <h1>[% loc('Report, view, or discuss local problems') %]</h1> + <h2>[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]</h2> + [% END %] + + [% + question = c.cobrand.enter_postcode_text || loc('Enter a nearby street name and area'); + %] + + <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> + [% IF c.cobrand.moniker == 'fixmybarangay' %] + <p> + <a href="/around?latitude=10.322;longitude=123.907" class="yellow-btn">Bgy. Luz</a> + <a href="/around?latitude=10.288;longitude=123.870" class="yellow-btn">Bgy. Basak San Nicolas</a> + </p> + [% ELSE %] + <label for="pc">[% question %]:</label> + <div> + <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> + <input type="submit" value="[% loc('Go') %]" id="submit"> + </div> + [% END %] + + [% IF partial_token %] + <input type="hidden" name="partial" value="[% partial_token.token %]"> + [% END %] + + </form> + </div> +</div> diff --git a/templates/web/fixmystreet/faq/faq-en-gb.html b/templates/web/fixmystreet/faq/faq-en-gb.html index 123de7c37..bd94ecd38 100755 --- a/templates/web/fixmystreet/faq/faq-en-gb.html +++ b/templates/web/fixmystreet/faq/faq-en-gb.html @@ -88,11 +88,6 @@ href="https://secure.mysociety.org/donate/">please do</a>.</dd> </ul> </dd> - <dt>Why do you only cover the countries of Great Britain?</dt> - <dd>We would love to cover Northern Ireland, but we have only been able - to locate boundaries for Great Britain (from Ordnance Survey). If you - know of a source for Northern Ireland council boundaries - so that we can add them to the site, that'd be great.</dd> </dl> <h2><a name="practical"></a>Practical Questions</h2> diff --git a/templates/web/fixmystreet/front/news.html b/templates/web/fixmystreet/front/news.html index 080034a28..2285ab8d0 100644 --- a/templates/web/fixmystreet/front/news.html +++ b/templates/web/fixmystreet/front/news.html @@ -1,6 +1,6 @@ [%# news = [ - { date = '2008-12-11', text = '<a href="' _ c.config.IPHONE_URL _ '">' _ loc('Get FixMyStreet on your iPhone') _ '</a>' }, + { date = '2008-12-11', text = '<a href="">' _ loc('Get FixMyStreet on your iPhone') _ '</a>' }, ] %] [% FOREACH item IN news %] diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index 163925dcf..cb6ca8c43 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -11,16 +11,16 @@ <meta name="HandHeldFriendly" content="true"> <meta name="mobileoptimized" content="0"> - <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/base.css') %]"> - <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]" media="(min-width:48em)"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)"> [% extra_css %] <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> <![endif]--> <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'FixMyStreet' %] [% extra_js %] [% IF c.req.uri.host == 'osm.fixmystreet.com' %] diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html index 922999f88..72dba9376 100644 --- a/templates/web/fixmystreet/index.html +++ b/templates/web/fixmystreet/index.html @@ -16,6 +16,7 @@ Modernizr.load({ </script> [% END %] +<<<<<<< HEAD [% pre_container_extra = BLOCK %] <div id="front-main"> <div id="front-main-container"> @@ -49,10 +50,15 @@ Modernizr.load({ </form> </div> </div> -[% END %] - +======= +[% pre_container_extra = PROCESS 'around/postcode_form.html' %] [% INCLUDE 'header.html', title = '', bodyclass = 'frontpage fullwidthpage' %] +[% IF error %] + <p class="form-error">[% error %]</p> +>>>>>>> origin/master +[% END %] + [% IF c.cobrand.moniker == 'bromley' %] <p>This is primarily for reporting physical problems that can be fixed like graffiti, cleansing issues or road defects. To report other @@ -99,18 +105,9 @@ kinds of problems like missed bins use our <section class="full-width"> <ul class="issue-list-a"> - [% FOREACH p IN recent_photos %] - <li> - <a href="/report/[% p.id %]"> - <div class="text"> - <h4>[% p.title | html %]</h4> - <small>[% prettify_epoch( p.confirmed_local.epoch, 1 ) %]</small> - </div> - <div class="img"> - <img alt="[% p.title | html %]" title="[% p.title | html %]" height="60" width="90" src="/photo/[% p.id %].fp.jpeg"> - </div> - </a> - </li> + [% FOREACH problem IN recent_photos %] + [% problem.photo = 1; # Definitely is + INCLUDE 'report/_item.html', no_fixed = 1 %] [% END %] </ul> </section> diff --git a/templates/web/fixmystreet/my/my.html b/templates/web/fixmystreet/my/my.html index 4793989f8..e170202de 100644 --- a/templates/web/fixmystreet/my/my.html +++ b/templates/web/fixmystreet/my/my.html @@ -65,26 +65,6 @@ END %] [% BLOCK problem %] [% "<ul class='issue-list-a full-width'>" IF loop.first %] - - <li> - <a href="[% c.uri_for( '/report', p.id ) %]"> - <div class="text"> - <h4>[% p.title | html %]</h4> - <small> - [% IF p.whensent %] - [% tprintf( loc("Reported %s, to %s"), prettify_epoch( p.confirmed_local.epoch, 'date' ), p.body(c) ) %] - [% ELSE %] - [% tprintf( loc("Reported %s"), prettify_epoch( p.confirmed_local.epoch, 'date' ) ) %] - [% END %] - </small> - </div> - [% IF p.photo %] - <div class="img"> - <img height="60" width="90" src="/photo/[% p.id %].fp.jpeg" alt=""> - </div> - [% END %] - </a> - </li> - + [% INCLUDE 'report/_item.html', problem = p, no_fixed =1 %] [% "</ul>" IF loop.last %] [% END %] diff --git a/templates/web/fixmystreet/questionnaire/completed-open.html b/templates/web/fixmystreet/questionnaire/completed-open.html new file mode 100644 index 000000000..2bb3bad1f --- /dev/null +++ b/templates/web/fixmystreet/questionnaire/completed-open.html @@ -0,0 +1,6 @@ +[% loc('<p style="font-size:150%">We’re sorry to hear that. We have two +suggestions: why not try <a href="http://www.writetothem.com/">writing direct +to your councillor(s)</a> or, if it’s a problem that could be fixed by +local people working together, why not +<a href="http://www.pledgebank.com/new">make and publicise a pledge</a>? +</p>' ) %] diff --git a/templates/web/fixmystreet/questionnaire/index.html b/templates/web/fixmystreet/questionnaire/index.html index ded95df04..0c0e8af7f 100644 --- a/templates/web/fixmystreet/questionnaire/index.html +++ b/templates/web/fixmystreet/questionnaire/index.html @@ -6,8 +6,6 @@ [% map_html %] -[% INCLUDE 'report/updates.html' %] - </div> <div id="side"> @@ -24,6 +22,7 @@ <div id="report" class="issue-list-a tab"> [% INCLUDE 'report/_main.html' %] + [% INCLUDE 'report/updates.html' %] </div> </div> @@ -97,9 +96,9 @@ your experience of getting the problem fixed?') %]</p> <p>[% loc('Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?') %]</p> <p> <input type="radio" name="another" id="another_yes" value="Yes"[% ' checked' IF another == 'Yes' %]> - <label for="another_yes">[% loc('Yes') %]</label> + <label class="inline" for="another_yes">[% loc('Yes') %]</label> <input type="radio" name="another" id="another_no" value="No"[% ' checked' IF another == 'No' %]> - <label for="another_no">[% loc('No') %]</label> + <label class="inline" for="another_no">[% loc('No') %]</label> </p> </div> diff --git a/templates/web/fixmystreet/report/_item.html b/templates/web/fixmystreet/report/_item.html new file mode 100644 index 000000000..6014074e0 --- /dev/null +++ b/templates/web/fixmystreet/report/_item.html @@ -0,0 +1,26 @@ +<li> +<a class="text" href="[% c.uri_for('/report', problem.id ) %]"> + [% IF problem.photo %] + <img class="img" height="60" width="90" src="/photo/[% problem.id %].fp.jpeg" alt=""> + [% END %] + <h4>[% problem.title | html %]</h4> + <small>[% IF problem.confirmed_local %] + [%- prettify_epoch( problem.confirmed_local.epoch, 1 ) %] + [%- ELSE %] + [%- prettify_epoch( problem.confirmed, 1 ) %] + [%- END %] + [%- IF dist %], [% dist %]km[% END %] + [%- IF include_lastupdate AND problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %], last updated [% prettify_epoch( problem.lastupdate, 1 ) %] + [%- END %] + [% IF include_lastupdate %] + [% IF problem.councils > 1 %] [% loc('(sent to both)') %] + [% ELSIF problem.councils == 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/fixmystreet/report/banner.html b/templates/web/fixmystreet/report/banner.html new file mode 100644 index 000000000..58712604e --- /dev/null +++ b/templates/web/fixmystreet/report/banner.html @@ -0,0 +1,21 @@ +[% USE date %] +[% BLOCK banner %] + <div class="banner"> + <p id="[% id %]">[% text %]</p> + </div> +[% END %] + +[% IF problem.is_open AND date.now - problem.lastupdate_local.epoch > 8 * 7 * 24 * 60 * 60 %] + [% INCLUDE banner, id = 'unknown', text = loc('Unknown') %] +[% END %] +[% IF problem.is_fixed %] + [% INCLUDE banner, id = 'fixed', text = loc('Fixed') %] +[% END %] +[% IF problem.is_closed %] + [% INCLUDE banner, id = 'closed', text = loc('Closed') %] +[% END %] +[% states = [ 'investigating', 'in progress', 'planned' ]; + IF states.grep(problem.state).size %] + [% INCLUDE banner, id = 'progress', text = loc('In progress') %] +[% END %] + diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index fdfd9765c..1adc1c1e7 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -16,13 +16,7 @@ </div> - -[% IF banner.id %] - <div class="banner"> - <p id="[% banner.id %]">[% banner.text %]</p> - </div> -[% END %] - +[% INCLUDE 'report/banner.html' %] [% INCLUDE 'report/_main.html' %] <div class="shadow-wrap"> diff --git a/templates/web/fixmystreet/reports/_list-entry.html b/templates/web/fixmystreet/reports/_list-entry.html new file mode 100755 index 000000000..8509df376 --- /dev/null +++ b/templates/web/fixmystreet/reports/_list-entry.html @@ -0,0 +1 @@ +[% INCLUDE 'report/_item.html', include_lastupdate = 1 %] diff --git a/templates/web/fixmystreet/reports/_rss.html b/templates/web/fixmystreet/reports/_rss.html new file mode 100644 index 000000000..f2d164bfa --- /dev/null +++ b/templates/web/fixmystreet/reports/_rss.html @@ -0,0 +1,19 @@ +<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 %]">[% + IF c.cobrand.moniker == 'bromley' AND thing == 'council'; + 'Get updates of reports in Bromley'; + ELSIF c.cobrand.moniker == 'bromley'; + 'Get updates of reports in this ward'; + ELSIF c.cobrand.is_council; + tprintf(loc('Get updates of %s problems'), thing); + ELSE; + tprintf(loc('Get updates of problems in this %s'), thing); + END + %]</a></li> + [% IF children.size %] + <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% ward_text %]</a></li> + [% END %] + </ul> +</div> + diff --git a/templates/web/fixmystreet/reports/_ward-list.html b/templates/web/fixmystreet/reports/_ward-list.html new file mode 100755 index 000000000..5e82a93cc --- /dev/null +++ b/templates/web/fixmystreet/reports/_ward-list.html @@ -0,0 +1,12 @@ +[% IF location == 'after' AND children.size %] +<section id="council_wards" class="hidden-js"> +<h2>[% ward_text %]</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 %] + diff --git a/templates/web/lichfielddc/around/extra_text.html b/templates/web/lichfielddc/around/extra_text.html new file mode 100644 index 000000000..7f3fa0dbf --- /dev/null +++ b/templates/web/lichfielddc/around/extra_text.html @@ -0,0 +1,5 @@ +<p> +<strong> +This is primarily for reporting physical problems that can be fixed like graffiti, cleansing issues or road defects. To report other kinds of problems like missed bins use our <a href="http://www.lichfielddc.gov.uk/reportitother">online report it forms</a>. +</strong> +</p> diff --git a/templates/web/lichfielddc/front/news.html b/templates/web/lichfielddc/front/news.html new file mode 100644 index 000000000..987c8e58e --- /dev/null +++ b/templates/web/lichfielddc/front/news.html @@ -0,0 +1,3 @@ +<p class="other-problems"> +This is primarily for reporting physical problems that can be fixed like graffiti, cleansing issues or road defects. To report other kinds of problems like missed bins use our <a href="http://www.lichfielddc.gov.uk/reportitother">online report it forms</a>. +</p> diff --git a/templates/web/lichfielddc/header.html b/templates/web/lichfielddc/header.html index 863ef1c1d..02e3c6a5b 100644 --- a/templates/web/lichfielddc/header.html +++ b/templates/web/lichfielddc/header.html @@ -6,7 +6,7 @@ <head> <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> - <link rel="stylesheet" type="text/css" href="/cobrands/lichfielddc/css/layout.css" /> + <link rel="stylesheet" type="text/css" href="[% version('/cobrands/lichfielddc/css/layout.css') %]" /> <link rel="stylesheet" type="text/css" href="http://www.lichfielddc.gov.uk/site/styles/standard_1_.css" media="screen" /> <link rel="stylesheet" type="text/css" href="http://www.lichfielddc.gov.uk/site/styles/generic/style.php" media="screen" /> @@ -71,7 +71,7 @@ <meta name="DC.subject" lang="en" scheme="eGMS.IPSV" content="Local government;Government, politics and public administration" /> <meta name="DC.subject" lang="en" content="Council, government and democracy" /> -[% INCLUDE 'common_header_tags.html' %] +[% INCLUDE 'common_header_tags.html', site_title = 'Lichfield District Council FixMyStreet' %] </head> <body> <!-- ########## MAIN STRUCTURE ######### --> diff --git a/templates/web/reading/header.html b/templates/web/reading/header.html index 39281ed01..85117b57e 100644 --- a/templates/web/reading/header.html +++ b/templates/web/reading/header.html @@ -14,7 +14,7 @@ <link rel="stylesheet" type="text/css" href="[% version('/cobrands/reading/css/print3rdParty.css') %]" media="print"/> <link rel="stylesheet" type="text/css" href="[% version('/cobrands/reading/css/css.css') %]" /> - [% INCLUDE 'common_header_tags.html' %] + [% INCLUDE 'common_header_tags.html', site_title = 'Reading City Council FixMyStreet' %] </head> <body> diff --git a/templates/web/southampton/header.html b/templates/web/southampton/header.html index 7b0f77e88..43553468c 100644 --- a/templates/web/southampton/header.html +++ b/templates/web/southampton/header.html @@ -8,7 +8,7 @@ <link rel="stylesheet" type="text/css" href="/cobrands/southampton/style.css" /> <link rel="stylesheet" type="text/css" href="[% version('/cobrands/southampton/css.css') %]" /> - [% INCLUDE 'common_header_tags.html' %] + [% INCLUDE 'common_header_tags.html', site_title = 'Southampton City Council FixMyStreet' %] <script type="text/javascript" src="[% version('/js/southampton.js') %]"></script> </head> diff --git a/templates/web/zurich/faq/faq-de.html b/templates/web/zurich/faq/faq-de.html new file mode 100755 index 000000000..bd94ecd38 --- /dev/null +++ b/templates/web/zurich/faq/faq-de.html @@ -0,0 +1,192 @@ +[% INCLUDE 'header.html', title => loc('Frequently Asked Questions'), bodyclass => 'twothirdswidthpage' %] + +<div class="sticky-sidebar"> + <aside> + <ul class="plain-list"> + <li><a href="#faq">Frequently Asked Questions</a></li> + <li><a href="#practical">Practical Questions</a></li> + <li><a href="#organisation">Organisation Questions</a></li> + <li><a href="/privacy">Privacy and cookies</a></li> + </ul> + </aside> +</div> + +<h1><a name="faq"></a>Frequently Asked Questions</h1> + <dl> + <dt>What is FixMyStreet?</dt> + <dd>FixMyStreet is a site to help people report, view, +or discuss local problems they’ve found to their local council by +simply locating them on a map. It launched in early February +2007.</dd> + <dt>What sort of problems should I report with FixMyStreet?</dt> + <dd>FixMyStreet is primarily for reporting things which are +<strong>broken or dirty or damaged or dumped, and need fixing, cleaning +or clearing</strong>, such as: + + <ul><li>Abandoned vehicles + <li>Dog Fouling + <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 [% c.cobrand.is_council ? '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 + to the right department. <strong>You will need to contact [% c.cobrand.is_council ? 'the' : 'your' %] council + directly for problems such as</strong>: + + <ul><li>Anti-social behaviour + <li>Any urgent or emergency problems + <li>Noise pollution or barking dogs + <li>Fires and smoke/smell pollution + <li>Missing wheelie bins or recycling boxes or missed rubbish collections + <li>Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. + <li>Complaining about your neighbours + <li>Complaining about the council + <li>Joy riding, drug taking, animal cruelty, or other criminal activity + </ul> + <p>Councils often have direct hotlines for these sorts of issues.</p> + </dd> + + <dt>How do I use the site?</dt> + <dd>After entering a postcode or location, you are presented +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 [% IF !c.cobrand.is_council %]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[% 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 +href="https://secure.mysociety.org/donate/">please do</a>.</dd> + + <dt>Can I use FixMyStreet on my mobile?</dt> + <dd> + <p>The FixMyStreet website should work on your mobile phone, adapting to + the size of your screen automatically. We plan to release updated native + apps in the near future. + <ul> + <li><em>iPhone:</em> Our basic app from 2008 is available for download + on the App Store: + <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>, + <li><em>Android:</em> A volunteer, Anna Powell-Smith, has written an app + available from the + <a href="https://market.android.com/details?id=com.android.fixmystreet">Android Market</a>. + <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the + <a href="http://store.ovi.com/content/107557">Ovi Store</a>. + </ul> + </dd> + + </dl> + + <h2><a name="practical"></a>Practical Questions</h2> + <dl> + <dt>I’m from a council, where do you send the reports?</dt> + <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/for-councils/fixmystreet/">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 +problems or updates which we consider to be inappropriate upon being informed +by a user of the site.</dd> + <dt>Why does the site use kilometres for measurements?</dt> + <dd>Thanks for asking politely – we never quite understand why some of the rudest + emails we receive are on this topic. The British national + grid reference system, devised by Ordnance Survey (the British national + mapping agency) around the time of the second world war, uses eastings and + northings measured in metres and kilometres; the maps we use are from + Ordnance Survey and so this is what we use to display distances. + There you have it: not everything British is in miles!</dd> + + <dt>Why can’t I zoom out more on the reporting map?</dt> + <dd>We want to keep FixMyStreet locally focused, so restrict the ability to + move radically between areas. The map on Your Reports will let you see all + the reports you’ve made, wherever they are. If you’re from the + council then the emailed version of the problem report also contains the + closest road and postcode to the pin on the map.</dd> + + <dt>This site is great – why aren’t you better publicised?</dt> + <dd>As a tiny charity we simply don’t have a publicity budget, and we + rely on word of mouth to advertise the site. We have a whole <a + href="posters/">array of posters, flyers and badges</a> if you’d like + to publicise us on the web or in your local area, and why not write to your + local paper to let them know about us?</dd> </dl> + + <h2><a name="organisation"></a>Organisation Questions</h2> + <dl> + <dt>Who built FixMyStreet?</dt> + <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>, + in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. +mySociety is the project of a registered charity which has grown out of the community of +volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou.com</a>. +mySociety’s primary mission is to build Internet projects which give people simple, tangible +benefits in the civic and community aspects of their lives. Our first project +was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your +elected representatives, for free. The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety +can be contacted by email at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, +or by post at mySociety, 483 Green Lanes, London, N13 4BS, UK.</dd> + <dt><img src="/i/moj.png" align="right" alt="Ministry of Justice" hspace="10">Who pays for it?</dt> + <dd>FixMyStreet was originally paid for via the Department for + Constitutional Affairs Innovations Fund. It is now funded by a variety of means, from commercial + work to <a href="http://www.mysociety.org/donate/">donations</a>.</dd> + <dt><a name="nfi"></a>Wasn’t this site called Neighbourhood Fix-It?</dt> + <dd>Yes, we changed the name mid June 2007. We decided +Neighbourhood Fix-It was a bit of a mouthful, hard to spell, and hard to publicise (does the URL have a dash in it or not?). The domain FixMyStreet became available, and everyone liked the name.</dd> + <dt>Do you need any help with the project?</dt> + <dd>Yes, we can use help in all sorts of ways, technical or +non-technical. Please see our <a +href="http://www.mysociety.org/helpus/">Get Involved page</a>.</dd> + <dt>I’d like a site like this for my own location/ where’s the "source code" to this site?</dt> + <dd> +The software behind this site is open source, and available +to you mainly under the GNU Affero GPL software license. You can <a +href="http://github.com/mysociety/fixmystreet">download the +source code</a> and help us develop it. +You’re welcome to use it in your own projects, although you must also +make available the source code to any such projects. +<a href="http://www.fiksgatami.no/">Fiksgatami</a> is an example of our code +being used in a Norwegian version of this site. +</dd> +<dt>I’d prefer code in a different language?</dt> +<dd> +VisibleGovernment.ca wrote their own code for +<a href="http://www.fixmystreet.ca/">http://www.fixmystreet.ca/</a>, which is +written in GeoDjango and available under an MIT licence at <a +href="http://github.com/visiblegovernment/django-fixmystreet/tree/master">github</a>. +Or <a href="http://www.fixmystreet.org.nz/">FixMyStreet.org.nz</a> is written in +Drupal. +</p> +</dd> + <dt>People build things, not organisations. Who <em>actually</em> built it?</dt> + <dd>Matthew Somerville and Francis Irving wrote the site, +Chris Lightfoot wrote the tileserver and map cutter, Richard Pope created +our pins, Deborah Kerr keeps things up-to-date and does user support, +Ayesha Garrett designed our posters, and Tom Steinberg managed it all. + +Thanks also to +<a href="http://www.ordnancesurvey.co.uk">Ordnance Survey</a> (for the maps, +UK postcodes, and UK addresses – data © Crown copyright, all +rights reserved, Ministry of Justice 100037819 2008), +Yahoo! for their BSD-licensed JavaScript libraries, the entire free software +community (this particular project was brought to you by Perl, PostgreSQL, +and the number 161.290) and <a +href="http://www.m247.com/">M247</a> (who kindly host all +our servers). + +Let us know if we’ve missed anyone.</dd> + </dl> +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html new file mode 100644 index 000000000..9fa43f3fa --- /dev/null +++ b/templates/web/zurich/header.html @@ -0,0 +1,60 @@ +<!doctype html> +<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> + <head> + <meta name="viewport" content="initial-scale=1.0"> + + <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> + <meta name="HandHeldFriendly" content="true"> + <meta name="mobileoptimized" content="0"> + + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)"> + [% extra_css %] + <!--[if (lt IE 9) & (!IEMobile)]> + <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> + <![endif]--> + + <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> + <script src="[% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'FixMyZürich' %] + [% extra_js %] + + [% IF c.req.uri.host == 'osm.fixmystreet.com' %] + <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]"> + [% END %] + + [% INCLUDE 'tracking_code.html' %] + + </head> + <body class="[% bodyclass | html IF bodyclass %]"> + + <div class="wrapper"> + <div class="table-cell"> + <header id="site-header" role="banner"> + <div class="container"> + <a href="/" id="site-logo">FixMyStreet</a> + <a href="#main-nav" id="nav-link">Main Navigation</a> + </div> + </header> + + <div id="user-meta"> + [% IF c.user_exists %] + <p> + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + <a href="/auth/sign_out">[% loc('sign out') %]</a> + </p> + [% ELSE %] + <!-- <a href="/auth">[% loc('Sign in') %]</a> --> + [% END %] + </div> + + [% pre_container_extra %] + + <div class="container"> + <div class="content[% " $mainclass" | html IF mainclass %]" role="main"> + + <!-- [% INCLUDE 'debug_header.html' %] --> |