aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/email/buckinghamshire/_council_reference.html2
-rw-r--r--templates/email/buckinghamshire/_council_reference.txt2
-rw-r--r--templates/email/buckinghamshire/alert-update.html26
-rw-r--r--templates/email/buckinghamshire/alert-update.txt28
-rw-r--r--templates/email/buckinghamshire/confirm_report_sent.html31
-rw-r--r--templates/email/buckinghamshire/confirm_report_sent.txt29
-rw-r--r--templates/email/buckinghamshire/other-reported.html34
-rw-r--r--templates/email/buckinghamshire/other-reported.txt30
-rw-r--r--templates/email/default/other-updated.html3
-rw-r--r--templates/email/default/other-updated.txt2
-rw-r--r--templates/web/base/admin/report_edit.html1
-rw-r--r--templates/web/base/admin/user_import.html76
-rwxr-xr-xtemplates/web/base/around/display_location.html2
-rw-r--r--templates/web/base/contact/index.html14
-rw-r--r--templates/web/base/report/new/fill_in_details_form.html2
-rw-r--r--templates/web/base/report/new/form_report.html1
-rw-r--r--templates/web/base/report/update-form.html6
-rwxr-xr-xtemplates/web/buckinghamshire/about/faq.html108
-rw-r--r--templates/web/buckinghamshire/around/intro.html2
-rw-r--r--templates/web/buckinghamshire/contact/_footer.html5
-rw-r--r--templates/web/buckinghamshire/contact/submit.html21
-rw-r--r--templates/web/buckinghamshire/footer.html44
-rw-r--r--templates/web/buckinghamshire/front/footer-marketing.html0
-rw-r--r--templates/web/buckinghamshire/header_logo.html2
-rw-r--r--templates/web/buckinghamshire/report/_update-form-heading.html1
-rw-r--r--templates/web/buckinghamshire/report/new/councils_extra_text.html8
-rw-r--r--templates/web/buckinghamshire/report/new/form_report.html66
-rw-r--r--templates/web/buckinghamshire/report/new/roads_message.html11
-rw-r--r--templates/web/buckinghamshire/report/new/top_message.html0
-rw-r--r--templates/web/buckinghamshire/tokens/confirm_problem.html44
-rw-r--r--templates/web/oxfordshire/report/new/form_heading.html3
31 files changed, 596 insertions, 8 deletions
diff --git a/templates/email/buckinghamshire/_council_reference.html b/templates/email/buckinghamshire/_council_reference.html
new file mode 100644
index 000000000..b8f72c8f9
--- /dev/null
+++ b/templates/email/buckinghamshire/_council_reference.html
@@ -0,0 +1,2 @@
+<p style="[% p_style %]">The report's reference number is <strong>[% problem.external_id %]</strong>.
+ Please quote this if you need to contact the council about this report.</p>
diff --git a/templates/email/buckinghamshire/_council_reference.txt b/templates/email/buckinghamshire/_council_reference.txt
new file mode 100644
index 000000000..3c92f3666
--- /dev/null
+++ b/templates/email/buckinghamshire/_council_reference.txt
@@ -0,0 +1,2 @@
+The report's reference number is [% problem.external_id %]. Please quote this if
+you need to contact the council about this report.
diff --git a/templates/email/buckinghamshire/alert-update.html b/templates/email/buckinghamshire/alert-update.html
new file mode 100644
index 000000000..d8d857c26
--- /dev/null
+++ b/templates/email/buckinghamshire/alert-update.html
@@ -0,0 +1,26 @@
+[%
+
+title = report.title | html;
+category = report.category | html;
+email_summary = "New updates on " _ category _ " report";
+email_columns = 2;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% primary_column_style %]" id="primary_column">
+ [% start_padded_box %]
+ <h1 style="[% h1_style %]">New updates on <a href="[% problem_url %]">[% category %] report</a></h1>
+ [%~ INCLUDE '_email_comment_list.html' %]
+ <p style="[% p_style %]"><a href="[% unsubscribe_url %]">Unsubscribe from alerts about this report</a></p>
+ [% end_padded_box %]
+</th>
+[% WRAPPER '_email_sidebar.html' object = report %]
+ <h2 style="[% h2_style %]">[% title | html %]</h2>
+ <p style="[% secondary_p_style %]">[% report.detail | html %]</p>
+[% END %]
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/buckinghamshire/alert-update.txt b/templates/email/buckinghamshire/alert-update.txt
new file mode 100644
index 000000000..159f0abe7
--- /dev/null
+++ b/templates/email/buckinghamshire/alert-update.txt
@@ -0,0 +1,28 @@
+Subject: New [% site_name %] updates on [% report.category %] report
+
+You asked us to send you an email every time an update was made to the
+[% site_name %] report: [% report.title %].
+
+The following updates have been left on this report:
+
+[% INCLUDE '_email_comment_list.txt' %]
+
+[% state_message %]
+
+If you would like to view or reply to these updates, please visit the following URL:
+
+ [% problem_url %]
+
+This email was sent automatically, from an unmonitored email account - so
+please do not reply to it.
+
+[% signature %]
+
+
+Unsubscribe?
+
+We currently email you whenever someone leaves an update on the
+[% site_name %] report: [% report.title %].
+
+If you no longer wish to receive an email whenever this report is updated,
+please follow this link: [% unsubscribe_url %]
diff --git a/templates/email/buckinghamshire/confirm_report_sent.html b/templates/email/buckinghamshire/confirm_report_sent.html
new file mode 100644
index 000000000..0fcb46e41
--- /dev/null
+++ b/templates/email/buckinghamshire/confirm_report_sent.html
@@ -0,0 +1,31 @@
+[%
+
+email_summary = "Thanks for logging your report";
+email_columns = 2;
+
+PROCESS '_email_settings.html';
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% primary_column_style %]" id="primary_column">
+ [% start_padded_box %]
+ <h1 style="[% h1_style %]">Your report has been&nbsp;logged</h1>
+ <p style="[% p_style %]">Your report to [% report.body %] has been logged on [% site_name %].</p>
+[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %]
+<p style="[% p_style %]">Please note that [% c.cobrand.council_name %] is not responsible for this type
+of report, so it will instead be sent to [% report.body %].</p>
+[% ELSE %]
+[% TRY %][% INCLUDE '_council_reference.html' problem=report %][% CATCH file %][% END %]
+[% END %]
+ <p style="margin: 20px auto; text-align: center">
+ <a style="[% button_style %]" href="[% cobrand.base_url_for_report(report) %][% report.url %]">View my report</a>
+ </p>
+ [% end_padded_box %]
+</th>
+[% WRAPPER '_email_sidebar.html' object = report %]
+ <h2 style="[% h2_style %]">[% report.title | html %]</h2>
+ <p style="[% secondary_p_style %]">[% report.detail | html %]</p>
+[% END %]
+
+[% INCLUDE '_email_bottom.html' %] \ No newline at end of file
diff --git a/templates/email/buckinghamshire/confirm_report_sent.txt b/templates/email/buckinghamshire/confirm_report_sent.txt
new file mode 100644
index 000000000..bdcedcfda
--- /dev/null
+++ b/templates/email/buckinghamshire/confirm_report_sent.txt
@@ -0,0 +1,29 @@
+Subject: Your report has been logged: [% report.title %]
+
+Hello [% report.name %],
+
+Your report to [% report.body %] has been logged on [% site_name %].
+
+[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %]
+Please note that [% c.cobrand.council_name %] is not responsible for this type
+of report, so it will instead be sent to [% report.body %].
+[% ELSE %]
+[% TRY %][% INCLUDE '_council_reference.txt' problem=report %][% CATCH file %][% END %]
+[% END %]
+
+It is available to view at:
+
+[% cobrand.base_url_for_report(report) %][% report.url %]
+
+Your report has the title:
+
+[% report.title %]
+
+And details:
+
+[% report.detail %]
+
+[% INCLUDE 'signature.txt' %]
+
+This email was sent automatically, from an unmonitored email account - so
+please do not reply to it. \ No newline at end of file
diff --git a/templates/email/buckinghamshire/other-reported.html b/templates/email/buckinghamshire/other-reported.html
new file mode 100644
index 000000000..85ba08f97
--- /dev/null
+++ b/templates/email/buckinghamshire/other-reported.html
@@ -0,0 +1,34 @@
+[%
+
+email_summary = "Thanks for logging your report";
+email_columns = 2;
+
+PROCESS '_email_settings.html';
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% primary_column_style %]" id="primary_column">
+ [% start_padded_box %]
+ <h1 style="[% h1_style %]">Your report has been&nbsp;logged</h1>
+ <p style="[% p_style %]">Your report to [% report.body %] has been logged on [% site_name %].
+[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %]
+Please note that [% c.cobrand.council_name %] is not responsible for this type
+of report, so it will instead be sent to [% report.body %].
+[% ELSE %]
+ </p>
+ <p style="[% p_style %]">This report's reference number is <strong>[% report.external_id %]</strong>.
+ Please quote this if you need to contact the council about this report.
+[% END %]
+ </p>
+ <p style="margin: 20px auto; text-align: center">
+ <a style="[% button_style %]" href="[% cobrand.base_url_for_report(report) %][% report.url %]">View my report</a>
+ </p>
+ [% end_padded_box %]
+</th>
+[% WRAPPER '_email_sidebar.html' object = report %]
+ <h2 style="[% h2_style %]">[% report.title | html %]</h2>
+ <p style="[% secondary_p_style %]">[% report.detail | html %]</p>
+[% END %]
+
+[% INCLUDE '_email_bottom.html' %] \ No newline at end of file
diff --git a/templates/email/buckinghamshire/other-reported.txt b/templates/email/buckinghamshire/other-reported.txt
new file mode 100644
index 000000000..933d66b54
--- /dev/null
+++ b/templates/email/buckinghamshire/other-reported.txt
@@ -0,0 +1,30 @@
+Subject: Your report has been logged: [% report.title %]
+
+Hello [% report.name %],
+
+Your report to [% report.body %] has been logged on [% site_name %].
+
+[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %]
+Please note that [% c.cobrand.council_name %] is not responsible for this type
+of report, so it will instead be sent to [% report.body %].
+[% ELSE %]
+This report's reference number is [% report.external_id %]. Please quote this if you
+need to contact the council about this report.
+[% END %]
+
+It is available to view at:
+
+[% cobrand.base_url_for_report(report) %][% report.url %]
+
+Your report has the title:
+
+[% report.title %]
+
+And details:
+
+[% report.detail %]
+
+[% INCLUDE 'signature.txt' %]
+
+This email was sent automatically, from an unmonitored email account - so
+please do not reply to it. \ No newline at end of file
diff --git a/templates/email/default/other-updated.html b/templates/email/default/other-updated.html
index 27eba9007..e7f09e123 100644
--- a/templates/email/default/other-updated.html
+++ b/templates/email/default/other-updated.html
@@ -11,7 +11,8 @@ INCLUDE '_email_top.html';
<th style="[% td_style %][% primary_column_style %]" id="primary_column">
[% start_padded_box %]
<h1 style="[% h1_style %]">Your update has been&nbsp;logged</h1>
- <p style="[% p_style %]">Your update has been logged on [% site_name %]:</p>
+ <p style="[% p_style %]">Your update has been logged on [% site_name %].</p>
+ [% TRY %][% INCLUDE '_council_reference.html' %][% CATCH file %][% END %]
<p style="margin: 20px auto; text-align: center">
<a style="[% button_style %]" href="[% cobrand.base_url_for_report(problem) %][% update.url %]">View my update</a>
</p>
diff --git a/templates/email/default/other-updated.txt b/templates/email/default/other-updated.txt
index 7e5631ef1..21ea68863 100644
--- a/templates/email/default/other-updated.txt
+++ b/templates/email/default/other-updated.txt
@@ -6,6 +6,8 @@ Your update has been logged on [% site_name %]:
[% cobrand.base_url_for_report(problem) %][% update.url %]
+[% TRY %][% INCLUDE '_council_reference.txt' %][% CATCH file %][% END %]
+
Your update reads:
[% update.text %]
diff --git a/templates/web/base/admin/report_edit.html b/templates/web/base/admin/report_edit.html
index 583f748f8..00e686566 100644
--- a/templates/web/base/admin/report_edit.html
+++ b/templates/web/base/admin/report_edit.html
@@ -1,4 +1,5 @@
[%
+ PROCESS "report/photo-js.html" IF problem.photo;
PROCESS "maps/${map.type}.html" admin = 1;
SET bodyclass = 'mappage with-notes';
INCLUDE 'admin/header.html'
diff --git a/templates/web/base/admin/user_import.html b/templates/web/base/admin/user_import.html
new file mode 100644
index 000000000..f866ed955
--- /dev/null
+++ b/templates/web/base/admin/user_import.html
@@ -0,0 +1,76 @@
+[% INCLUDE 'admin/header.html' title=loc("User Import") -%]
+[% PROCESS 'admin/report_blocks.html' %]
+
+[% status_message %]
+
+<form method="post" id="user_edit" action="[% c.uri_for( 'user_import' ) %]" enctype="multipart/form-data" accept-charset="utf-8">
+ <input type="hidden" name="token" value="[% csrf_token %]" >
+ <input type="hidden" name="submit" value="1" >
+
+ <p>
+ <label>
+ [% loc('CSV File') %]
+ <input type="file" name="csvfile" id="form_csvfile" />
+ </label>
+ <input type="submit" class="btn" name="Import users" value="[% loc('Import users') %]" />
+ </p>
+</form>
+
+[% IF new_users %]
+ <h2>[% tprintf(loc('Created %d new users'), new_users.size ) %]</h2>
+ <table>
+ <tr>
+ <th>[% loc('Name') %]</th>
+ <th>[% loc('Email') %]</th>
+ <th>[% loc('Body') %]</th>
+ </tr>
+ [% FOREACH user IN new_users %]
+ <tr>
+ <td>
+ <a href="[% c.uri_for_action( 'admin/user_edit', user.id ) %]">
+ [% user.name %]
+ </a>
+ </td>
+ <td>[% user.email %]</td>
+ <td>[% user.from_body.name %]</td>
+ </tr>
+ [% END %]
+ </table>
+[% END %]
+
+[% IF existing_users %]
+ <h2>[% tprintf(loc("%d users already existed"), existing_users.size) %]</h2>
+ <p>[% loc("These users weren't updated.") %]</p>
+ <table>
+ <tr>
+ <th>[% loc('Name') %]</th>
+ <th>[% loc('Email') %]</th>
+ <th>[% loc('Body') %]</th>
+ </tr>
+ [% FOREACH user IN existing_users %]
+ <tr>
+ <td>
+ <a href="[% c.uri_for_action( 'admin/user_edit', user.id ) %]">
+ [% user.name %]
+ </a>
+ </td>
+ <td>[% user.email %]</td>
+ <td>[% user.from_body.name %]</td>
+ </tr>
+ [% END %]
+ </table>
+[% END %]
+
+<h2>[% loc('Usage notes') %]</h2>
+<p>[% loc('This page is a quick way to create many new staff users in one go.') %]</p>
+<p>[% loc("Existing users won't be modified.") %]</p>
+<p>
+ [% loc("The uploaded CSV file must contain a header row, and records must have the following fields (in this order):") %]
+ <pre>name,email,from_body,permissions</pre>
+ <ul>
+ <li><code>from_body</code>: [% loc("the database id of the body to associate that user with, e.g. <code>2217</code> for Buckinghamshire.") %]</li>
+ <li><code>permissions</code>: [% loc("a colon-separated list of permissions to grant that user, e.g. <code>contribute_as_body:moderate:user_edit</code>.") %]</li>
+ </ul>
+</p>
+
+[% INCLUDE 'admin/footer.html' %]
diff --git a/templates/web/base/around/display_location.html b/templates/web/base/around/display_location.html
index 1ba40655a..f5f7e5cd3 100755
--- a/templates/web/base/around/display_location.html
+++ b/templates/web/base/around/display_location.html
@@ -74,7 +74,7 @@
<span>[% loc('Place pin on map') %]</span>
</div>
- [% IF c.config.BASE_URL == "https://www.fixmystreet.com" %]
+ [% IF c.config.BASE_URL == "https://www.fixmystreet.com" AND c.cobrand.moniker == 'fixmystreet' %]
<h1 class="big-green-banner banner-position-variant-1">
[% loc( 'Click map to report a problem' ) %]
</h1>
diff --git a/templates/web/base/contact/index.html b/templates/web/base/contact/index.html
index dfd3ef6b2..1839b4c85 100644
--- a/templates/web/base/contact/index.html
+++ b/templates/web/base/contact/index.html
@@ -109,11 +109,15 @@
</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/_footer.html' %]
+[% CATCH file %]
+ <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>
+[% END %]
[% TRY %][% INCLUDE 'contact/address.html' %][% CATCH file %][% END %]
diff --git a/templates/web/base/report/new/fill_in_details_form.html b/templates/web/base/report/new/fill_in_details_form.html
index f8714f573..a508b9307 100644
--- a/templates/web/base/report/new/fill_in_details_form.html
+++ b/templates/web/base/report/new/fill_in_details_form.html
@@ -4,6 +4,8 @@
<p class="change_location">[% loc('Wrong location? Just click again on the map.') %]</p>
[% END %]
+[% TRY %][% INCLUDE 'report/new/roads_message.html' %][% CATCH file %][% END %]
+
<div id="js-top-message">
[% PROCESS 'report/new/top_message.html' %]
</div>
diff --git a/templates/web/base/report/new/form_report.html b/templates/web/base/report/new/form_report.html
index 1d1a0e289..9fce25248 100644
--- a/templates/web/base/report/new/form_report.html
+++ b/templates/web/base/report/new/form_report.html
@@ -63,4 +63,5 @@
<input type="hidden" name="partial" value="[% partial_token.token %]">
[% END %]
+ <input type="hidden" id="single_body_only" name="single_body_only" value="">
<input type="hidden" name="submit_problem" value="1">
diff --git a/templates/web/base/report/update-form.html b/templates/web/base/report/update-form.html
index 912aae2b4..1e67c2072 100644
--- a/templates/web/base/report/update-form.html
+++ b/templates/web/base/report/update-form.html
@@ -3,7 +3,11 @@
<div id="update_form">
[% IF NOT login_success AND NOT oauth_need_email %]
- <h2[% IF two_column_sidebar %] class="hidden-js"[% END %]>[% loc( 'Provide an update') %]</h2>
+ [% TRY %]
+ [% INCLUDE 'report/_update-form-heading.html' %]
+ [% CATCH file %]
+ <h2[% IF two_column_sidebar %] class="hidden-js"[% END %]>[% loc( 'Provide an update') %]</h2>
+ [% END %]
[% IF c.cobrand.moniker != 'stevenage' %]
<div class="general-notes">
diff --git a/templates/web/buckinghamshire/about/faq.html b/templates/web/buckinghamshire/about/faq.html
new file mode 100755
index 000000000..54aaa4fcd
--- /dev/null
+++ b/templates/web/buckinghamshire/about/faq.html
@@ -0,0 +1,108 @@
+[% INCLUDE 'header.html', title = loc('Frequently Asked Questions'), bodyclass = 'twothirdswidthpage' %]
+
+[% INCLUDE 'about/_sidebar.html' %]
+
+<h1><a name="faq"></a>Frequently Asked Questions</h1>
+
+<dl>
+
+ <dt>What is this site?</dt>
+ <dd>FixMyStreet Bucks is a site to allow people to make reports to
+ Buckinghamshire County Council, and view, or discuss local issues they’ve
+ found, by simply locating them on a map.</dd>
+
+ <dt>How do I get in touch with FixMyStreet?</dt>
+ <dd>Here’s our <a href="/contact">contact page</a>.</dd>
+
+ <dt>What sort of problems should I report with FixMyStreet?</dt>
+ <dd>FixMyStreet Bucks is primarily for reporting things which are
+ <strong>broken or damaged or dumped, and need fixing, or clearing</strong>, such as:
+ <ul>
+ <li>Flodding
+ <li>Grit bins
+ <li>Rubbish or flytipping
+ <li>Potholes
+ <li>Street signs and traffic lights
+ <li>Unlit lampposts
+ </ul>
+ We may send some reports to the relevant District Council especially for:
+ <ul>
+ <li>Abandoned vehicles
+ <li>Flytipping or litter
+ <li>Streetcleaning, such as broken glass in a cycle lane
+ </ul>
+ </dd>
+
+ <dt>What isn’t FixMyStreet for?</dt>
+ <dd>FixMyStreet is not a way of getting in touch with Buckinghamshire
+ County Council for all issues – please use this site only for problems
+ such as the above. We often route problem reports to the Parish and District
+ council, so using this site for other matters may result in a delay in
+ your report getting to the right department.
+ <p><strong>You will need to contact the relevant authority directly for problems such as</strong>:
+
+ <ul><li>Anti-social behaviour
+ <li>Any urgent or emergency problems
+ <li>Noise pollution or barking dogs
+ <li>Fires and smoke/smell pollution
+ <li>Missing wheelie bins or recycling boxes or missed rubbish collections
+ <li>Complaining about your neighbours
+ <li>Joy riding, drug taking, animal cruelty, or other criminal activity should be reported to the Police Service.
+ </ul>
+ <p>Complaints about Buckinghamshire County Council can be sent <a href="https://www.buckscc.gov.uk/services/contact-and-complaints/compliments-complaints-and-suggestions/">via this form</a>.
+ </dd>
+
+ <dt>How do I use the site?</dt>
+ <dd>After entering a location, you are presented with a map of that area.
+ You can view problems already reported in that area, or report ones of your
+ own by clicking on the map at the location of the problem.</dd>
+
+ <dt>How are the problems solved?</dt>
+ <dd>They are reported to us at Buckinghamshire County Council who will
+ resolve the problem the way we normally would.</dd>
+
+ <dt>Is it free?</dt>
+ <dd>The site is free to use, yes.</dd>
+
+ <dt>Can I use FixMyStreet on my mobile?</dt>
+ <dd>
+ <p>The FixMyStreet Bucks website will already work on your mobile
+ phone, adapting to the size of your screen automatically.</p>
+ </dd>
+</dl>
+
+<h2><a name="practical"></a>Practical Questions</h2>
+
+<dl>
+ <dt>Do you remove silly or illegal content?</dt>
+ <dd>FixMyStreet Bucks is not responsible for the content and
+ accuracy of material submitted by its users. We reserve the right to
+ edit or remove any problems or updates which we consider to be
+ inappropriate upon being informed by a user of the site.</dd>
+
+ <dt>Why can’t I zoom out more on the reporting map?</dt>
+ <dd>We want to keep FixMyStreet Bucks locally focused, so restrict
+ the ability to move radically between areas. The map on Your Reports will
+ let you see all the reports you’ve made, wherever they are.</dd>
+</dl>
+
+<h2><a name="organisation"></a>Organisation Questions</h2>
+
+<dl>
+ <dt>Who built FixMyStreet?</dt>
+ <dd>The FixMyStreet service was built by <a href="https://www.mysociety.org/">mySociety</a>.
+
+ <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="https://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="https://www.fixmystreet.com/">FixMyStreet.com</a> is the
+ original code installation, in the UK.</dd>
+
+</dl>
+
+[% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/buckinghamshire/around/intro.html b/templates/web/buckinghamshire/around/intro.html
new file mode 100644
index 000000000..0af025041
--- /dev/null
+++ b/templates/web/buckinghamshire/around/intro.html
@@ -0,0 +1,2 @@
+<h1>Report a problem on a street/road</h1>
+<p>Report a problem on a street/road in Buckinghamshire or track the progress of reported issues.</p>
diff --git a/templates/web/buckinghamshire/contact/_footer.html b/templates/web/buckinghamshire/contact/_footer.html
new file mode 100644
index 000000000..80cc1aa22
--- /dev/null
+++ b/templates/web/buckinghamshire/contact/_footer.html
@@ -0,0 +1,5 @@
+<h4>[% loc("Don't like forms?") %]</h4>
+
+<p>
+You can <a href="mailto:[% contact_email %]">email technical support directly</a>.
+</p>
diff --git a/templates/web/buckinghamshire/contact/submit.html b/templates/web/buckinghamshire/contact/submit.html
new file mode 100644
index 000000000..52494bab1
--- /dev/null
+++ b/templates/web/buckinghamshire/contact/submit.html
@@ -0,0 +1,21 @@
+[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Contact Us') %]
+
+[% IF success %]
+
+ <div class="confirmation-header">
+ <h1>[% loc('Thank you for your message') %]</h1>
+ <p>[% loc('We’ll get back to you as soon as we can.') %]</p>
+ </div>
+
+[% ELSE %]
+
+ <div class="confirmation-header confirmation-header--failure">
+ <h1>[% loc('Failed to send message') %]</h1>
+ <p>[% loc('Try emailing us directly:') %] <a href="mailto:[% contact_email %]">[% contact_email %]</a></p>
+ </div>
+
+[% END %]
+
+[% INCLUDE next_steps.html utm_content='contact form submitted' %]
+
+[% INCLUDE 'footer.html' %]
diff --git a/templates/web/buckinghamshire/footer.html b/templates/web/buckinghamshire/footer.html
new file mode 100644
index 000000000..c85530e8f
--- /dev/null
+++ b/templates/web/buckinghamshire/footer.html
@@ -0,0 +1,44 @@
+ </div><!-- .content role=main -->
+ </div><!-- .container -->
+ </div><!-- .table-cell -->
+
+ <div class="nav-wrapper">
+ <div class="container">
+ <div id="main-nav" role="navigation">
+ <ul class="nav-menu nav-menu--main">
+ <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/Buckinghamshire'
+ %]span[% ELSE %]a href="/reports/Buckinghamshire"[% END
+ %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports/Buckinghamshire' ? '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>[%
+ %]<li class="nav-menu__item--privacy"><[% 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>
+ </div>
+ </div> <!-- .wrapper -->
+
+ [% IF pagefooter %]
+ <div class="bucks_footer">
+ <footer role="contentinfo" class="clearfix">
+ [% INCLUDE 'front/footer-marketing.html' %]
+ </footer>
+ </div>
+ [% END %]
+
+ [% INCLUDE 'common_footer_tags.html' %]
+
+</body>
+</html>
diff --git a/templates/web/buckinghamshire/front/footer-marketing.html b/templates/web/buckinghamshire/front/footer-marketing.html
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/templates/web/buckinghamshire/front/footer-marketing.html
diff --git a/templates/web/buckinghamshire/header_logo.html b/templates/web/buckinghamshire/header_logo.html
new file mode 100644
index 000000000..2808d8782
--- /dev/null
+++ b/templates/web/buckinghamshire/header_logo.html
@@ -0,0 +1,2 @@
+ <a href="http://www.buckscc.gov.uk/" id="site-logo"><strong>Buckinghamshire</strong> County Council</a>
+ <a href="/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a>
diff --git a/templates/web/buckinghamshire/report/_update-form-heading.html b/templates/web/buckinghamshire/report/_update-form-heading.html
new file mode 100644
index 000000000..60b09ce3e
--- /dev/null
+++ b/templates/web/buckinghamshire/report/_update-form-heading.html
@@ -0,0 +1 @@
+<h2[% IF two_column_sidebar %] class="hidden-js"[% END %]>[% loc( 'Provide additional information') %]</h2>
diff --git a/templates/web/buckinghamshire/report/new/councils_extra_text.html b/templates/web/buckinghamshire/report/new/councils_extra_text.html
new file mode 100644
index 000000000..0b3246472
--- /dev/null
+++ b/templates/web/buckinghamshire/report/new/councils_extra_text.html
@@ -0,0 +1,8 @@
+<p>
+<strong>IMPORTANT:</strong>
+If you consider this to be dangerous or an emergency, please call us
+on: <strong>01296 382416</strong> (09:00 – 17:30 Mon-Thurs, 09:00 – 17:00 Friday)
+or <strong>01296 486630</strong>
+(out of hours and weekends). Otherwise, by submitting the report online we will
+deal with it in line with our agreed timescales.
+</p>
diff --git a/templates/web/buckinghamshire/report/new/form_report.html b/templates/web/buckinghamshire/report/new/form_report.html
new file mode 100644
index 000000000..729b0e807
--- /dev/null
+++ b/templates/web/buckinghamshire/report/new/form_report.html
@@ -0,0 +1,66 @@
+[% INCLUDE 'report/new/form_heading.html' %]
+
+[% IF field_errors.bodies %]
+ <p class='form-error'>[% field_errors.bodies %]</p>
+[% END %]
+
+[% PROCESS "report/new/category_wrapper.html" %]
+[% TRY %][% PROCESS 'report/new/after_category.html' %][% CATCH file %][% END %]
+
+ <h2 class="form-section-heading">[% loc( 'Public details' ) %]</h2>
+ <div class="form-section-description" id="js-councils_text">
+ [% IF js %]
+ [% PROCESS 'report/new/councils_text_all.html' list_of_names = [ loc('the local council') ] %]
+ [% ELSE %]
+ [% PROCESS 'report/new/councils_text.html' %]
+ [% END %]
+ </div>
+
+ <label for="form_title">[% loc('Location of the problem') %]</label>
+[% IF field_errors.title %]
+ <p class='form-error'>[% field_errors.title %]</p>
+[% END %]
+ <input class="form-control" type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="Exact location, including any landmarks" required>
+
+[% TRY %][% PROCESS 'report/new/after_title.html' %][% CATCH file %][% END %]
+
+[% IF c.cobrand.allow_photo_upload %]
+ <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
+ <label for="form_photo">
+ <span data-singular="[% loc('Photo') %]" data-plural="[% loc('Photos') %]">[% loc('Photo') %]</span>
+ </label>
+
+ [% IF field_errors.photo %]
+ <p class='form-error'>[% field_errors.photo %]</p>
+ [% END %]
+
+ <div id="form_photos">
+ [% IF upload_fileid %]
+ <p>[% loc('You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed).') %]</p>
+ [% FOREACH id IN upload_fileid.split(',') %]
+ <img align="right" src="/photo/temp.[% id %]" alt="">
+ [% END %]
+ [% END %]
+ <input type="file" name="photo1" id="form_photo">
+ <label for="form_photo2">[% loc('Photo') %]</label>
+ <input type="file" name="photo2" id="form_photo2">
+ <label for="form_photo3">[% loc('Photo') %]</label>
+ <input type="file" name="photo3" id="form_photo3">
+ </div>
+[% END %]
+
+[% TRY %][% PROCESS 'report/new/after_photo.html' %][% CATCH file %][% END %]
+
+ <label for="form_detail">[% loc('Explain what’s wrong') %]</label>
+[% IF field_errors.detail %]
+ <p class='form-error'>[% field_errors.detail %]</p>
+[% END %]
+ <textarea class="form-control" rows="7" cols="26" name="detail" id="form_detail" placeholder="Dimensions, landmarks, direction of travel etc." required>[% report.detail | html %]</textarea>
+
+[% TRY %][% PROCESS 'report/new/inline-tips.html' %][% CATCH file %][% END %]
+
+[% IF partial_token %]
+ <input type="hidden" name="partial" value="[% partial_token.token %]">
+[% END %]
+
+ <input type="hidden" name="submit_problem" value="1">
diff --git a/templates/web/buckinghamshire/report/new/roads_message.html b/templates/web/buckinghamshire/report/new/roads_message.html
new file mode 100644
index 000000000..772f38df4
--- /dev/null
+++ b/templates/web/buckinghamshire/report/new/roads_message.html
@@ -0,0 +1,11 @@
+<div id="js-bucks-responsibility" class="box-warning hidden">
+ <strong>Invalid location</strong>
+ <div id="js-not-bucks-road" class="hidden js-responsibility-message">
+ <p>The selected road is not maintained by Buckinghamshire County Council.</p>
+ <p>Please select another road.</p>
+ </div>
+ <div id="js-not-a-road" class="hidden js-responsibility-message">
+ <p>The location you have selected doesn't appear to be on a road.</p>
+ <p>Please select a road on which to make a report.</p>
+ </div>
+</div>
diff --git a/templates/web/buckinghamshire/report/new/top_message.html b/templates/web/buckinghamshire/report/new/top_message.html
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/templates/web/buckinghamshire/report/new/top_message.html
diff --git a/templates/web/buckinghamshire/tokens/confirm_problem.html b/templates/web/buckinghamshire/tokens/confirm_problem.html
new file mode 100644
index 000000000..9b3063b5e
--- /dev/null
+++ b/templates/web/buckinghamshire/tokens/confirm_problem.html
@@ -0,0 +1,44 @@
+[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Confirmation') %]
+
+<div class="confirmation-header">
+
+ <h1><a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]">[% report.title %]</a></h1>
+
+ [% IF c.cobrand.is_council %]
+ [% IF c.cobrand.owns_problem( report ) %]
+ <h2>Your issue is on its way to the council.</h2>
+ <p>You will receive an email with a reference number for this report soon, please quote it in any enquiries.</p>
+ [% ELSE %]
+ <h2>Thank you for your report.</h2>
+ <p>
+ We don&rsquo;t handle this type of problem, so have passed it on to:
+ </p>
+ <p>
+ <b>[% report.body %]</b>
+ </p>
+ <p>
+ You can follow this problem on <a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]">FixMyStreet.com</a>.
+ </p>
+ [% END %]
+
+ [% ELSE %]
+ <h2>[% loc('Thank you for reporting this issue!') %]</h2>
+ [% IF report.bodies_str %]
+ <p>[% loc('It’s on its way to the council right now.') %]</p>
+ [% END %]
+
+ [% END %]
+
+[% TRY %][% INCLUDE 'tokens/_extras_confirm.html' %][% CATCH file %][% END %]
+
+</div>
+
+[% INCLUDE
+ next_steps.html,
+ just_interacted = 1,
+ utm_content = 'problem confirmed',
+ share_url = c.cobrand.base_url_for_report(report) _ report.url,
+ twitter_comment = loc('I just reported a problem on @fixmystreet')
+%]
+
+[% INCLUDE 'footer.html' %]
diff --git a/templates/web/oxfordshire/report/new/form_heading.html b/templates/web/oxfordshire/report/new/form_heading.html
new file mode 100644
index 000000000..a561c7efb
--- /dev/null
+++ b/templates/web/oxfordshire/report/new/form_heading.html
@@ -0,0 +1,3 @@
+<div class="extra-text mob-only">
+ <p>Please do not use this form for reporting <a href="/faq#pothole" target="_blank">emergencies and urgent problems</a>.</p>
+</div>