diff options
Diffstat (limited to 'templates')
45 files changed, 468 insertions, 604 deletions
diff --git a/templates/email/bromley/questionnaire.txt b/templates/email/bromley/questionnaire.txt index 7cdc10131..4328479e1 100644 --- a/templates/email/bromley/questionnaire.txt +++ b/templates/email/bromley/questionnaire.txt @@ -11,9 +11,7 @@ updating the status of your problem: This email has been sent automatically from an unmonitored mailbox, please do not reply. -Customer Service Centre -London Borough of Bromley -Email: csc@bromley.gov.uk +[% INCLUDE 'signature.txt' %] Your problem was as follows: diff --git a/templates/email/bromley/signature.txt b/templates/email/bromley/signature.txt new file mode 100644 index 000000000..776ba3527 --- /dev/null +++ b/templates/email/bromley/signature.txt @@ -0,0 +1,3 @@ +Customer Service Centre +London Borough of Bromley +Email: csc@bromley.gov.uk diff --git a/templates/email/default/alert-confirm.txt b/templates/email/default/alert-confirm.txt index fae3f2963..abf7801f5 100644 --- a/templates/email/default/alert-confirm.txt +++ b/templates/email/default/alert-confirm.txt @@ -1,14 +1,13 @@ -Subject: Confirm your alert on FixMyStreet +Subject: Confirm your alert on [% c.cobrand.site_name %] Hi, Please click on the link below to confirm the alert you just -asked to subscribe to on FixMyStreet: +asked to subscribe to on [% c.cobrand.site_name %]: [% token_url %] If you can't click the link, please copy and paste it to the address bar of your web browser. -Yours, -The FixMyStreet team +[% INCLUDE 'signature.txt' %] diff --git a/templates/email/default/alert-problem-area.txt b/templates/email/default/alert-problem-area.txt index 8c41aaf5e..3696c87d4 100644 --- a/templates/email/default/alert-problem-area.txt +++ b/templates/email/default/alert-problem-area.txt @@ -5,8 +5,7 @@ The following new problems have been added within <?=$values['data']?> -Yours, -The FixMyStreet team +<?=$values['signature']?> To stop receiving emails when there are new problems in <?=$values['area_name']?>, please follow this link: diff --git a/templates/email/default/alert-problem-council.txt b/templates/email/default/alert-problem-council.txt index 572e057a6..5544a2043 100644 --- a/templates/email/default/alert-problem-council.txt +++ b/templates/email/default/alert-problem-council.txt @@ -4,8 +4,7 @@ The following new problems have been reported to <?=$values['area_name']?>: <?=$values['data']?> -Yours, -The FixMyStreet team +<?=$values['signature']?> To stop receiving emails when there are new problems reported to <?=$values['area_name']?>, please follow this link: diff --git a/templates/email/default/alert-problem-nearby.txt b/templates/email/default/alert-problem-nearby.txt index 0bf8483a7..0c88dab5a 100644 --- a/templates/email/default/alert-problem-nearby.txt +++ b/templates/email/default/alert-problem-nearby.txt @@ -4,8 +4,7 @@ The following nearby problems have been added: <?=$values['data']?> -Yours, -The FixMyStreet team +<?=$values['signature']?> To stop receiving emails when there are nearby problems, please follow this link: <?=$values['unsubscribe_url']?> diff --git a/templates/email/default/alert-problem-ward.txt b/templates/email/default/alert-problem-ward.txt index efcf15993..9793bcdac 100644 --- a/templates/email/default/alert-problem-ward.txt +++ b/templates/email/default/alert-problem-ward.txt @@ -5,8 +5,7 @@ within <?=$values['ward_name']?>: <?=$values['data']?> -Yours, -The FixMyStreet team +<?=$values['signature']?> To stop receiving emails when there are new problems reported to <?=$values['area_name']?> within <?=$values['ward_name']?>, diff --git a/templates/email/default/alert-problem.txt b/templates/email/default/alert-problem.txt index 8369b8e28..01e184e0a 100644 --- a/templates/email/default/alert-problem.txt +++ b/templates/email/default/alert-problem.txt @@ -4,8 +4,7 @@ The following new problems have been added: <?=$values['data']?> -Yours, -The FixMyStreet team +<?=$values['signature']?> To stop receiving emails when there are new problems, please follow this link: <?=$values['unsubscribe_url']?> diff --git a/templates/email/default/alert-update.txt b/templates/email/default/alert-update.txt index ac0ddd50a..1140de1fa 100644 --- a/templates/email/default/alert-update.txt +++ b/templates/email/default/alert-update.txt @@ -11,8 +11,7 @@ To view or reply to these updates, please visit the following URL: You cannot contact anyone by replying to this email. -Yours, -The FixMyStreet team +<?=$values['signature']?> To stop receiving emails when there are new updates on this problem, please follow this link: <?=$values['unsubscribe_url']?> diff --git a/templates/email/default/login.txt b/templates/email/default/login.txt index d24f1cc4f..608d99ee9 100644 --- a/templates/email/default/login.txt +++ b/templates/email/default/login.txt @@ -5,6 +5,5 @@ able to view your problem reports and manage them more easily. [% c.uri_for_action( 'auth/token', token ) %] -Yours, -The FixMyStreet.com team +[% INCLUDE 'signature.txt' %] diff --git a/templates/email/default/partial.txt b/templates/email/default/partial.txt index 279d76ea0..82bc0cf0e 100644 --- a/templates/email/default/partial.txt +++ b/templates/email/default/partial.txt @@ -10,5 +10,4 @@ please visit the following URL: Thanks! -Yours, -The FixMyStreet team +[% INCLUDE 'signature.txt' %] diff --git a/templates/email/default/problem-confirm.txt b/templates/email/default/problem-confirm.txt index 58c1c75d1..5f5bd511a 100644 --- a/templates/email/default/problem-confirm.txt +++ b/templates/email/default/problem-confirm.txt @@ -1,9 +1,9 @@ -Subject: Confirm your problem on FixMyStreet +Subject: Confirm your problem on [% c.cobrand.site_name %] Hi [% report.name %], Please click on the link below to confirm the problem you just -added to FixMyStreet: +added to [% c.cobrand.site_name %]: [% token_url %] @@ -16,5 +16,4 @@ Your problem had the title: And details: [% report.detail %] -Yours, -The FixMyStreet team +[% INCLUDE 'signature.txt' %] diff --git a/templates/email/default/questionnaire.txt b/templates/email/default/questionnaire.txt index 7ff184c41..88d4cc1b5 100644 --- a/templates/email/default/questionnaire.txt +++ b/templates/email/default/questionnaire.txt @@ -13,8 +13,7 @@ updating the status of your problem: Please do not reply to this email; there is a public comment box on the questionnaire. -Yours, -The FixMyStreet team +<?=$values['signature']?> Your problem was as follows: diff --git a/templates/email/default/reply-autoresponse b/templates/email/default/reply-autoresponse index 672c1f3c9..f984c66b0 100644 --- a/templates/email/default/reply-autoresponse +++ b/templates/email/default/reply-autoresponse @@ -19,5 +19,5 @@ unsubscribe link at the bottom of the email. If you have a question or comment about the site, please send your email to team@fixmystreet.com -Yours, +Yours, The FixMyStreet team diff --git a/templates/email/default/signature.txt b/templates/email/default/signature.txt new file mode 100644 index 000000000..69ee38767 --- /dev/null +++ b/templates/email/default/signature.txt @@ -0,0 +1,2 @@ +Yours, +The FixMyStreet team diff --git a/templates/email/default/submit-brent.txt b/templates/email/default/submit-brent.txt index 4b3e20968..c94e6e1e4 100644 --- a/templates/email/default/submit-brent.txt +++ b/templates/email/default/submit-brent.txt @@ -29,8 +29,7 @@ Longitude: <?=$values['longitude']?> Replies to this email will go to the user who submitted the problem. -Yours, -The FixMyStreet team +<?=$values['signature']?> This message was sent via FixMyStreet, a project of UKCOD, registered charity number 1076346. If there is a more appropriate email address for messages about @@ -40,5 +39,5 @@ also welcome any other feedback you may have. FixMyStreet is now available for full integration into council websites, making life easier for both you and your residents. -Read more here: http://www.fixmystreet.com/for-councils +Read more here: http://www.mysociety.org/for-councils/fixmystreet/ diff --git a/templates/email/default/submit-example.txt b/templates/email/default/submit-example.txt index 6d1815cd1..4956a7a93 100644 --- a/templates/email/default/submit-example.txt +++ b/templates/email/default/submit-example.txt @@ -57,5 +57,5 @@ feedback you may have. FixMyStreet is now available for full integration into council websites, making life easier for both you and your residents. -Read more here: http://www.fixmystreet.com/for-councils +Read more here: http://www.mysociety.org/for-councils/fixmystreet/ diff --git a/templates/email/default/submit.txt b/templates/email/default/submit.txt index 20fa17096..a956b4add 100644 --- a/templates/email/default/submit.txt +++ b/templates/email/default/submit.txt @@ -29,8 +29,7 @@ Longitude: <?=$values['longitude']?> Replies to this email will go to the user who submitted the problem. -Yours, -The FixMyStreet team +<?=$values['signature']?> This message was sent via FixMyStreet, a project of UKCOD, registered charity number 1076346. If there is a more appropriate email address for messages about @@ -40,5 +39,5 @@ also welcome any other feedback you may have. FixMyStreet is now available for full integration into council websites, making life easier for both you and your residents. -Read more here: http://www.fixmystreet.com/for-councils +Read more here: http://www.mysociety.org/for-councils/fixmystreet/ diff --git a/templates/email/default/update-confirm.txt b/templates/email/default/update-confirm.txt index c7571e76c..fdcd68edb 100644 --- a/templates/email/default/update-confirm.txt +++ b/templates/email/default/update-confirm.txt @@ -1,4 +1,4 @@ -Subject: Confirm your update on FixMyStreet +Subject: Confirm your update on [% c.cobrand.site_name %] Hi [% update.name %], @@ -14,5 +14,4 @@ Your update reads: [% update.text %] -Yours, -The FixMyStreet team +[% INCLUDE 'signature.txt' %] diff --git a/templates/web/barnet/faq/faq-en-gb.html b/templates/web/barnet/faq/faq-en-gb.html new file mode 100755 index 000000000..126a03314 --- /dev/null +++ b/templates/web/barnet/faq/faq-en-gb.html @@ -0,0 +1,103 @@ +[% INCLUDE 'header.html', title = 'Help', bodyclass = 'twothirdswidthpage' %] + +<h1>Frequently Asked Questions</h1> + +<p>These pages are for reporting things which are broken or dirty or damaged or dumped, and need fixing, cleaning or clearing, such as:</p> + <ul><li>abandoned vehicles + <li>flyposting or graffiti + <li>flytipping or litter + <li>streetcleaning, such as broken glass in a cycle lane + <li>unlit lamposts + <li>broken playground equipment + <li>potholes + </ul> + +<dl> + <dt>What issues can’t be reported here?</dt> + <dd><p>It is not a way of reporting all issues. Problems such as:</p> + <ul> + <li>missed rubbish or recycling collections + <li>anti-social behaviour + <li>noise pollution or barking dogs + <li>fires and smoke/smell pollution + <li>proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. + <li>complaining about your neighbours + <li>complaining or commenting about the council + </ul> + </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, +or report ones of your own by clicking on the map at the location of +the problem.</dd> + <dt>How are the problems solved?</dt> + <dd>They are reported directly to us so we can then resolve the problem. + You can also discuss the problem on the website with others if you wish.</dd> + + <dt>Do you remove silly or illegal content?</dt> + <dd>Barnet Council and FixMyStreet are not responsible for the content and accuracy +of material submitted by their 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>Can I use FixMyStreet on my mobile?</dt> + <dd>Yes a special mobile friendly version is available to report problem in Barnet’s streets or parks. + </dd> + + <dt>Can I use these pages to report problems outside of the London Borough of Barnet?</dd> + <dd>No, please visit the main FixMyStreet site at <a href="http://www.fixmystreet.com/">http://www.fixmystreet.com/</a> to report problem outside the borough.</dd> + + <dt>Who built FixMyStreet?</dt> + <dd>FixMyStreet 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</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>Why does the site use kilometres for measurements?</dt> + <dd>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 reports locally focused, so we restrict the ability to + move radically between areas. The map on <a href="/my">Your Reports</a> will let you see all + the reports you’ve made, wherever they are.</dd> + + <dt>Who gets to see my email address?</dt> + <dd>If you submit a problem, your details, and details + of the problem, will be submitted to Barnet Council. +Other than the council, only people we authorise to view the FixMyStreet administration interface +will be able to see your email address and they will never use it for anything other than +to help administer FixMyStreet. We will never give or sell your email address to anyone else, +unless we are obliged to by law. Your name will not be published anywhere unless you let us.</dd> + + <dt>What emails will you send to me?</dt> + <dd>We will email you if someone leaves an update on a +problem you’ve reported, and send you a questionnaire email four weeks +after you submit a problem, asking for a status update; we’ll only ever +send you emails in relation to your problem.</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> + + </dl> + +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/barnet/footer.html b/templates/web/barnet/footer.html index 32c6b5f7b..7982ad530 100644 --- a/templates/web/barnet/footer.html +++ b/templates/web/barnet/footer.html @@ -1,7 +1,37 @@ - </div> - <!-- end of content, start of footer --> - </div> - </div> + <p id="barnet-powered-by" class="desk-only"> + <a href="http://www.fixmystreet.com/">Powered by <img src="/cobrands/barnet/img/fms-logo.png" style="height:20px;"></a> + </p> + </div><!-- .content role=main --> + </div><!-- .container --> + </div><!-- .table-cell --> + + <div class="nav-wrapper"> + <div class="nav-wrapper-2"> + <div id="main-nav" role="navigation"> + <ul id="mysoc-menu"> + <li><a href="http://www.fixmystreet.com/">Powered by <img src="/cobrands/barnet/img/fms-logo.png" style="height:20px;"></a></li> + </ul> + <ul id="main-menu"> + <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" + >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END + %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/reports/Barnet' %]span[% ELSE %]a href="/reports/Barnet"[% END + %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> + </ul> + </div> + </div> + </div> + + </div> <!-- .wrapper --> +</div> +</div> +</div> + <!-- googleoff: index --> <div id="column_nav"> <div class="navigation active"> @@ -44,8 +74,7 @@ </div> </div> <!-- googleon: index --> - </div> - </div> - </div> +</div> +</div> </body> -</html>
\ No newline at end of file +</html> diff --git a/templates/web/barnet/header.html b/templates/web/barnet/header.html index 955473090..5c6a19d89 100644 --- a/templates/web/barnet/header.html +++ b/templates/web/barnet/header.html @@ -1,60 +1,94 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> - <head> - <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/standard.css" media="screen" /> -<!--[if lte IE 6]> - <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/ie-six.css" media="screen" /> - <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/ie-six-print.css" media="print" /> -<![endif]--> -<!--[if IE 7]> - <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/ie-seven.css" media="screen" /> -<![endif]--> -<!--[if IE 8]> - <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/ie-eight.css" media="screen" /> -<![endif]--> - <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/print.css" media="print" /> - <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/handheld.css" media="handheld" /> - <link rel="Shortcut Icon" type="image/x-icon" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/favicon.ico" /> +<!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="ToC" href="http://www.barnet.gov.uk/site_map" /> <meta name="Keywords" content="fixmystreet barnet pothole streetlights report street problem" /> <meta name="Description" content="FixMyStreet Barnet: report problems in Barnet like graffiti, fly tipping, broken paving slabs, or street lighting" /> - <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> - <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/layout.css"> - - [% INCLUDE 'common_header_tags.html' %] - - </head> - <body> - <div id="wrapper"> - <div id="ie_wrapper"> -<!-- googleoff: index --> - <div id="mobile_name">London Borough of Barnet</div> - <div id="mast"> - <div class="pseudoH1"> - <a href="http://www.barnet.gov.uk/"><span>London Borough of Barnet</span> <img src="http://pledgebank.barnet.gov.uk/microsites/barnet/site/images/blank.gif" alt="London Borough of Barnet logo" /></a> - </div> - <ul id="skip" class="hidden"> - <li><a href="#content" rel="nofollow">Skip to content</a></li> - <li><a href="#column_nav" rel="nofollow">Skip to main navigation</a></li> - </ul> - <div class="mast_links"></div> - <span class="clear"></span> - <div id="search"></div> - <div class="clear"></div> - </div> -<!-- googleon: index --> - <div id="page_wrap"> - <div id="page"> - <div id="breadcrumb"> -<!-- googleoff:all --> - <ul> - <li><a href="/">FixMyStreet Home</a></li> - <li class="bc_end"><span>[% c.req.uri.path == '/'? 'Report a problem' : "$title" | html %]</span></li> - </ul> -<!-- googleon:all --> - </div> - <div id="content" class="withWidth fullWidth"> - <div id="mysociety"> - - <!-- end of header -->
\ No newline at end of file + <link rel="Shortcut Icon" type="image/x-icon" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/favicon.ico" /> + + <link rel="stylesheet" href="[% version('/cobrands/barnet/base.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/barnet/layout.css') %]" media="(min-width:48em)"> + <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> + <!--[if (lt IE 9) & (!IEMobile)]> + <link rel="stylesheet" href="[% version('/cobrands/barnet/layout.css') %]"> + <![endif]--> + <link rel="stylesheet" href="[% version('/cobrands/barnet/barnet.css') %]" media="(min-width:48em)"> + <!--[if (lt IE 9) & (!IEMobile)]> + <link rel="stylesheet" href="[% version('/cobrands/barnet/barnet.css') %]"> + <![endif]--> + + <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' %] + <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> + + </head> + <body class="[% bodyclass | html IF bodyclass %]"> + <div id="barnet-wrapper"> + <div id="ie_wrapper"> + <div id="mast"> + <div class="pseudoH1"> + <a href="http://www.barnet.gov.uk/"><span>London Borough of Barnet</span> <img src="http://pledgebank.barnet.gov.uk/microsites/barnet/site/images/blank.gif" alt="London Borough of Barnet logo" /></a> + </div> + <ul id="skip" class="hidden"> + <li><a href="#content" rel="nofollow">Skip to content</a></li> + <li><a href="#column_nav" rel="nofollow">Skip to main navigation</a></li> + </ul> + <div class="mast_links"></div> + <span class="clear"></span> + <div id="search"></div> + <div class="clear"></div> + </div> + <div id="page_wrap"> + <div id="page"> + <div id="breadcrumb"> + <!-- googleoff:all --> + <ul> + <li><a href="http://www.barnet.gov.uk/">Home</a></li> + <li><a href="/">FixMyStreet</a></li> + <li class="bc_end"><span> + [% IF c.req.uri.path == '/' %]Report a problem[% ELSE %][% title %][% END %] + </span></li> + </ul> + <!-- googleon:all --> + </div> + <div id="content" class="withWidth fullWidth"> + <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> + [% END %] + </div> + + <h1 id="page-title"> + <span>FixMyStreet</span> + </h1> + + <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> + + [% pre_container_extra %] + + <div class="container"> + <div class="content[% " $mainclass" | html IF mainclass %]" role="main"> + + <!-- end of header --> diff --git a/templates/web/barnet/index.html b/templates/web/barnet/index.html new file mode 100644 index 000000000..82600625e --- /dev/null +++ b/templates/web/barnet/index.html @@ -0,0 +1,100 @@ +[%# 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/barnet/report/new/councils_text_all.html b/templates/web/barnet/report/new/councils_text_all.html new file mode 100644 index 000000000..20152928b --- /dev/null +++ b/templates/web/barnet/report/new/councils_text_all.html @@ -0,0 +1,4 @@ +<p> +All the information you provide here will be sent to the <strong>relevant department</strong>. +[% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %] +</p> diff --git a/templates/web/barnet/report/updates-sidebar-notes.html b/templates/web/barnet/report/updates-sidebar-notes.html new file mode 100644 index 000000000..9fff322a1 --- /dev/null +++ b/templates/web/barnet/report/updates-sidebar-notes.html @@ -0,0 +1 @@ + <p>[% loc( 'Please note that updates are not sent to the relevant department. If you leave your name it will be public. Your information will only be used in accordance with our <a href="/faq#privacy">privacy policy</a>' ) %]</p> diff --git a/templates/web/bromley/faq/faq-en-gb.html b/templates/web/bromley/faq/faq-en-gb.html index ae418de37..f0b5e1a7e 100755 --- a/templates/web/bromley/faq/faq-en-gb.html +++ b/templates/web/bromley/faq/faq-en-gb.html @@ -87,7 +87,7 @@ being used in a Norwegian version of this site. </dl> - <h2>Privacy Questions</h2> + <h2><a name="privacy"></a>Privacy Questions</h2> <dl> <dt>Who gets to see my email address?</dt> diff --git a/templates/web/bromley/header.html b/templates/web/bromley/header.html index eea690c7d..69a595923 100644 --- a/templates/web/bromley/header.html +++ b/templates/web/bromley/header.html @@ -12,15 +12,16 @@ <link rel="stylesheet" href="[% version('/cobrands/bromley/base.css') %]"> <link rel="stylesheet" href="[% version('/cobrands/bromley/layout.css') %]" media="(min-width:48em)"> - <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> <link rel="stylesheet" href="[% version('/cobrands/bromley/bromley.css') %]"> + [% extra_css %] <!--[if (lt IE 9) & (!IEMobile)]> <link rel="stylesheet" href="[% version('/cobrands/bromley/layout.css') %]"> <![endif]--> <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' %] - <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> + [% extra_js %] <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/bromley/favicon.ico"> diff --git a/templates/web/bromley/report/display.html b/templates/web/bromley/report/display.html index 131416bb2..89b74277f 100644 --- a/templates/web/bromley/report/display.html +++ b/templates/web/bromley/report/display.html @@ -1,4 +1,5 @@ [% + PROCESS "report/photo-js.html"; PROCESS "maps/${map.type}.html"; problem_title = problem.title _ ' - ' _ loc('Viewing a problem'); @@ -185,10 +186,7 @@ [% INCLUDE 'footer.html' %] [% BLOCK name %] - [% IF problem.council == '2482' %] - [% extra_name_info = 1 %] - [% INCLUDE 'report/new/extra_name.html' %] - [% END %] + [% INCLUDE 'report/new/extra_name.html' %] [% IF c.user_exists %] [% names = c.user.split_name %] diff --git a/templates/web/bromley/tokens/confirm_problem.html b/templates/web/bromley/tokens/confirm_problem.html deleted file mode 100644 index d002cc262..000000000 --- a/templates/web/bromley/tokens/confirm_problem.html +++ /dev/null @@ -1,13 +0,0 @@ -[% INCLUDE 'header.html', title = loc('Confirmation') %] - -<h1>[% loc('Confirmation') %]</h1> - -<p class="confirmed"> -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>. -</p> - -<p>Your reference for this problem is [% problem.id %], please quote it in any enquiries.</p> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/default/dashboard/index.html b/templates/web/default/dashboard/index.html index a0ef7b911..308042d0d 100644 --- a/templates/web/default/dashboard/index.html +++ b/templates/web/default/dashboard/index.html @@ -9,6 +9,7 @@ th[scope=row] { text-align: left; } tr.subtotal { background-color: #eee; } #overview tr:nth-child(2) { background-color: #fee; } + select { width: auto; } </style> <form> @@ -18,16 +19,16 @@ <option value="[% w.id %]"[% ' selected' IF w.id == ward %]>[% w.name %]</option> [% END %] </select> -<input type="submit" value="Look up"> - -<h2>Performance Overview</h2> <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> -<input type="submit" value="Look up"> + +<p><input type="submit" value="Look up"> + +<h2>Summary Statistics for [% council.name %]</h2> <table width="100%" id="overview"> <tr> @@ -45,7 +46,7 @@ '2' => [ "fixed_user", "User has marked as fixed" ] }; FOR row IN rows %] - <tr> + <tr id="[% row.value.0.replace('[^\w]+', '_' ) %]"> <th scope="row">[% row.value.1 %]</th> <td>[% problems.wtd.${row.value.0} %]</td> <td>[% problems.week.${row.value.0} %]</td> @@ -54,7 +55,7 @@ </tr> [% END %] - <tr class='subtotal'> + <tr class='subtotal' id="total_fixed"> <th scope="row">Total marked as fixed</th> <td>[% problems.wtd.${"fixed - council"} + problems.wtd.fixed_user %]</td> <td>[% problems.week.${"fixed - council"} + problems.week.fixed_user %]</td> @@ -67,10 +68,11 @@ '0' => [ "in progress", "Council has marked as in progress" ] '1' => [ "planned", "Council has marked as planned" ] '2' => [ "investigating", "Council has marked as investigating" ] + '3' => [ "closed", "Council has marked as closed" ] }; wtd = 0, week = 0, weeks = 0, ytd = 0; FOR row IN rows %] - <tr> + <tr id="[% row.value.0.replace('[^\w]+', '_' ) %]"> <th scope="row">[% row.value.1 %]</th> <td>[% problems.wtd.${row.value.0} %]</td> <td>[% problems.week.${row.value.0} %]</td> @@ -79,36 +81,36 @@ </tr> [% END %] - <tr class='subtotal'> + <tr class='subtotal' id="marked"> <th scope="row">Total marked</th> - <td>[% problems.wtd.${"in progress"} + problems.wtd.planned + problems.wtd.investigating %]</td> - <td>[% problems.week.${"in progress"} + problems.week.planned + problems.week.investigating %]</td> - <td>[% problems.weeks.${"in progress"} + problems.weeks.planned + problems.weeks.investigating %]</td> - <td>[% problems.ytd.${"in progress"} + problems.ytd.planned + problems.ytd.investigating %]</td> + <td>[% problems.wtd.${"in progress"} + problems.wtd.planned + problems.wtd.investigating + problems.wtd.closed %]</td> + <td>[% problems.week.${"in progress"} + problems.week.planned + problems.week.investigating + problems.wtd.closed %]</td> + <td>[% problems.weeks.${"in progress"} + problems.weeks.planned + problems.weeks.investigating + problems.wtd.closed %]</td> + <td>[% problems.ytd.${"in progress"} + problems.ytd.planned + problems.ytd.investigating + problems.wtd.closed %]</td> </tr> - <tr> - <th scope="row">Average time to fix</th> - <td>-</td> - <td>-</td> - <td>-</td> - <td>-</td> + <tr id="avg_fixed"> + <th scope="row">Average time to council marking fixed (days)</th> + <td>[% problems.wtd.time_to_fix %]</td> + <td>[% problems.week.time_to_fix %]</td> + <td>[% problems.weeks.time_to_fix %]</td> + <td>[% problems.ytd.time_to_fix %]</td> </tr> - <tr> - <th scope="row">Average time to mark</th> - <td>-</td> - <td>-</td> - <td>-</td> - <td>-</td> + <tr id="avg_marked"> + <th scope="row">Average time to first council state change (days)</th> + <td>[% problems.wtd.time_to_mark %]</td> + <td>[% problems.week.time_to_mark %]</td> + <td>[% problems.weeks.time_to_mark %]</td> + <td>[% problems.ytd.time_to_mark %]</td> </tr> - <tr class='subtotal'> + <tr class='subtotal' id="not_marked"> <th scope="row">Total not marked</th> - <td>-</td> - <td>-</td> - <td>-</td> - <td>-</td> + <td>[% problems.wtd.not_marked %]</td> + <td>[% problems.week.not_marked %]</td> + <td>[% problems.weeks.not_marked %]</td> + <td>[% problems.ytd.not_marked %]</td> </tr> </table> @@ -126,21 +128,25 @@ </select> <input type="submit" value="Look up"> -<table width="100%"> +<table width="100%" id="reports"> <tr> <th scope="col">Less than 7 days old</th> <th scope="col">7-14 days old</th> <th scope="col">14-30 days old</th> - <th scope="col">30+ days old</th> </tr> <tr> - <td><ul><li></li></ul></td> - <td><ul><li></li></ul></td> - <td><ul><li></li></ul></td> - <td><ul><li></li></ul></td> + <td width="34%"><ul>[% INCLUDE list, list = lists.1 %]</ul></td> + <td width="33%"><ul>[% INCLUDE list, list = lists.2 %]</ul></td> + <td width="33%"><ul>[% INCLUDE list, list = lists.3 %]</ul></td> </tr> </table> </form> [% INCLUDE 'footer.html' %] + +[% BLOCK list %] +[% FOR p IN list %] +<li><a href="/report/[% p.id %]">[% p.title | html %]</a></li> +[% END %] +[% END %] diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index 2c1c43799..1e52cc3b0 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -25,11 +25,11 @@ or clearing</strong>, such as: </dd> <dt>What isn’t FixMyStreet for?</dt> - <dd>FixMyStreet is not a way of getting in touch with [% c.cobrand.moniker == 'southampton' ? 'the' : 'your' %] council for all + <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.moniker == 'southampton' ? 'the' : 'your' %] council + 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 @@ -51,7 +51,7 @@ 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.moniker != 'southampton' %]relevant[% END %] council by email. The + <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> @@ -92,7 +92,7 @@ to find out where reports go at the moment. Also <a href="/contact">contact us</ 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.fixmystreet.com/for-councils">Full details</a>.</dd> + <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 diff --git a/templates/web/default/report/new/extra_name.html b/templates/web/default/report/new/extra_name.html index e8c2cadaf..dede1000c 100644 --- a/templates/web/default/report/new/extra_name.html +++ b/templates/web/default/report/new/extra_name.html @@ -6,7 +6,7 @@ [% title = '' %] [% IF fms_extra_title %][% title = fms_extra_title | upper %] [% ELSIF c.user && c.user.title %][% title = c.user.title | upper %][% END %] -<select class="form-focus-trigger" id="form_fms_extra_title" +<select class="form-focus-trigger required" id="form_fms_extra_title" name="fms_extra_title"> <option></option> <option value="MR"[% ' selected' IF title == 'MR' %]>Mr</option> diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html index 7a17adbc7..2a65a3e3e 100644 --- a/templates/web/default/report/updates.html +++ b/templates/web/default/report/updates.html @@ -15,7 +15,7 @@ [%- ELSIF update.user.from_council; user_name = update.user.name | html; council = update.user.council; - IF c.cobrand.moniker == 'bromley'; + IF council == 'Bromley Council'; council = "$council <img src='/cobrands/bromley/favicon.png' alt=''>"; END %] [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, council, prettify_epoch( update.confirmed_local.epoch ) ) -%] diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html index d1c2241c7..b837bcee9 100755 --- a/templates/web/default/reports/council.html +++ b/templates/web/default/reports/council.html @@ -14,6 +14,12 @@ %] [% END %] +[% IF c.cobrand.is_council %] + [% ward_text = loc( 'View reports by ward' ) %] +[% ELSE %] + [% ward_text = loc( 'Wards of this council' ) %] +[% END %] + [% PROCESS "maps/${map.type}.html"; INCLUDE 'header.html', @@ -25,8 +31,8 @@ [% map_html %] -[% IF style != 'new' AND children.size %] -<h2 style="clear:right">[% loc('Wards of this council') %]</h2> +[% 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') %] @@ -72,7 +78,7 @@ 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 style == 'new' %] +[% 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 %]">[% @@ -80,18 +86,14 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a '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">[% - IF c.cobrand.moniker == 'bromley'; - 'View reports by ward'; - ELSE; - loc('Wards of this council'); - END - %]</a></li> + <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% ward_text %]</a></li> [% END %] </ul> </div> @@ -101,9 +103,9 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a [% TRY %][% INCLUDE 'reports/cobrand_stats.html' %][% CATCH file %][% END %] -[% IF style == 'new' AND children.size %] +[% IF c.cobrand.all_reports_style == 'detailed' AND children.size %] <section id="council_wards" class="hidden-js"> - <h2>[% loc('Wards of this council') %]</h2> +<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') %] @@ -116,7 +118,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a [% IF c.cobrand.moniker == 'fixmystreet' %] <p class="promo"> FixMyStreet is now available for local council websites. - <a href="/for-councils">Find out more</a>. + <a href="http://www.mysociety.org/for-councils/fixmystreet/">Find out more</a>. </p> [% END %] @@ -137,7 +139,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a [% IF problems %] <ul class="issue-list-a"> -[% IF style == 'new' %] +[% IF c.cobrand.all_reports_style == 'detailed' %] [% FOREACH problem IN problems %] <li> diff --git a/templates/web/default/tokens/confirm_problem.html b/templates/web/default/tokens/confirm_problem.html index 756958380..1e3c6c535 100644 --- a/templates/web/default/tokens/confirm_problem.html +++ b/templates/web/default/tokens/confirm_problem.html @@ -1,8 +1,16 @@ -[% INCLUDE 'header.html', title => loc('Confirmation') %] +[% INCLUDE 'header.html', title = loc('Confirmation') %] <h1>[% loc('Confirmation') %]</h1> <p class="confirmed"> +[% 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>. +</p> + +<p>Your reference for this problem is [% problem.id %], please quote it in any enquiries. +[% ELSE %] [% loc('You have successfully confirmed your problem'); @@ -15,6 +23,7 @@ c.uri_for( '/report', problem.id ) ); %] +[% END %] </p> [% display_crosssell_advert( problem.user.email, problem.name ) %] diff --git a/templates/web/fixmystreet/alert/_list.html b/templates/web/fixmystreet/alert/_list.html index e9f877466..e14d394f2 100644 --- a/templates/web/fixmystreet/alert/_list.html +++ b/templates/web/fixmystreet/alert/_list.html @@ -30,7 +30,11 @@ </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 %] diff --git a/templates/web/fixmystreet/faq/faq-en-gb.html b/templates/web/fixmystreet/faq/faq-en-gb.html index 1e676d9f2..123de7c37 100755 --- a/templates/web/fixmystreet/faq/faq-en-gb.html +++ b/templates/web/fixmystreet/faq/faq-en-gb.html @@ -36,11 +36,11 @@ or clearing</strong>, such as: </dd> <dt>What isn’t FixMyStreet for?</dt> - <dd>FixMyStreet is not a way of getting in touch with [% c.cobrand.moniker == 'southampton' ? 'the' : 'your' %] council for all + <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.moniker == 'southampton' ? 'the' : 'your' %] council + 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 @@ -62,7 +62,7 @@ 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.moniker != 'southampton' %]relevant[% END %] council by email. The + <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> @@ -102,7 +102,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="/for-councils">Full details</a>.</dd> + <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 diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index 903d8c73d..c45c3c536 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -19,7 +19,7 @@ </li> <li> <h4>[% loc('Are you from a council?') %]</h4> - <p>[% loc('Would you like better integration with FixMyStreet? <a href="/for-councils">Find out about FixMyStreet for councils</a>.') %]</p> + <p>[% loc('Would you like better integration with FixMyStreet? <a href="http://www.mysociety.org/for-councils/fixmystreet/">Find out about FixMyStreet for councils</a>.') %]</p> </li> </ul> </div> diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index 1c9dfdcbf..163925dcf 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -19,6 +19,7 @@ <![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' %] [% extra_js %] diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 260ebc95a..fdfd9765c 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -60,7 +60,7 @@ [% IF c.cobrand.moniker != 'emptyhomes' %] <div class="general-sidebar-notes"> - <p>[% loc( 'Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href="/faq#privacy">privacy policy</a>' ) %]</p> + [% INCLUDE 'report/updates-sidebar-notes.html' %] </div> [% END %] @@ -182,15 +182,12 @@ [% INCLUDE 'footer.html' %] [% BLOCK name %] - [% IF problem.council == '2482' %] - [% extra_name_info = 1 %] - [% INCLUDE 'report/new/extra_name.html' %] - [% END %] + [% INCLUDE 'report/new/extra_name.html' %] <label for="form_name">[% loc('Name') %]</label> [% IF field_errors.name %] <p class='form-error'>[% field_errors.name %]</p> [% END %] - <input type="text" name="name" id="form_name" value="[% update.name || c.user.name | html %]" placeholder="[% loc('Your name') %]"> + <input type="text" [% IF problem.council == '2482' %]class="validName" [% END %]name="name" id="form_name" value="[% update.name || c.user.name | html %]" placeholder="[% loc('Your name') %]"> <div class="checkbox-group"> <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' UNLESS update.anonymous %]> diff --git a/templates/web/fixmystreet/report/new/notes.html b/templates/web/fixmystreet/report/new/notes.html index 289520be3..aa73f0694 100644 --- a/templates/web/fixmystreet/report/new/notes.html +++ b/templates/web/fixmystreet/report/new/notes.html @@ -1,7 +1,7 @@ <p>[% loc("Please note:") %]</p> <ul class="plain-list"> - <li>[% loc("We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>") %]</li> + <li>[% loc("We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>") %]</li> <li>[% loc("Please be polite, concise and to the point.") %]</li> <li>[% loc("Please do not be abusive — abusing your council devalues the service for all users.") %]</li> <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li> diff --git a/templates/web/fixmystreet/report/updates-sidebar-notes.html b/templates/web/fixmystreet/report/updates-sidebar-notes.html new file mode 100644 index 000000000..1bd07b765 --- /dev/null +++ b/templates/web/fixmystreet/report/updates-sidebar-notes.html @@ -0,0 +1,5 @@ + <p> + [% IF problem.council != '2482' OR problem.send_method_used != 'Open311' %] + [% loc( 'Please note that updates are not sent to the council.' ) %] + [% END %] + [% loc( 'Your information will only be used in accordance with our <a href="/privacy">privacy policy</a>' ) %]</p> diff --git a/templates/web/fixmystreet/static/for_councils.html b/templates/web/fixmystreet/static/for_councils.html deleted file mode 100644 index 1e1789df7..000000000 --- a/templates/web/fixmystreet/static/for_councils.html +++ /dev/null @@ -1,44 +0,0 @@ -[% INCLUDE 'header.html', title = loc('FixMyStreet for Councils'), bodyclass = 'twothirdswidthpage' %] - -<div class="sticky-sidebar"> - <aside> - <ul class="plain-list"> - <li><strong>FixMyStreet for Councils</strong></li> - <li>Summary</li> - <li><a href="/for-councils/faq">Questions and Answers</a></li> - <li><i>Email us at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a></i></li> - </ul> - </aside> -</div> - -<h1>Shift your problem reporting online: FixMyStreet for Councils</h1> - -<p>Councils everywhere are looking to move street issue reporting online, to make -savings and improve services for their residents. <strong>FixMyStreet for -Councils</strong> is explicitly designed to support the shift to digital. - -<p>FixMyStreet is the most popular online street issue reporting application in -the UK. It’s known for prioritising usability and accessibility – and people -love to use it. With very little cost and effort, your staff and your website’s -users can enjoy its simple yet powerful features. - -<p>Embedding FixMyStreet in your council’s website is simple. As a cloud-based -service, it requires no development work from your team. We will match your -site’s look and feel seamlessly, and provide robust technical support and free -training to council users. We also offer a mobile web version of the product -as well as iPhone and Android apps branded for councils. - -<p>We can also integrate FixMyStreet with your CRM or customer management system, -to ensure automatic two-way updates, saving you even more time and money. - -<img src="/cobrands/fixmystreet/barnet.png" alt="" style="float: right; padding: 0.25em; border: solid 1px #ccc; margin: 1em;"> - -<p>mySociety, the non-profit behind FixMyStreet, is a software provider to over -forty local authorities in the UK. We understand the challenges that councils -face in channel shift, and will bring our passion and expertise to support your -journey. - -<p>Have questions? Read our <a href="/for-councils/faq">Questions and Answers for Councils</a> -or get in touch at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>. - -[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/fixmystreet/static/for_councils_faq.html b/templates/web/fixmystreet/static/for_councils_faq.html deleted file mode 100644 index d45166ed1..000000000 --- a/templates/web/fixmystreet/static/for_councils_faq.html +++ /dev/null @@ -1,366 +0,0 @@ -[% INCLUDE 'header.html', title = loc('Questions and Answers :: FixMyStreet for Councils'), bodyclass = 'twothirdswidthpage' %] - -<div class="sticky-sidebar"> - <aside> - <ul class="plain-list"> - <li><strong>FixMyStreet for Councils</strong></li> - <li><a href="/for-councils">Summary</a></li> - <li>Questions and Answers <ul> - <li><a href="#general">General information</a></li> - <li><a href="#implementing">Implementing FixMyStreet for Councils</a></li> - <li><a href="#reporting">Problem reporting</a></li> - <li><a href="#best">Getting the best out of FixMyStreet</a></li> - </ul> </li> - <li><i>Email us at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a></i></li> - </ul> - </aside> -</div> - -<h1>Questions about FixMyStreet for Councils</h1> - -<h2 id="general">General information</h2> - -<dl> - -<dt>What is FixMyStreet For Councils?</dt> - -<dd> -<p>FixMyStreet is a street issue-reporting and mapping application -designed specifically for local authority websites. - -<p>It integrates seamlessly with council websites, fully reflecting their look -and feel. All copy, categories, information, reporting fields and links can be -customised to the specific needs of the council. FixMyStreet can also be -connected to a CRM or fault management system for automatic two-way updates. - -<p>The software is open source and is based on mySociety’s award-winning -FixMyStreet.com platform, which has been operating for five years. It is the -most widely-used street issue web application in the UK, sending over 5,000 -reports to local authorities each month. -</dd> - -<dt>Who built it?</dt> - -<dd> -FixMyStreet for Councils was built by mySociety Ltd, a company registered in -England and Wales, company number 03277032. mySociety Ltd is wholly owned by -the charity UK Citizens Online Democracy (charity number 1076346). All profits -are returned to the charity. -</dd> - -<dt>What are the benefits for councils?</dt> - -<dd> -<p>FixMyStreet for Councils will save you and your residents time. It will reduce duplicate reports and encourage the shift of street issue reporting to the web. - -<p>It also places a highly usable, attractive application on your website, and a very simple channel for responding to your residents if you wish to do so. - -<p>Most councils get a high volume of telephone calls to report street issues - by moving even a small proportion of that online, you can make significant savings over time. -</dd> - -<dt>Why is FixMyStreet more effective than standard reporting forms?</dt> - -<dd> -<p>As a rule, people do not enjoy filling in onerous forms on the web. They -often span several pages and require a lot of personal information – so many -people resort to calling instead. - -<p>Reporting on FixMyStreet is extremely simple and quick. The user pinpoints -the location of the problem on a map, provides a description and a photo if -they have one, and their email address. You’ll receive the email address with -the problem report, so your officers can get in touch if they need to. - -<p>Using a map as a way to locate an issue is very useful – people often don’t -know the exact nearest address, but they can show where it is on a map. - -<p>Finally, FixMyStreet allows you to comment on a report or update its status -– your update will be available for everyone interested to see on the website, -further reducing avoidable contact. -</dd> - -<dt>What is the difference between FixMyStreet.com and FixMyStreet for Councils?</dt> - -<dd> -<p>FixMyStreet.com is a national street issue reporting website that enables -anyone anywhere in Great Britain to report a problem to their council. The -reports are delivered to councils by email. - -<p>FixMyStreet for Councils is a product for council websites to enable their -residents to report issues to them. It becomes a natural part of the council’s -site, can be included in the list of top tasks, integrates council-relevant -information, and can be linked with council’s backoffice. - -<p>It uses the same software platform as the FixMyStreet.com site; issues -reported to a council on its own website are also shown on FixMyStreet.com, and -vice-versa. Read the Implementation FAQ above to learn why this approach really -works. - -</dd> - -<dt>Which councils already have FixMyStreet?</dt> - -<dd> -The London Borough of Bromley will soon be launching our upgraded FixMyStreet -for Councils product. For existing implementations, have a look at the -<a href="http://barnet.fixmystreet.com/">London Borough of Barnet’s website</a> -or <a href="http://southampton.fixmystreet.com/">Southampton City Council’s -website</a>. Meanwhile, West Berkshire Council is an example of a back-office -integration - they receive problems reported on FixMyStreet directly into their -CRM. -</dd> - -<dt>Is there a mobile version of the FixMyStreet for Councils product?</dt> - -<dd> -<p>As more and more people use their smartphones for online tasks, we make it -easy for councils to enable mobile street issue reporting. We offer two -products: -<ul> -<li>A mobile web version of FixMyStreet – this presents users with a -mobile-optimised version of a council FixMyStreet web app, and enables mobile -reporting by simply entering a URL of the council’s web reporting page in their -mobile browser -<li>Mobile Apps - some users do prefer to use downlodable apps, so we are -currently developing iPhone and Android Apps with the capability to include -council branding. If you are interested, <a -href="mailto:hello@mysociety.org">let us know</a>. -</ul> -</dd> - -<dt>What is the cost to councils?</dt> - -<dd> -<ul> -<li>The front end product costs £3,500 in year one, reducing to £2,000 per annum in future years. -<li>Web and mobile-optimised site together cost £5,500 in year one and £3,000 per annum subsequently. -<li>Web, mobile-optimised site, and iPhone and Android apps cost £9,500 in year one, then £4,000 per annum. -</ul> - -<p>We also offer fixed price for integration with Microsoft, Oracle and -Lagan CRM systems, at £5,500 in year one, then £2,000 per annum -thereafter. Integration with other CRM or back-office systems costs -£6,500 in year one, - -<p>These prices exclude VAT and assume standard FixMyStreet for councils -product - if you need further customisations please get in touch with -us for a quote. - -<p>The prices are all-inclusive, covering installation, updates, unlimited -problem reports and user training. There are no hidden fees. - -<p>There’s no commitment beyond the first 12 months, so you won’t be locked -into a lengthy contract. - -</dl> -<h2 id="implementing">Implementing FixMyStreet for Councils</h2> -<dl> - -<dt>How easy is it to implement FixMyStreet on a council website?</dt> - -<dd> -Extremely easy. Because we run FixMyStreet as a cloud service, all you need to do is to provide details of your website’s colour scheme, fonts, and any customised links or information you’d like to include. We will do all the work in setting up your issue reporting application. The implementation can take as little as a week, and requires minimal work from your web team. -</dd> - -<dt>Can we integrate FixMyStreet with the council’s CRM or fault management system?</dt> - -<dd> -<p>Absolutely. Integrating with your back-office system ensures maximum efficiencies - all reports go straight into your database. When their status changes, updates can be automatically pushed out onto your website as well as to FixMyStreet.com. We are able to integrate with any back-office system. - -<p>We understand that each council has its own processes which have evolved over time. We will work with you to find the best integration solution to ensure minimum disruption to your work, while helping make your processes simpler and more streamlined. - -<p>If you’d like us to advise on the best integration options for you, get in touch. Our advice is completely free - we are always keen to talk to councils and learn about your needs. -</dd> - -<dt>What is the technical architecture of FixMyStreet?</dt> - -<dd> -<p>FixMyStreet for councils uses the same <a -href="https://github.com/mysociety/fixmystreet">open source code base</a> and -runs on the same servers as the national FixMyStreet site. At the same time it -has been designed to allow customisation of both design and functionality. -Using the URL of the site visited the code determines which version of -FixMyStreet to display and loads the appropriate design and customisations. - -<p>If you have back end integration then new reports to your council will be -sent to your CRM through the agreed mechanism ( e.g. Open311 ). If we cannot -send a report to you then it will be put back on the queue and we will try -again later so you won’t miss any reports. -</dd> - -<dt>Why is linking FixMyStreet for Councils with the national FixMyStreet.com website a good idea?</dt> - -<dd> - -<p>There are three key benefits. First, by using the same underlying platform we can spread the cost of maintaining and hosting the system across the national site and different council users. This helps to keep prices low. Plus, we carry out all the technical maintenance and support, so you don’t need to. - -<p>Second, issues reported on FixMyStreet.com are also shown on your Council’s website, avoiding duplicate reports by different residents. - -<p>Third, the customised features on your own FixMyStreet (such as categories, information you gather from customers, additional details on issues the council is not responsible for, etc) will also be reflected on FixMyStreet.com. So wherever your residents report issues, they will get the right features and information from the council. -</dd> - -<dt>Do you offer training?</dt> - -<dd> -Yes. We offer a free two-hour remote training session to your users. If your location is within two hours’ travel from one of our FixMyStreet team members, we will provide training in person. -</dd> - -<dt>What level of support do you provide after implementation?</dt> - -<dd> -<p>We will provide technical support, address any questions, and make tweaks to your system if required. We will also go out of our way to help you with non-technical issues based on our significant experience with online problem reporting. - -<p>Throughout our contract with you, we will always be available by email or on the phone, and will get back to you quickly. - -</dl> -<h2 id="reporting">Problem reporting</h2> -<dl> - -<dt>Can we customise report categories and information requested?</dt> - -<dd> -<p>Yes. You can add the categories most relevant to your council, and remove ones that are not. Your customised categories will appear on both your website’s FixMyStreet implementation, and on the national FixMystreet.com website. - -<p>You can also customise information requested for each issue type - for example, Southampton council asks its customers to report the approximate pothole size, to help prioritise its work. -</dd> - -<dt>How can we deal with issues that the council is not responsible for?</dt> - -<dd> -Most councils already get residents phoning up or emailing them about problems not within their remit. FixMyStreet can help reduce this in two ways: -We can include the most commonly misreported issues in the categories list so when a users selects these, we can give them alternative contact information. If there are known geographical areas that council is not responsible for, we can alert users to that when they click on the map, provided you have given us this information. -Alternatively, if you have contact details in relevant organisations, we can instead email reports to them, while telling the user that these are not the council’s responsibility. -</dd> - -<dt>How are reports delivered to the council?</dt> - -<dd> -<p>If your FixMyStreet is not integrated with your CRM or back-office system, you will receive reports by email to email addresses that you specify. Different type of problems can be sent to different addresses if you wish. - -<p>With back-office integration, reports will go straight into your CRM or fault management system. -</dd> - -<dt>What information is provided in a problem report?</dt> - -<dd> -<p>You will receive the following information: -<ul> -<li>Issue category -<li>Precise location reported (in both latitude/longitude and easting/northing) -<li>Subject and issue description (we encourage users to give as much detail as possible) -<li>Link to a photo of the problem if the user has added one (we don’t send the actual photos so that we don’t clog your system) -<li>The user’s verified email address and phone number if given, so you can contact them directly if you wish -<li>A link to the issue on FixMyStreet for you to update the issue if required. -</ul> -</dd> - -<dt>How precise is location information provided in FixMyStreet?</dt> - -<dd> -<p>Very. The user clicks on a map that includes useful information for -reporting, such as building positions and footpaths, so they can tell you the -location as precisely as they can. - -<p>This approach also helps capture superior location data even when the user -does not know the exact address. - -<p>We will send you the co-ordinates for the point clicked on the map, as well -as the nearest street address as an additional data point. You can also view -the map directly on the issue report page. -</dd> - -<dt>Can we reflect more granular report statuses than just open and fixed?</dt> - -<dd> -Yes. As a client council you get a selection of problem statuses, including: -Investigating, Planned, In Progress, Fixed and Closed. -</dd> - -</dl> -<h2 id="best">Getting the best out of FixMyStreet</h2> -<dl> - -<dt>Can we add photos showing that council has dealt with an issue?</dt> - -<dd> -Yes - you can easily post a photo as an update to a report on your website. These will also be shown on the national FixMyStreet.com site. -</dd> - -<dt>What can we do to help shift users to online reporting instead of calling us up?</dt> - -<dd> -Online reporting is better for you and your residents, as it’s quick, effective and cheap. Good technology will certainly encourage the shift, but to make it fully effective you could do a a few things to help. -Direct residents to report issues on your website when they are in the telephone queue -When someone reports an issue to your call centre, tell them that next time they can do it much quicker online -Encourage council employees or other relevant organisations to report issues online -Respond to problem reports online, so that your residents know you engage well through this channel. -</dd> - -<dt>How can a council respond to issue reports?</dt> - -<dd> -<p>If you choose the back-office integration option, when an issue status -changes in your CRM or fault management system, it can also automatically -update on both your website and the national FixMyStreet website. This assumes -that your system can support automatic updates (most systems can). - -<p>If your back-office is not integrated, you can still easily respond by -changing the status manually on the website, or adding a few words of -commentary. This simple process is much quicker than a telephone call or email. -</dd> - -<dt>How can we contact the person submitting the report if we need more information?</dt> - -<dd> -Our software encourages users to submit as much information as possible, along with photographs. If you do need additional details, you can either post your question as an update to the issue online, or email the user directly (you will get their email address with the issue report). -</dd> - -<dt>We are unable to fix every problem, in particular in the current budget environment. How do we deal with this?</dt> - -<dd> -<p>Whether reported online or not, there are some issues that a council will -decide not to fix because it needs to prioritise more important problems. - -<p>Our online reporting application gives you a direct channel to explain to -your residents why certain problems cannot be addressed. This will lead to a -more open, constructive relationship. This may be a big culture change - we are -happy to support you with our experience in this area. - -<p>When deciding not to deal with a problem, you can close it so that it does -not show as an open problem. -</dd> - -<dt>We are worried about being swamped with high volume of online reports. What can we do?</dt> - -<dd> -While the volume of online reporting is likely to increase (a good thing, as it -replaces phone calls and alerts you to issues you didn’t know about), it -usually happens gradually, giving you plenty of time to adjust. We can stage -the introduction of your new reporting app to make the process even smoother. -</dd> - -<dt>Does FixMyStreet for Councils offer reporting functionality?</dt> - -<dd> -<p>We are currently working on a new reporting dashboard for councils, -accessible through a separate council log-in. This will have detailed reporting -on issue categories, timelines, statuses and help you identify emerging -hotspots. - -<p>Any new council implementation from April 2012 will have this new -functionality. Please get in touch if you’d like more detail. -</dd> - -<dt>I’d like to discuss options for my council. What do I do?</dt> - -<dd> -<p>Just drop us a line to <a -href="mailto:hello@mysociety.org">hello@mysociety.org</a> and we will get back -to you as soon as possible. - -<p>We will be happy to advise you on the options, and recommend an -implementation approach to fit your needs based on our experience. -</dd> - -</dl> - -[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/fixmystreet/static/privacy.html b/templates/web/fixmystreet/static/privacy.html index 933afe1e5..92e096ef4 100755 --- a/templates/web/fixmystreet/static/privacy.html +++ b/templates/web/fixmystreet/static/privacy.html @@ -30,11 +30,15 @@ other companies, you can adjust your usage or install opt-out browser plugins. <dt>Who gets to see my email address?</dt> <dd>If you submit a problem, we pass on your details, and details of the problem, to the council contact or contacts responsible for the -area where you located the problem. Other than the council, who obviously get your +area where you located the problem, or other relevant body (for example, in +most of London we send reports via the central London Report-It service, who +may also publish the public details of your report). Other than the council, who obviously get your email address, only people we authorise to view the FixMyStreet administration interface will be able to see your email address and they will never use it for anything other than to help administer FixMyStreet. Similarly with email addresses from updates. We will never give or sell your email address to anyone else, -unless we are obliged to by law. Your name will not be published anywhere unless you let us.</dd> +unless we are obliged to by law. Your name, given in the name field, will not +be published anywhere unless you let us (if you give your name elsewhere, e.g. +in the public details section, it will be publicly available).</dd> <dt>Will you send nasty, brutish spam to my email address?</dt> <dd>Never. We will email you if someone leaves an update on a problem you’ve reported, and send you a questionnaire email four weeks |