aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/web/default/contact/index.html2
-rw-r--r--templates/web/default/contact/who.html (renamed from templates/web/default/report/extra_analytics.html)0
-rw-r--r--templates/web/default/tokens/confirm_problem.html1
-rw-r--r--templates/web/fixmystreet/contact/blurb.html15
-rw-r--r--templates/web/fixmystreet/contact/index.html11
-rw-r--r--templates/web/fixmystreet/contact/who.html77
-rw-r--r--templates/web/fixmystreet/footer.html18
-rw-r--r--templates/web/fixmystreet/report/display.html1
-rw-r--r--templates/web/fixmystreet/report/extra_analytics.html8
-rw-r--r--templates/web/fixmystreet/tracking_code.html12
-rw-r--r--templates/web/southampton/header.html2
11 files changed, 128 insertions, 19 deletions
diff --git a/templates/web/default/contact/index.html b/templates/web/default/contact/index.html
index 73e94fb33..8789fd03e 100644
--- a/templates/web/default/contact/index.html
+++ b/templates/web/default/contact/index.html
@@ -83,6 +83,8 @@
<label for="form_subject">[% loc('Subject:') %]</label>
<input type="text" class="required" name="subject" id="form_subject" value="[% subject | html %]" size="30"></div>
+[% INCLUDE 'contact/who.html' %]
+
[% IF field_errors.message %]
<div class="form-error">[% field_errors.message %]</div>
[% END %]
diff --git a/templates/web/default/report/extra_analytics.html b/templates/web/default/contact/who.html
index e69de29bb..e69de29bb 100644
--- a/templates/web/default/report/extra_analytics.html
+++ b/templates/web/default/contact/who.html
diff --git a/templates/web/default/tokens/confirm_problem.html b/templates/web/default/tokens/confirm_problem.html
index 51b459925..723d515e1 100644
--- a/templates/web/default/tokens/confirm_problem.html
+++ b/templates/web/default/tokens/confirm_problem.html
@@ -28,5 +28,4 @@ You can <a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]
[% display_crosssell_advert( problem.user.email, problem.name ) %]
-[% INCLUDE 'report/extra_analytics.html' %]
[% INCLUDE 'footer.html' %]
diff --git a/templates/web/fixmystreet/contact/blurb.html b/templates/web/fixmystreet/contact/blurb.html
new file mode 100644
index 000000000..21a4ae715
--- /dev/null
+++ b/templates/web/fixmystreet/contact/blurb.html
@@ -0,0 +1,15 @@
+[% IF c.cobrand.moniker == 'fixmystreet' %]
+<h3>Send a message to FixMyStreet's technical support team</h3>
+
+<h4>If you have questions about FixMyStreet</h4>
+[% END %]
+
+<p>
+[% tprintf( loc("It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."), c.uri_for('/faq') ) %]
+</p>
+
+<p>
+[% loc('Please do <strong>not</strong> report problems through this form; messages go to
+the team behind FixMyStreet, not a council. To report a problem,
+please <a href="/">go to the front page</a> and follow the instructions.') %]
+</p>
diff --git a/templates/web/fixmystreet/contact/index.html b/templates/web/fixmystreet/contact/index.html
index dfef39b9f..44aa5c2e4 100644
--- a/templates/web/fixmystreet/contact/index.html
+++ b/templates/web/fixmystreet/contact/index.html
@@ -16,7 +16,11 @@
</aside>
</div>
+[% IF c.cobrand.moniker == 'fixmystreet' %]
+<h1>FixMyStreet technical support</h1>
+[% ELSE %]
<h1>[% loc('Contact the team') %]</h1>
+[% END %]
<form method="post" action="/contact/submit" class="validate">
<fieldset>
@@ -94,6 +98,7 @@
[% END %]
<input type="text" class="required" name="subject" id="form_subject" value="[% subject | html %]" size="30">
+ [% INCLUDE 'contact/who.html' %]
<label for="form_message">[% loc('Message') %]</label>
[% IF field_errors.message %]
@@ -107,6 +112,12 @@
</fieldset>
</form>
+<h4>[% loc("Don't like forms?") %]</h4>
+
+<p>
+[% tprintf( loc("You can contact technical support on <a href='mailto:%s'>%s</a>"), contact_email, contact_email) %]
+</p>
+
[% TRY %][% INCLUDE 'contact/address.html' %][% CATCH file %][% END %]
[% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/fixmystreet/contact/who.html b/templates/web/fixmystreet/contact/who.html
new file mode 100644
index 000000000..49f22b612
--- /dev/null
+++ b/templates/web/fixmystreet/contact/who.html
@@ -0,0 +1,77 @@
+[% 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 dbf9235e0..cb39416f4 100644
--- a/templates/web/fixmystreet/footer.html
+++ b/templates/web/fixmystreet/footer.html
@@ -2,14 +2,16 @@
<footer role="content-info">
<div class="tablewrapper bordered">
<div id="footer-mobileapps">
- <h4>Mobile apps</h4>
- <p>
- <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545">iPhone</a>
- and
- <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet">Android</a>
- apps now available.
- </p>
- </div>
+ <h4>The FixMyStreet App</h4>
+ <p>
+ <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545">
+ <img alt="FixMyStreet app on the App Store" src="/cobrands/fixmystreet/images/itunes_store_logo.png" />
+ </a>
+ <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet">
+ <img alt="FixMyStreet Android app on Google Play" src="/cobrands/fixmystreet/images/google_play_logo.png" />
+ </a>
+ </p>
+ </div>
<div id="footer-help">
<ul>
diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html
index 2c65ca104..b75ef92bc 100644
--- a/templates/web/fixmystreet/report/display.html
+++ b/templates/web/fixmystreet/report/display.html
@@ -23,7 +23,6 @@
[% INCLUDE 'report/banner.html' %]
[% INCLUDE 'report/_main.html' %]
-[% INCLUDE 'report/extra_analytics.html' %]
[% TRY %][% INCLUDE 'report/_message_manager.html' %][% CATCH file %][% END %]
<div class="shadow-wrap">
diff --git a/templates/web/fixmystreet/report/extra_analytics.html b/templates/web/fixmystreet/report/extra_analytics.html
deleted file mode 100644
index 4a993cc2d..000000000
--- a/templates/web/fixmystreet/report/extra_analytics.html
+++ /dev/null
@@ -1,8 +0,0 @@
-[% IF c.flash.created_report %]
-<script type="text/javascript">
- var cobrand = $('meta[name="cobrand"]').attr('content');
- if ( typeof ga !== 'undefined' && cobrand == 'fixmystreet' ) {
- ga('send', 'event', 'report', 'completed', '[% c.flash.created_report %]' );
- }
-</script>
-[% END %]
diff --git a/templates/web/fixmystreet/tracking_code.html b/templates/web/fixmystreet/tracking_code.html
index a9412d4f2..9d8c00d3c 100644
--- a/templates/web/fixmystreet/tracking_code.html
+++ b/templates/web/fixmystreet/tracking_code.html
@@ -7,6 +7,18 @@ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
ga('create', 'UA-660910-4', {'cookieDomain': '.fixmystreet.com'});
ga('set', 'anonymizeIp', true);
+[% IF created_report %]
+ga(function(tracker) {
+ var page = tracker.get('location');
+ var extra = '';
+ if ( page.indexOf('?') != -1 ) {
+ extra = '&created_report=1';
+ } else {
+ extra = '?created_report=1';
+ }
+ tracker.set('location', page + extra);
+});
+[% END %]
ga('send', 'pageview');
</script>
diff --git a/templates/web/southampton/header.html b/templates/web/southampton/header.html
index 113803492..54f8ee2a8 100644
--- a/templates/web/southampton/header.html
+++ b/templates/web/southampton/header.html
@@ -111,7 +111,7 @@
<li><a href="/reports/Southampton">All reports</a></li>
<li><a href="/alerts">Local alerts</a></li>
<li><a href="/faq">Help</a></li>
- <li><a href="/contact">Contact</a></li>
+ <li><a href="http://www.southampton.gov.uk/customer-service/contact/">Contact</a></li>
</ul>
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 16:26:43 +0000