aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/email/lincolnshire/_council_reference.html4
-rw-r--r--templates/email/lincolnshire/_council_reference.txt2
-rw-r--r--templates/email/lincolnshire/confirm_report_sent.html1
-rw-r--r--templates/email/lincolnshire/confirm_report_sent.txt1
-rw-r--r--templates/web/base/alert/choose.html1
-rw-r--r--templates/web/base/questionnaire/creator_fixed.html2
-rwxr-xr-xtemplates/web/base/reports/body.html2
-rw-r--r--templates/web/base/tokens/confirm_problem.html4
-rw-r--r--templates/web/buckinghamshire/tokens/_confirm_problem_council_id.html2
-rw-r--r--templates/web/buckinghamshire/tokens/confirm_problem.html44
-rw-r--r--templates/web/fixmystreet.com/footer_extra_js.html1
-rw-r--r--templates/web/lincolnshire/around/intro.html2
-rw-r--r--templates/web/lincolnshire/contact/_footer.html1
-rw-r--r--templates/web/lincolnshire/footer.html23
-rw-r--r--templates/web/lincolnshire/front/footer-marketing.html0
-rw-r--r--templates/web/lincolnshire/header_extra.html5
-rw-r--r--templates/web/lincolnshire/header_site.html8
-rw-r--r--templates/web/lincolnshire/report/new/inline-tips.html12
-rw-r--r--templates/web/lincolnshire/report/new/top_message.html0
-rw-r--r--templates/web/lincolnshire/tokens/_confirm_problem_council_id.html2
-rw-r--r--templates/web/lincolnshire/tracking_code.html17
21 files changed, 88 insertions, 46 deletions
diff --git a/templates/email/lincolnshire/_council_reference.html b/templates/email/lincolnshire/_council_reference.html
new file mode 100644
index 000000000..56944f954
--- /dev/null
+++ b/templates/email/lincolnshire/_council_reference.html
@@ -0,0 +1,4 @@
+[% IF problem.external_id ~%]
+<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>
+[%~ END %]
diff --git a/templates/email/lincolnshire/_council_reference.txt b/templates/email/lincolnshire/_council_reference.txt
new file mode 100644
index 000000000..3dd3f1e9f
--- /dev/null
+++ b/templates/email/lincolnshire/_council_reference.txt
@@ -0,0 +1,2 @@
+[% IF problem.external_id %]The report's reference number is [% problem.external_id %]. Please quote this if
+you need to contact the council about this report.[% END %]
diff --git a/templates/email/lincolnshire/confirm_report_sent.html b/templates/email/lincolnshire/confirm_report_sent.html
new file mode 100644
index 000000000..5a0c19f0d
--- /dev/null
+++ b/templates/email/lincolnshire/confirm_report_sent.html
@@ -0,0 +1 @@
+[% INCLUDE 'other-reported.html' %] \ No newline at end of file
diff --git a/templates/email/lincolnshire/confirm_report_sent.txt b/templates/email/lincolnshire/confirm_report_sent.txt
new file mode 100644
index 000000000..72fe01f6d
--- /dev/null
+++ b/templates/email/lincolnshire/confirm_report_sent.txt
@@ -0,0 +1 @@
+[% INCLUDE 'other-reported.txt' %] \ No newline at end of file
diff --git a/templates/web/base/alert/choose.html b/templates/web/base/alert/choose.html
index 50835e90c..6f1eb412f 100644
--- a/templates/web/base/alert/choose.html
+++ b/templates/web/base/alert/choose.html
@@ -1,3 +1,4 @@
+[% SET bodyclass = 'alertpage fullwidthpage' %]
[% INCLUDE 'header.html', title => loc('Local RSS feeds and email alerts') %]
<h1>[% loc('Local RSS feeds and email alerts') %]</h1>
diff --git a/templates/web/base/questionnaire/creator_fixed.html b/templates/web/base/questionnaire/creator_fixed.html
index bcd9a9514..83037ee3d 100644
--- a/templates/web/base/questionnaire/creator_fixed.html
+++ b/templates/web/base/questionnaire/creator_fixed.html
@@ -1,4 +1,4 @@
-[% INCLUDE 'header.html', title = loc('Confirmation') %]
+[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Confirmation') %]
<form method="post" action="/questionnaire/submit" id="questionnaire">
<input type="hidden" name="problem" value="[% problem_id | html %]">
diff --git a/templates/web/base/reports/body.html b/templates/web/base/reports/body.html
index a630c2175..8be72d632 100755
--- a/templates/web/base/reports/body.html
+++ b/templates/web/base/reports/body.html
@@ -8,7 +8,7 @@
%]
[% END %]
-[% IF c.cobrand.moniker == 'oxfordshire' %]
+[% IF c.cobrand.moniker.match('oxfordshire|lincolnshire') %]
[% ward_text = 'View reports by division' %]
[% ELSIF c.cobrand.is_council %]
[% ward_text = loc( 'View reports by ward' ) %]
diff --git a/templates/web/base/tokens/confirm_problem.html b/templates/web/base/tokens/confirm_problem.html
index 57ba42a54..f74517c8a 100644
--- a/templates/web/base/tokens/confirm_problem.html
+++ b/templates/web/base/tokens/confirm_problem.html
@@ -6,8 +6,12 @@
[% IF c.cobrand.is_council %]
[% IF c.cobrand.owns_problem( report ) %]
+ [% TRY %]
+ [% INCLUDE 'tokens/_confirm_problem_council_id.html' %]
+ [% CATCH file %]
<h2>Your issue is on its way to the council.</h2>
<p>Your reference for this report is [% report.id %], please quote it in any enquiries.</p>
+ [% END %]
[% ELSE %]
<h2>Thank you for your report.</h2>
<p>
diff --git a/templates/web/buckinghamshire/tokens/_confirm_problem_council_id.html b/templates/web/buckinghamshire/tokens/_confirm_problem_council_id.html
new file mode 100644
index 000000000..458e37299
--- /dev/null
+++ b/templates/web/buckinghamshire/tokens/_confirm_problem_council_id.html
@@ -0,0 +1,2 @@
+<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>
diff --git a/templates/web/buckinghamshire/tokens/confirm_problem.html b/templates/web/buckinghamshire/tokens/confirm_problem.html
deleted file mode 100644
index 9b3063b5e..000000000
--- a/templates/web/buckinghamshire/tokens/confirm_problem.html
+++ /dev/null
@@ -1,44 +0,0 @@
-[% 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/fixmystreet.com/footer_extra_js.html b/templates/web/fixmystreet.com/footer_extra_js.html
index c1ba95c25..c1d1b09b0 100644
--- a/templates/web/fixmystreet.com/footer_extra_js.html
+++ b/templates/web/fixmystreet.com/footer_extra_js.html
@@ -8,6 +8,7 @@ IF bodyclass.match('mappage');
scripts.push( version('/cobrands/bristol/assets.js') );
scripts.push( version('/cobrands/bromley/assets.js') );
scripts.push( version('/cobrands/buckinghamshire/assets.js') );
+ scripts.push( version('/cobrands/lincolnshire/assets.js') );
scripts.push(
version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'),
);
diff --git a/templates/web/lincolnshire/around/intro.html b/templates/web/lincolnshire/around/intro.html
new file mode 100644
index 000000000..ed199f676
--- /dev/null
+++ b/templates/web/lincolnshire/around/intro.html
@@ -0,0 +1,2 @@
+<h1>Report, view, or discuss local problems</h1>
+<h2>(like potholes, broken paving slabs, or street lighting)</h2>
diff --git a/templates/web/lincolnshire/contact/_footer.html b/templates/web/lincolnshire/contact/_footer.html
new file mode 100644
index 000000000..7647f5df5
--- /dev/null
+++ b/templates/web/lincolnshire/contact/_footer.html
@@ -0,0 +1 @@
+[%# Disables display of email address on contact form. %] \ No newline at end of file
diff --git a/templates/web/lincolnshire/footer.html b/templates/web/lincolnshire/footer.html
new file mode 100644
index 000000000..69ab0b51e
--- /dev/null
+++ b/templates/web/lincolnshire/footer.html
@@ -0,0 +1,23 @@
+ </div><!-- .content role=main -->
+ </div><!-- .container -->
+ </div><!-- .table-cell -->
+
+ <div class="nav-wrapper">
+ <div class="container">
+ [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area %]
+ </div>
+ </div>
+ </div> <!-- .wrapper -->
+
+ [% IF pagefooter %]
+ <div>
+ <footer role="contentinfo">
+ [% INCLUDE 'front/footer-marketing.html' %]
+ </footer>
+ </div>
+ [% END %]
+
+ [% INCLUDE 'common_footer_tags.html' %]
+
+</body>
+</html>
diff --git a/templates/web/lincolnshire/front/footer-marketing.html b/templates/web/lincolnshire/front/footer-marketing.html
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/templates/web/lincolnshire/front/footer-marketing.html
diff --git a/templates/web/lincolnshire/header_extra.html b/templates/web/lincolnshire/header_extra.html
new file mode 100644
index 000000000..8addc12e1
--- /dev/null
+++ b/templates/web/lincolnshire/header_extra.html
@@ -0,0 +1,5 @@
+<link href="https://fonts.googleapis.com/css?family=Roboto:400,700" rel="stylesheet">
+
+<link rel="shortcut icon" href="/cobrands/lincolnshire/favicon.ico" />
+
+[% INCLUDE 'tracking_code.html' %]
diff --git a/templates/web/lincolnshire/header_site.html b/templates/web/lincolnshire/header_site.html
new file mode 100644
index 000000000..ad49161f4
--- /dev/null
+++ b/templates/web/lincolnshire/header_site.html
@@ -0,0 +1,8 @@
+<header id="site-header" role="banner">
+ <div class="container">
+ <a href="/" id="site-logo">Lincolnshire County Council</a>
+ <a href="/" id="report-cta" title="Report a problem">Report</a>
+
+ <a href="#main-nav" id="nav-link">Main Navigation</a>
+ </div>
+</header> \ No newline at end of file
diff --git a/templates/web/lincolnshire/report/new/inline-tips.html b/templates/web/lincolnshire/report/new/inline-tips.html
new file mode 100644
index 000000000..316f183bb
--- /dev/null
+++ b/templates/web/lincolnshire/report/new/inline-tips.html
@@ -0,0 +1,12 @@
+<div class="description_tips" aria-label="Tips for successful reports">
+ <ul class="do">
+ <li>Be polite</li>
+ <li>Use exact locations</li>
+ <li>Say how long the issue’s been&nbsp;present</li>
+ </ul>
+ <ul class="dont">
+ <li>Don’t identify or accuse other&nbsp;people</li>
+ <li>Don’t include private contact details in the&nbsp;description</li>
+ </ul>
+</div>
+<small class="form-section-description">The information you provide here will be shared with external contractors.</small>
diff --git a/templates/web/lincolnshire/report/new/top_message.html b/templates/web/lincolnshire/report/new/top_message.html
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/templates/web/lincolnshire/report/new/top_message.html
diff --git a/templates/web/lincolnshire/tokens/_confirm_problem_council_id.html b/templates/web/lincolnshire/tokens/_confirm_problem_council_id.html
new file mode 100644
index 000000000..458e37299
--- /dev/null
+++ b/templates/web/lincolnshire/tokens/_confirm_problem_council_id.html
@@ -0,0 +1,2 @@
+<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>
diff --git a/templates/web/lincolnshire/tracking_code.html b/templates/web/lincolnshire/tracking_code.html
new file mode 100644
index 000000000..42d88a817
--- /dev/null
+++ b/templates/web/lincolnshire/tracking_code.html
@@ -0,0 +1,17 @@
+[% IF c.config.BASE_URL == "https://www.fixmystreet.com" %]
+
+<!-- Google Tag Manager -->
+<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+})(window,document,'script','dataLayer','GTM-MP7MF9');</script>
+<!-- End Google Tag Manager -->
+
+<!-- Google Tag Manager (noscript) -->
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-MP7MF9"
+height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<!-- End Google Tag Manager (noscript) -->
+[% ELSE %]
+<!-- Tracking code not inserted as "[% c.config.BASE_URL %]" not "https://www.fixmystreet.com" -->
+[% END %]