diff options
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/FixMyStreet.pm | 9 | ||||
| -rw-r--r-- | templates/web/default/questionnaire/completed-open.html | 6 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/contact/who.html | 75 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/footer-nav.html | 22 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/front/international_banner.html | 13 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/header_extra.html (renamed from templates/web/fixmystreet/header_extra.html) | 3 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/questionnaire/completed-open.html (renamed from templates/web/fixmystreet/questionnaire/completed-open.html) | 15 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/tracking_code.html (renamed from templates/web/fixmystreet/tracking_code.html) | 0 | ||||
| -rw-r--r-- | templates/web/fixmystreet/contact/who.html | 77 | ||||
| -rw-r--r-- | templates/web/fixmystreet/footer.html | 27 | ||||
| -rw-r--r-- | templates/web/fixmystreet/front/international_banner.html | 15 | ||||
| -rw-r--r-- | templates/web/fixmystreet/header.html | 1 |
12 files changed, 129 insertions, 134 deletions
diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm index 36f381085..7a0f868d8 100644 --- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm +++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm @@ -4,6 +4,15 @@ use mySociety::Gaze; use constant COUNCIL_ID_BROMLEY => 2482; +# Special extra +sub path_to_web_templates { + my $self = shift; + return [ + FixMyStreet->path_to( 'templates/web/fixmystreet.com' )->stringify, + FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify + ]; +} + # FixMyStreet should return all cobrands sub restriction { return {}; diff --git a/templates/web/default/questionnaire/completed-open.html b/templates/web/default/questionnaire/completed-open.html index 06e17cc0b..c860b7341 100644 --- a/templates/web/default/questionnaire/completed-open.html +++ b/templates/web/default/questionnaire/completed-open.html @@ -4,8 +4,8 @@ Thank you very much for filling in our questionnaire. </p> [% ELSE %] [% loc('<p style="font-size:150%">We’re sorry to hear that. We have two -suggestions: why not try writing to your local representative or, if it’s -a problem that could be fixed by local people working together, why not -<a href="http://www.pledgebank.com/new">make and publicise a pledge</a>? +suggestions: why not try writing to your local representatives or, if +it’s a problem that could be fixed by local people working together, why +not <a href="http://www.pledgebank.com/new">make and publicise a pledge</a>? </p>') %] [% END %] diff --git a/templates/web/fixmystreet.com/contact/who.html b/templates/web/fixmystreet.com/contact/who.html new file mode 100644 index 000000000..7084c17dc --- /dev/null +++ b/templates/web/fixmystreet.com/contact/who.html @@ -0,0 +1,75 @@ +<h4>Topic:</h4> + +[% IF field_errors.dest %] +<div class="form-error">[% field_errors.dest %]</div> +[% ELSIF field_errors.not_for_us %] + <div class="form-error">You can only contact the team behind FixMyStreet using our contact form</div> + + [% IF dest == 'council' %] + <p> + We’re not the council: we just run this website which helps you report issues + to them. + </p> + + <p> + <strong>If you want to report a street problem</strong>, return to the + FixMyStreet homepage and enter your postcode. You can then make a report. + We'll send it to your council, and publish it on FixMyStreet. + </p> + + <p> + <strong>If your problem is not a street issue</strong>, or is <strong>not + suitable for publication on the site</strong>, then FixMyStreet isn't the + right place for it. You should find contact details on your council's own + website. + </p> + [% ELSIF dest == 'update' %] + <p> + FixMyStreet is great for reporting problems, but we don't fix them - your + council oversees that. + </p> + + <p> + <strong>If you'd like to chase your report</strong>, please reply directly + to any response - or auto-reply - that your council sent you. Check that + it has your council's email address on it so that it goes to the right place. + </p> + + <p> + It's a good idea to include the URL [web address] of your original FixMyStreet + report. + </p> + + <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>. + </p> + + [% END %] +[% END %] + +<div class="checkbox-group"> + <input name="dest" id="dest_help" type="radio" value="help" class="required"[% IF dest AND dest == 'help' %] checked[% END %]> + <label class="inline" for="dest_help">I need help using the site</label> +</div> + +<div class="checkbox-group"> + <input name="dest" id="dest_feeback" type="radio" value="feeback" class="required"[% IF dest AND dest == 'feeback' %] checked[% END %]> + <label class="inline" for="dest_feeback">I have feedback about the site</label> +</div> + +<div class="checkbox-group"> + <input name="dest" id="dest_from_council" type="radio" value="from_council" class="required"[% IF dest AND dest == 'from_council' %] checked[% END %]> + <label class="inline" for="dest_from_council">I am from a council and I have a question for the FixMyStreet team</label> +</div> + +<div class="checkbox-group"> + <input name="dest" id="dest_council" type="radio" value="council" class="required"[% IF dest AND dest == 'council' %] checked[% END %]> + <label class="inline" for="dest_council">I want to report a street problem</label> +</div> + +<div class="checkbox-group"> + <input name="dest" id="dest_update" type="radio" value="update"[% IF dest AND dest == 'update' %] checked[% END %]> + <label class="inline" for="dest_update">My street problem hasn't been fixed</label> +</div> diff --git a/templates/web/fixmystreet.com/footer-nav.html b/templates/web/fixmystreet.com/footer-nav.html new file mode 100644 index 000000000..204b80777 --- /dev/null +++ b/templates/web/fixmystreet.com/footer-nav.html @@ -0,0 +1,22 @@ +<div id="footer-nav"> + <div class="tablewrapper"> + <ul id="footer-main-nav"> + <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' %]span[% ELSE %]a href="/reports"[% 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 == '/contact' %]span[% ELSE %]a href="/contact"[% END + %]>[% loc("Contact") %]</[% c.req.uri.path == '/contact' ? 'span' : 'a' %]></li> + </ul> + <ul id="footer-help-nav"> + <li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/privacy' %]span[% ELSE %]a href="/privacy"[% END + %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li> + </ul> + </div> +</div> diff --git a/templates/web/fixmystreet.com/front/international_banner.html b/templates/web/fixmystreet.com/front/international_banner.html new file mode 100644 index 000000000..4e3a2fda6 --- /dev/null +++ b/templates/web/fixmystreet.com/front/international_banner.html @@ -0,0 +1,13 @@ +[% country = c.cobrand.get_country_for_ip_address(c.req.address) -%] +[%- IF country AND country != 'GB' -%] +<div id="country_banner"> + <a href="#" id="message_close">Close</a> + <p id="international_message"> + <span id="message"> + This site is for reporting <strong>problems in the UK</strong>. There are FixMyStreet sites + <a href="http://www.fixmystreet.org/sites/">all over the world</a>, or you + could set up your own using the <a href="http://www.fixmystreet.org/">FixMyStreet Platform</a>. + </span> + </p> +</div> +[%- END -%] diff --git a/templates/web/fixmystreet/header_extra.html b/templates/web/fixmystreet.com/header_extra.html index 8242c0479..f31d846f3 100644 --- a/templates/web/fixmystreet/header_extra.html +++ b/templates/web/fixmystreet.com/header_extra.html @@ -1,3 +1,2 @@ -[% IF c.cobrand.moniker == 'fixmystreet' %] <script src="[% start %][% version('/js/jquery.cookie.min.js') %]" type="text/javascript" charset="utf-8"></script> -[% END %] +[% INCLUDE 'tracking_code.html' %] diff --git a/templates/web/fixmystreet/questionnaire/completed-open.html b/templates/web/fixmystreet.com/questionnaire/completed-open.html index 0726f5fc7..df8e2d271 100644 --- a/templates/web/fixmystreet/questionnaire/completed-open.html +++ b/templates/web/fixmystreet.com/questionnaire/completed-open.html @@ -1,9 +1,8 @@ [% IF c.cobrand.is_council %] -<p style="font-size: 150%"> -Thank you very much for filling in our questionnaire. -</p> + <p style="font-size: 150%"> + Thank you very much for filling in our questionnaire. + </p> [% ELSE %] - [% IF c.cobrand.moniker == 'fixmystreet' %] <p style="font-size:150%">We’re sorry to hear that your problem hasn't been fixed.</p> <p> @@ -21,12 +20,4 @@ Thank you very much for filling in our questionnaire. You can do this on <a href="https://www.writetothem.com/">https://www.writetothem.com/</a>, another useful mySociety website. </p> - [% ELSE %] -[% loc('<p style="font-size:150%">We’re sorry to hear that. We have two -suggestions: why not try <a href="https://www.writetothem.com/">writing direct -to your councillor(s)</a> or, if it’s a problem that could be fixed by -local people working together, why not -<a href="http://www.pledgebank.com/new">make and publicise a pledge</a>? -</p>' ) %] - [% END %] [% END %] diff --git a/templates/web/fixmystreet/tracking_code.html b/templates/web/fixmystreet.com/tracking_code.html index 0453e1a22..0453e1a22 100644 --- a/templates/web/fixmystreet/tracking_code.html +++ b/templates/web/fixmystreet.com/tracking_code.html diff --git a/templates/web/fixmystreet/contact/who.html b/templates/web/fixmystreet/contact/who.html deleted file mode 100644 index 49f22b612..000000000 --- a/templates/web/fixmystreet/contact/who.html +++ /dev/null @@ -1,77 +0,0 @@ -[% IF c.cobrand.moniker == 'fixmystreet' %] - <h4>Topic:</h4> - - [% IF field_errors.dest %] - <div class="form-error">[% field_errors.dest %]</div> - [% ELSIF field_errors.not_for_us %] - <div class="form-error">You can only contact the team behind FixMyStreet using our contact form</div> - - [% IF dest == 'council' %] - <p> - We’re not the council: we just run this website which helps you report issues - to them. - </p> - - <p> - <strong>If you want to report a street problem</strong>, return to the - FixMyStreet homepage and enter your postcode. You can then make a report. - We'll send it to your council, and publish it on FixMyStreet. - </p> - - <p> - <strong>If your problem is not a street issue</strong>, or is <strong>not - suitable for publication on the site</strong>, then FixMyStreet isn't the - right place for it. You should find contact details on your council's own - website. - </p> - [% ELSIF dest == 'update' %] - <p> - FixMyStreet is great for reporting problems, but we don't fix them - your - council oversees that. - </p> - - <p> - <strong>If you'd like to chase your report</strong>, please reply directly - to any response - or auto-reply - that your council sent you. Check that - it has your council's email address on it so that it goes to the right place. - </p> - - <p> - It's a good idea to include the URL [web address] of your original FixMyStreet - report. - </p> - - <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>. - </p> - - [% END %] - [% END %] - - <div class="checkbox-group"> - <input name="dest" id="dest_help" type="radio" value="help" class="required"[% IF dest AND dest == 'help' %] checked[% END %]> - <label class="inline" for="dest_help">I need help using the site</label> - </div> - - <div class="checkbox-group"> - <input name="dest" id="dest_feeback" type="radio" value="feeback" class="required"[% IF dest AND dest == 'feeback' %] checked[% END %]> - <label class="inline" for="dest_feeback">I have feedback about the site</label> - </div> - - <div class="checkbox-group"> - <input name="dest" id="dest_from_council" type="radio" value="from_council" class="required"[% IF dest AND dest == 'from_council' %] checked[% END %]> - <label class="inline" for="dest_from_council">I am from a council and I have a question for the FixMyStreet team</label> - </div> - - <div class="checkbox-group"> - <input name="dest" id="dest_council" type="radio" value="council" class="required"[% IF dest AND dest == 'council' %] checked[% END %]> - <label class="inline" for="dest_council">I want to report a street problem</label> - </div> - - <div class="checkbox-group"> - <input name="dest" id="dest_update" type="radio" value="update"[% IF dest AND dest == 'update' %] checked[% END %]> - <label class="inline" for="dest_update">My street problem hasn't been fixed</label> - </div> -[% END %] diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index 848095596..18d3f1539 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -5,30 +5,9 @@ [% END %] </div><!-- .content role=main --> </div><!-- .container --> - [% IF c.cobrand.moniker == 'fixmystreet' %] - <div id="footer-nav"> - <div class="tablewrapper"> - <ul id="footer-main-nav"> - <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' %]span[% ELSE %]a href="/reports"[% 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 == '/contact' %]span[% ELSE %]a href="/contact"[% END - %]>[% loc("Contact") %]</[% c.req.uri.path == '/contact' ? 'span' : 'a' %]></li> - </ul> - <ul id="footer-help-nav"> - <li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END - %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/privacy' %]span[% ELSE %]a href="/privacy"[% END - %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li> - </ul> - </div> - </div> - [% END %] + [% IF c.cobrand.moniker == 'fixmystreet' %] + [% INCLUDE 'footer-nav.html' %] + [% END %] </div><!-- .table-cell --> <div class="nav-wrapper"> diff --git a/templates/web/fixmystreet/front/international_banner.html b/templates/web/fixmystreet/front/international_banner.html deleted file mode 100644 index a4cf990fb..000000000 --- a/templates/web/fixmystreet/front/international_banner.html +++ /dev/null @@ -1,15 +0,0 @@ -[% IF c.cobrand.moniker == 'fixmystreet' -%] - [%- country = c.cobrand.get_country_for_ip_address(c.req.address) -%] - [%- IF country AND country != 'GB' -%] - <div id="country_banner"> - <a href="#" id="message_close">Close</a> - <p id="international_message"> - <span id="message"> - This site is for reporting <strong>problems in the UK</strong>. There are FixMyStreet sites - <a href="http://www.fixmystreet.org/sites/">all over the world</a>, or you - could set up your own using the <a href="http://www.fixmystreet.org/">FixMyStreet Platform</a>. - </span> - </p> - </div> - [%- END -%] -[% END -%] diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index 7ddb09e26..14dbf0ddc 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -32,7 +32,6 @@ [% END %] [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %] - [% INCLUDE 'tracking_code.html' %] </head> [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %] |