diff options
Diffstat (limited to 'templates/web/fixmystreet.com')
16 files changed, 53 insertions, 126 deletions
diff --git a/templates/web/fixmystreet.com/about/council.html b/templates/web/fixmystreet.com/about/council.html index 6814f70c3..5abbbb2ef 100644 --- a/templates/web/fixmystreet.com/about/council.html +++ b/templates/web/fixmystreet.com/about/council.html @@ -27,7 +27,7 @@ <div class="councils-features__grid"> <div class="councils-features__feature"> <div class="councils-features__thumb councils-features__thumb--excellence"></div> - <h3>Digital Excellence</h3> + <h3>Digital excellence</h3> <p>FixMyStreet was co-designed with council insiders. We made it into the most user-centred, accessible approach to non-emergency issue reporting available today. And now it’s the leader in its class.</p> </div> <div class="councils-features__feature"> @@ -114,7 +114,7 @@ <h2>Works with</h2> <div class="councils-compatibility__grid"> <div class="councils-compatibility__item"> - <h3>Customer Management</h3> + <h3>Customer management</h3> <ul> <li><a href="http://www.kana.com/lagan-crm/customer-experience-management">Lagan</a></li> <li><a href="https://www.microsoft.com/en-gb/dynamics/default.aspx">Microsoft Dynamics</a></li> @@ -149,12 +149,12 @@ <div class="pricing-table"> <div class="pricing-table__item"> - <h3>Simple fault reporting</h3> + <h3>Basic FixMyStreet integration</h3> <p class="pricing-table__item__price"><strong>£7,500 per year</strong></p> <p>The award-winning FixMyStreet experience seamlessly integrated with your site. A responsive web application for reporting, viewing and discussing problems - branded to match your site’s styles and templates. Use FixMyStreet for Councils to keep your residents up to date and route problems by email to the correct individual or team. The internal dashboard eanbles you to manage performance.</p> </div> <div class="pricing-table__item"> - <h3>Case‐management Integration</h3> + <h3>Case‐management integration</h3> <p class="pricing-table__item__price"><strong>£15,000 per year</strong></p> <p>Our award-winning reporting solution – your existing processes and systems. We’ll integrate FixMyStreet into your customer, case or asset management system ensuring that there’s minimal impact on your organisation. Accept reports, automatically publish updates and reports from other channels via your existing tools, directly onto FixMyStreet.</p> <p>Supported services include: Confirm, Mayrise, MS Dynamics and Exor. If you use an alternative service or your own internal system we’ll scope and implement additional support via our Specialist Cloud Service.</p> @@ -180,14 +180,14 @@ <h3>Bring your own, or we can provide</h3> <div class="pricing-accordion accordion"> <div class="accordion-item"> - <a href="#" class="accordion-switch accordion-switch--closed"><h4>Custom Map Tiles</h4></a> + <a href="#" class="accordion-switch accordion-switch--closed"><h4>Custom map tiles</h4></a> <div class="accordion-content"> <p class="extra-pricing__price">£1,500 per year</p> <p class="extra-pricing__desc">FixMyStreet comes with OpenStreetMap/Bing geographical base maps as standard. But for a completely unique look, or to key in with your existing mapping visuals, we can support the industry standard WMS maps of your choice.</p> </div> </div> <div class="accordion-item"> - <a href="#" class="accordion-switch accordion-switch--closed"><h4>Custom Geocoding</h4></a> + <a href="#" class="accordion-switch accordion-switch--closed"><h4>Custom geocoding</h4></a> <div class="accordion-content"> <p class="extra-pricing__price">£1,500 per year</p> <p class="extra-pricing__desc">Transforming an address into a point on a map: it’s called geocoding, and we utilise Bing, OpenStreetMap and Google’s services as standard. But if you have your own geocoding system, we can integrate that to ensure a precise location for a given postcode, address or place name.</p> @@ -196,21 +196,21 @@ <div class="accordion-item"> <a href="#" class="accordion-switch accordion-switch--closed"><h4>Asset locations</h4></a> <div class="accordion-content"> - <p class="extra-pricing__price">£3,500 per year or included as standard within our case management service</p> + <p class="extra-pricing__price">£3,500 per year or included as standard within our top‐to‐bottom case‐management service.</p> <p class="extra-pricing__desc">Show your residents the locations, identifiers and status of assets right on the map — all they have to do is pick the right one. Compatible with any industry standard WFS or WMS service.</p> </div> </div> <div class="accordion-item"> <a href="#" class="accordion-switch accordion-switch--closed"><h4>Adopted roads</h4></a> <div class="accordion-content"> - <p class="extra-pricing__price">£3,500 per year or included as standard within our case management service.</p> + <p class="extra-pricing__price">£3,500 per year or included as standard within our top‐to‐bottom case‐management service.</p> <p class="extra-pricing__desc">Ensure that you only receive reports for roads that you actually manage. Highlight adopted roads and private estates at the point of report creation, saving valuable time, expense and irritation. Compatible with any industry standard WFS or WMS service.</p> </div> </div> <div class="accordion-item"> <a href="#" class="accordion-switch accordion-switch--closed"><h4>Planned works</h4></a> <div class="accordion-content"> - <p class="extra-pricing__price">£3,000 per year or included as standard within our case management service.</p> + <p class="extra-pricing__price">£3,000 per year or included as standard within our top‐to‐bottom case‐management service.</p> <p class="extra-pricing__desc">Publish your planned works alongside reports to keep residents informed and lower the incidence of unnecessary reporting. Support for Elgin’s roadworks.org or any industry standard WFS or WMS service.</p> </div> </div> @@ -223,10 +223,23 @@ <div class="council-order" id="order"> <div class="councils-content-wrapper"> - <h2>Order</h2> + <h2>Request a free demo</h2> <form action="/contact/submit" method="post"> <div class="council-order__form"> <div class="form-group"> + <label for="product">We are interested in…</label> + <span class="required">required</span> + <div class="radio-as-buttons"> + <label><input name="extra.product" id="product" type="radio" value="simple-fault-reporting" required>Basic FixMyStreet integration <span class="council-order__form__product__price">£7,500 per year</span></label> + <label><input name="extra.product" id="product" type="radio" value="case-management-integration">Case-management integration <span class="council-order__form__product__price">£15,000 per year</span></label> + <label><input name="extra.product" id="product" type="radio" value="top-to-bottom-case-management">Top-to-bottom case-management <span class="council-order__form__product__price">£35,000 per year</span></label> + </div> + </div> + <div class="form-group"> + <label for="message">A little more about your requirements</label> + <textarea name="message" id="message" required> </textarea> + </div> + <div class="form-group"> <label for="name">Name</label> <span class="required">required</span> <input type="text" name="name" id="name" required> @@ -245,20 +258,8 @@ <label for="phone">Contact telephone</label> <input type="tel" name="extra.phone" id="phone"> </div> - <div class="form-group"> - <label for="product">Product</label> - <span class="required">required</span> - <div class="radio-as-buttons"> - <label><input name="extra.product" id="product" type="radio" value="simple-fault-reporting" required>Simple fault reporting</label> - <label><input name="extra.product" id="product" type="radio" value="case-management-integration">Case-management integration</label> - <label><input name="extra.product" id="product" type="radio" value="top-to-bottom-case-management">Top-to-bottom case-management</label> - </div> - </div> - <div class="form-group"> - <label for="message">Message</label> - <textarea name="message" id="message" required> </textarea> - </div> <div class="form-group submit-group"> + <input type="hidden" name="extra.referer" value="[% c.req.headers.referer | html %]"> <input type="hidden" name="subject" value="Councils submission"> <input type="hidden" name="recipient" value="enquiries"> <input type="hidden" name="dest" value="from_council"> diff --git a/templates/web/fixmystreet.com/about/faq-en-gb.html b/templates/web/fixmystreet.com/about/faq-en-gb.html index 496282341..0bf55742b 100755 --- a/templates/web/fixmystreet.com/about/faq-en-gb.html +++ b/templates/web/fixmystreet.com/about/faq-en-gb.html @@ -318,8 +318,8 @@ correspondence to you – or if you only have an auto-response, you may be able to find further contact details there. <p>If you still have no joy, we suggest starting a new FixMyStreet report. You may also like to use another useful mySociety website, <a -href="https://www.writetothem.com/">WriteToThem.com</a>, to contact your local -councillors and ask them to help. +href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=static_links&utm_medium=link&utm_content=help+what_now">WriteToThem</a>, +to contact your local councillors and ask them to help. </dd> <dt>Someone has marked my problem was fixed, but it isn't</dt> diff --git a/templates/web/fixmystreet.com/about/posters.html b/templates/web/fixmystreet.com/about/posters.html index 1a9a4400c..c4cf16cd4 100644 --- a/templates/web/fixmystreet.com/about/posters.html +++ b/templates/web/fixmystreet.com/about/posters.html @@ -1,6 +1,6 @@ -[% extra_js = BLOCK %] - <script src="[% version('/cobrands/fixmystreet.com/posters.js') %]"></script> -[% END %] +[% extra_js = [ + version('/cobrands/fixmystreet.com/posters.js') +] %] [% extra_css = BLOCK %] <link rel="stylesheet" href="[% version('/cobrands/fixmystreet.com/posters.css') %]"> [% END %] diff --git a/templates/web/fixmystreet.com/around/_report_banner.html b/templates/web/fixmystreet.com/around/_report_banner.html deleted file mode 100755 index fb2134020..000000000 --- a/templates/web/fixmystreet.com/around/_report_banner.html +++ /dev/null @@ -1,10 +0,0 @@ -[%# Same as parent, with variant green banner text %] -<h1 class="big-green-banner variant1"> - Click map to request a fix -</h1> -<h1 class="big-green-banner variant0"> - [% loc( 'Click map to report a problem' ) %] -</h1> -<a id="skip-this-step" href="[% url_skip %]" rel="nofollow"> - [% loc("Can't see the map? <em>Skip this step</em>") %] -</a> diff --git a/templates/web/fixmystreet.com/around/intro.html b/templates/web/fixmystreet.com/around/intro.html deleted file mode 100644 index 5b756cd31..000000000 --- a/templates/web/fixmystreet.com/around/intro.html +++ /dev/null @@ -1,9 +0,0 @@ -[%# Same as parent, with variant heading text %] -<div class="variant1"> - <h1>Get things fixed in your local community</h1> - <h2>(like blocked pavements, parks and playgrounds in need of maintenance)</h2> -</div> -<div class="variant0"> - <h1>[% loc('Report, view, or discuss local problems') %]</h1> - <h2>[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]</h2> -</div> diff --git a/templates/web/fixmystreet.com/contact/who.html b/templates/web/fixmystreet.com/contact/who.html index cdfc4eff8..5fad05dd2 100644 --- a/templates/web/fixmystreet.com/contact/who.html +++ b/templates/web/fixmystreet.com/contact/who.html @@ -44,7 +44,7 @@ <p> <strong>If you're not having any luck getting your community problems fixed</strong>, you could try contacting your local councillor, using another useful mySociety site: - <a href="https://www.writetothem.com/">https://www.writetothem.com/</a>. + <a href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=contact_workflow_links&utm_medium=link&utm_content=contact+not_fixed">WriteToThem</a>. </p> [% END %] diff --git a/templates/web/fixmystreet.com/footer_extra.html b/templates/web/fixmystreet.com/footer_extra.html index d4e7b38a3..e16198bb1 100644 --- a/templates/web/fixmystreet.com/footer_extra.html +++ b/templates/web/fixmystreet.com/footer_extra.html @@ -31,7 +31,7 @@ %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li> </ul> <ul> - <li><a href="https://www.fixmystreet.com/council">FixMyStreet for Councils</a></li> + <li><a href="/about/council">FixMyStreet for Councils</a></li> <li><[% IF c.req.uri.path == '/posters' %]span[% ELSE %]a href="[% base %]/posters"[% END %]>[% loc("FixMyStreet Goodies") %]</[% c.req.uri.path == '/posters' ? 'span' : 'a' %]></li> <li><[% IF c.req.uri.path == '/contact' %]span[% ELSE %]a href="[% base %]/contact"[% END diff --git a/templates/web/fixmystreet.com/footer_extra_js.html b/templates/web/fixmystreet.com/footer_extra_js.html index 0d1cca04d..d03aa8657 100644 --- a/templates/web/fixmystreet.com/footer_extra_js.html +++ b/templates/web/fixmystreet.com/footer_extra_js.html @@ -1,3 +1,5 @@ -<script src="[% version('/js/OpenLayers.Projection.OrdnanceSurvey.js') %]"></script> -<script src="[% version('/js/jquery.cookie.min.js') %]"></script> -<script src="[% version('/cobrands/fixmystreet.com/js.js') %]"></script> +[% scripts.push( + version('/js/OpenLayers.Projection.OrdnanceSurvey.js'), + version('/js/jquery.cookie.min.js'), + version('/cobrands/fixmystreet.com/js.js'), +) %] diff --git a/templates/web/fixmystreet.com/front/footer-marketing.html b/templates/web/fixmystreet.com/front/footer-marketing.html index 74516b8be..2095b51c5 100644 --- a/templates/web/fixmystreet.com/front/footer-marketing.html +++ b/templates/web/fixmystreet.com/front/footer-marketing.html @@ -7,7 +7,7 @@ </li> <li> <h4>[% loc('Are you from a council?') %]</h4> - <p>[% loc('Would you like better integration with FixMyStreet? <a href="https://www.fixmystreet.com/council">Find out about FixMyStreet for councils</a>.') %]</p> + <p>[% loc('Would you like better integration with FixMyStreet? <a href="/about/council">Find out about FixMyStreet for councils</a>.') %]</p> </li> </ul> </div> diff --git a/templates/web/fixmystreet.com/front/javascript.html b/templates/web/fixmystreet.com/front/javascript.html index ac9faa309..baf7ebb64 100644 --- a/templates/web/fixmystreet.com/front/javascript.html +++ b/templates/web/fixmystreet.com/front/javascript.html @@ -1,7 +1,12 @@ -<script src="[% version('/js/yepnope.js') %]"></script> -<script id="script_front" src="[% version('/cobrands/fixmystreet/front.js') %]" - data-scripts=" - [%~ version('/js/OpenLayers/OpenLayers.fixmystreet.js') %], - [%~ version('/js/map-OpenLayers.js') %], - [%~ version('/js/map-bing-ol.js') %], - [%~ version('/js/map-fms.js') %]"></script> +[% +map_js = [ + version('/js/yepnope.js'), + [ version('/cobrands/fixmystreet/front.js'), { + id = "script_front", + 'data-scripts' = version('/js/OpenLayers/OpenLayers.fixmystreet.js') _ ',' _ + version('/js/map-OpenLayers.js') _ ',' _ + version('/js/map-bing-ol.js') _ ',' _ + version('/js/map-fms.js') + } ], +] +%] diff --git a/templates/web/fixmystreet.com/header_extra.html b/templates/web/fixmystreet.com/header_extra.html index 4ea87a5e1..dc0f86693 100644 --- a/templates/web/fixmystreet.com/header_extra.html +++ b/templates/web/fixmystreet.com/header_extra.html @@ -16,22 +16,4 @@ })(document); </script> -[%# We are conducting an A/B experiment %] -[% IF c.config.BASE_URL == "https://www.fixmystreet.com" AND not admin AND NOT c.req.header('User-Agent').match('Google Page Speed') %] -<script src="//www.google-analytics.com/cx/api.js?experiment=ZwMlZkAhSbK_tP_QG64QrQ"></script> -<script nonce="[% csp_nonce %]"> -var variation = typeof cxApi !== "undefined" ? cxApi.chooseVariation() : 0, - docElement = document.documentElement, - className = docElement.className; -if (!/about\/council/.test(location.pathname)) { - docElement.className = className + ' variant' + variation; -} -</script> -[% END %] -<style> -html .variant1 { display: none !important; } -html.variant1 .variant0 { display: none !important; } -html.variant1 .variant1 { display: block !important; } -</style> - [% INCLUDE 'tracking_code.html' %] diff --git a/templates/web/fixmystreet.com/questionnaire/completed-open.html b/templates/web/fixmystreet.com/questionnaire/completed-open.html index 073fb0438..f10d5d266 100644 --- a/templates/web/fixmystreet.com/questionnaire/completed-open.html +++ b/templates/web/fixmystreet.com/questionnaire/completed-open.html @@ -13,7 +13,7 @@ </p> <p> - You can do this on <a href="https://www.writetothem.com/">WriteToThem</a>, another + You can do this on <a href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=workflow_links&utm_medium=link&utm_content=completed+unfixed">WriteToThem</a>, another useful mySociety website. </p> [% END %] diff --git a/templates/web/fixmystreet.com/report/banner.html b/templates/web/fixmystreet.com/report/banner.html index 35d7be179..6fd74a7fe 100644 --- a/templates/web/fixmystreet.com/report/banner.html +++ b/templates/web/fixmystreet.com/report/banner.html @@ -20,8 +20,7 @@ [% INCLUDE banner, id = 'unknown', text = loc('Unknown') %] [% END %] - [% states = [ 'investigating', 'in progress', 'planned', 'action scheduled' ]; - IF states.grep(problem.state).size %] + [% IF problem.is_in_progress %] [% INCLUDE banner, id = 'progress', text = loc('In progress') %] [% END %] diff --git a/templates/web/fixmystreet.com/report/new/extra_name.html b/templates/web/fixmystreet.com/report/new/extra_name.html deleted file mode 100644 index dbd971d74..000000000 --- a/templates/web/fixmystreet.com/report/new/extra_name.html +++ /dev/null @@ -1,42 +0,0 @@ -[%# Same as parent, with added gender question %] - -[% IF (page == 'around' OR page == 'new') AND c.cobrand.ask_gender_question %] -<p> -We’re conducting research to make sure our site is good for everyone; -please help us out by providing your gender. <em>This will not be -shared with the council or displayed publicly.</em> -</p> - -[% SET gender = report.get_extra_metadata('gender') %] -<p class="segmented-control segmented-control--radio" style="font-size: 80%"> - <input type="radio" name="gender" id="gender_female" value="female"[% ' checked' IF gender == 'female' %]> - <label class="btn" for="gender_female">Female</label> - <input type="radio" name="gender" id="gender_male" value="male"[% ' checked' IF gender == 'male' %]> - <label class="btn" for="gender_male">Male</label> - <input type="radio" name="gender" id="gender_other" value="other"[% ' checked' IF gender == 'other' %]> - <label class="btn" for="gender_other">Other</label> - <input type="radio" name="gender" id="gender_unknown" value="unknown"[% ' checked' IF gender == 'unknown' %]> - <label class="btn" for="gender_unknown">Prefer not to say</label> -</p> -[% END %] - -<input type="hidden" name="variant" value="0"> - -[% IF extra_name_info %] -<label for="form_fms_extra_title">Title</label> -[% IF field_errors.fms_extra_title %] - <p class='form-error'>[% field_errors.fms_extra_title %]</p> -[% END %] -[% 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-control form-focus-trigger required js-form-name" id="form_fms_extra_title" - name="fms_extra_title"> - <option></option> - <option value="MR"[% ' selected' IF title == 'MR' %]>Mr</option> - <option value="MISS"[% ' selected' IF title == 'MISS' %]>Miss</option> - <option value="MRS"[% ' selected' IF title == 'MRS' %]>Mrs</option> - <option value="MS"[% ' selected' IF title == 'MS' %]>Ms</option> - <option value="DR"[% ' selected' IF title == 'DR' %]>Dr</option> -</select> -[% END %] diff --git a/templates/web/fixmystreet.com/reports/_extras.html b/templates/web/fixmystreet.com/reports/_extras.html index 6fa067d1c..77c2cecdf 100755 --- a/templates/web/fixmystreet.com/reports/_extras.html +++ b/templates/web/fixmystreet.com/reports/_extras.html @@ -4,7 +4,6 @@ 'Bromley Council' = 'fix.bromley.gov.uk' 'Bristol City Council' = 'fixmystreet.bristol.gov.uk' 'East Hertfordshire District Council' = 'fixmystreet.eastherts.gov.uk' - 'Harrogate Borough Council' = 'harrogate.fixmystreet.com' 'Hart District Council' = 'hart.fixmystreet.com' 'Oxfordshire County Council' = 'fixmystreet.oxfordshire.gov.uk' 'Stevenage Borough Council' = 'stevenage.fixmystreet.com', @@ -26,7 +25,7 @@ <td class="title" colspan="6" style="padding-top:0"> <small title="This council's online reporting is powered by FixMyStreet">(includes reports from <a href="http[% secure.$site %]://[% site %]">[% site %]</a> using - <a href="https://www.fixmystreet.com/council">FixMyStreet for Councils</a>)</small> + <a href="/about/council">FixMyStreet for Councils</a>)</small> </td> </tr> [% END %] diff --git a/templates/web/fixmystreet.com/static/unresponsive.html b/templates/web/fixmystreet.com/static/unresponsive.html index be8a3c6e1..8014ab8e1 100644 --- a/templates/web/fixmystreet.com/static/unresponsive.html +++ b/templates/web/fixmystreet.com/static/unresponsive.html @@ -26,7 +26,7 @@ <h2>If you’d prefer to use FixMyStreet next time:</h2> - <a href="https://www.writetothem.com/" class="unresponsive-council-cta"> + <a href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=workflow_links&utm_medium=link&utm_content=unresponsive_council+cta" class="unresponsive-council-cta"> <strong>Write to your MP or local councillors</strong> to let them know this isn’t okay </a> |