15 files changed, 236 insertions, 1 deletions
diff --git a/templates/email/hackney/_email_bottom.html b/templates/email/hackney/_email_bottom.html
new file mode 100644
index 000000000..64936c470
--- /dev/null
+++ b/templates/email/hackney/_email_bottom.html
@@ -0,0 +1,28 @@
+          </tr>
+        </table>
+      </th>
+      <th class="spacer-cell"></th>
+    </tr>
+  </table>
+  <table [% wrapper_table | safe %] style="[% wrapper_style %]">
+    <tr>
+      <th class="spacer-cell"></th>
+      <th width="[% wrapper_max_width %]" style="[% td_style %][% hint_style %]" class="hint">
+        [%~ IF email_footer %]
+          [% email_footer | safe %]
+        [%~ ELSE %]
+          This email was sent automatically, from an unmonitored email account. Please do not reply to it.
+        [%~ END %]
+      </th>
+      <th class="spacer-cell"></th>
+    </tr>
+    <tr>
+      <th class="spacer-cell"></th>
+      <th width="[% wrapper_max_width %]" style="[% td_style %][% hint_style %]">
+        Powered by <a href="http://www.fixmystreet.com">FixMyStreet</a>
+      </th>
+      <th class="spacer-cell"></th>
+    </tr>
+  </table>
+</body>
+</html>
diff --git a/templates/email/hackney/_email_color_overrides.html b/templates/email/hackney/_email_color_overrides.html
new file mode 100644
index 000000000..1af818eca
--- /dev/null
+++ b/templates/email/hackney/_email_color_overrides.html
@@ -0,0 +1,25 @@
+[%
+
+color_green = '#00b341'
+color_black = '#000000'
+color_white = '#FFFFFF'
+color_hackney_pale_green = '#f2f7f0'
+color_hackney_dark_green = '#00664f'
+
+body_background_color = color_hackney_pale_green
+body_text_color = color_black
+
+header_background_color = color_black
+header_text_color = color_white
+
+secondary_column_background_color = color_white
+
+button_background_color = color_hackney_dark_green
+button_text_color = color_white
+
+logo_file = 'hackney-logo-white.png'
+logo_width = "200" # pixel measurement, but without 'px' suffix
+logo_height = "36" # pixel measurement, but without 'px' suffix
+header_padding = "20px 30px"
+
+%]
diff --git a/templates/email/hackney/_email_setting_overrides.html b/templates/email/hackney/_email_setting_overrides.html
new file mode 100644
index 000000000..00eeed9cc
--- /dev/null
+++ b/templates/email/hackney/_email_setting_overrides.html
@@ -0,0 +1,7 @@
+[%
+
+only_column_style = "$only_column_style border: 1px solid $column_divider_color; border-top: none;"
+primary_column_style = "$primary_column_style border: 1px solid $column_divider_color; border-top: none;"
+secondary_column_style = "vertical-align: top; width: 50%; background-color: $secondary_column_background_color; color: $secondary_column_text_color; border: 1px solid $column_divider_color; border-top: none; border-left: none;"
+
+%]
diff --git a/templates/email/hackney/signature.txt b/templates/email/hackney/signature.txt
new file mode 100644
index 000000000..78a02659f
--- /dev/null
+++ b/templates/email/hackney/signature.txt
@@ -0,0 +1,2 @@
+
+Hackney Council
diff --git a/templates/email/hackney/site-name.txt b/templates/email/hackney/site-name.txt
new file mode 100644
index 000000000..29d7f1480
--- /dev/null
+++ b/templates/email/hackney/site-name.txt
@@ -0,0 +1 @@
+Report A Problem
diff --git a/templates/web/base/admin/reports/edit.html b/templates/web/base/admin/reports/edit.html
index d2b866d01..6e7cff4cf 100644
--- a/templates/web/base/admin/reports/edit.html
+++ b/templates/web/base/admin/reports/edit.html
@@ -131,7 +131,20 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a>
 <li><label class="inline-text" for="category">[% loc('Category:') %]</label>
     [% INCLUDE 'admin/report-category.html' %]
 </li>
-<li>[% loc('Extra data:') %] [% IF extra_fields.size %]<ul>[% FOREACH field IN extra_fields %]<li><strong>[% field.name %]</strong>: [% field.val %]</li>[% END %]</ul>[% ELSE %]No[% END %]</li>
+<li>[% loc('Extra data:') ~%]
+    [%~ IF extra_fields.size ~%]
+        <ul>
+        [%~ FOREACH field IN extra_fields ~%]
+            <li><strong>[%~ field.name ~%]</strong>: [% IF field.val.0.defined ~%]
+                    [%~ field.val.list.join(", ") ~%]
+                [%~ ELSE ~%]
+                    [%~ field.val ~%]
+                [%~ END ~%]
+            </li>
+        [%~ END ~%]
+        </ul>
+    [%~ ELSE %] No[% END ~%]
+</li>
 <li><label class="inline-text" for="anonymous">[% loc('Anonymous:') %]</label>
 <select class="form-control" name="anonymous"  id="anonymous">
 <option [% 'selected ' IF problem.anonymous %]value="1">[% loc('Yes') %]</option>
diff --git a/templates/web/fixmystreet-uk-councils/about/privacy.html b/templates/web/fixmystreet-uk-councils/about/privacy.html
index 4a5ed9d2c..1290ee7fb 100644
--- a/templates/web/fixmystreet-uk-councils/about/privacy.html
+++ b/templates/web/fixmystreet-uk-councils/about/privacy.html
@@ -231,6 +231,11 @@ When you make a report
 </h2>
 
 <p>
+[% IF c.cobrand.moniker == 'hackney' %]
+    In using FixMyStreet for any of the functions listed above (sending a
+    report, leaving an update, email alerts or site registration), we are
+    processing your data under the legal basis 6(1)(a) – consent.
+[% ELSE %]
     In using FixMyStreet for any of the functions listed above (sending a
     report, leaving an update, email alerts or site registration), we are
     processing your data under the legal basis 6(1)(f) – legitimate interests.
@@ -243,6 +248,7 @@ When you make a report
     communities, so it's easy to see what the common problems are in a given
     area, and how quickly they get fixed. Other local residents can browse, read
     and comment on problems – and perhaps even offer a solution.
+[% END %]
 </p>
 
 <h2>
diff --git a/templates/web/hackney/around/intro.html b/templates/web/hackney/around/intro.html
new file mode 100644
index 000000000..d4510ac9a
--- /dev/null
+++ b/templates/web/hackney/around/intro.html
@@ -0,0 +1,5 @@
+            <div id="postcode-intro">
+                <h1> Report, view, or discuss local problems</h1>
+                <h2> (like potholes, fly tipping, broken paving slabs, or street lighting) </h2>
+            </div>
+
diff --git a/templates/web/hackney/auth/general.html b/templates/web/hackney/auth/general.html
new file mode 100644
index 000000000..1a9e4a060
--- /dev/null
+++ b/templates/web/hackney/auth/general.html
@@ -0,0 +1,88 @@
+[% INCLUDE 'header.html', bodyclass='authpage', title = loc('Sign in or create an account') %]
+
+<h1>
+    [% loc('Sign in') %]
+    <small>
+        [% tprintf(loc('or <a href="%s">create an account</a>'), '/auth/create') %]
+    </small>
+</h1>
+
+[% TRY %][% INCLUDE 'auth/_general_top.html' %][% CATCH file %][% END %]
+
+[% IF oauth_need_email %]
+    <p class="form-error">[% loc('We need your email address, please give it below.') %]</p>
+[% END %]
+[% IF oauth_failure %]
+    <p class="form-error">[% loc('Sorry, we could not log you in. Please fill in the form below.') %]</p>
+[% END %]
+
+<form action="/auth" method="post" name="general_auth" class="validate">
+    <fieldset>
+
+        <input type="hidden" name="r" value="[% c.req.params.r | html %]">
+
+        [% loc_username_error = INCLUDE 'auth/_username_error.html' default='email' %]
+
+[% IF c.config.SMS_AUTHENTICATION %]
+    [% SET username_label = loc('Your email or mobile') %]
+[% ELSE %]
+    [% SET username_label = loc('Your email') %]
+[% END %]
+
+        <label class="n" for="username">[% username_label %]</label>
+      [% IF loc_username_error %]
+        <div class="form-error">[% loc_username_error %]</div>
+      [% END %]
+        <input type="text" class="form-control required" id="username" name="username" value="[% username | html %]" autocomplete="username"
+        [%~ IF c.cobrand.moniker != 'borsetshire' %] autofocus[% END %]>
+
+        <div id="form_sign_in">
+          [% IF oauth_need_email %]
+            [% INCLUDE form_sign_in_no %]
+            <input type="hidden" name="oauth_need_email" value="1">
+          [% ELSE %]
+            [% INCLUDE form_sign_in_yes %]
+            [% INCLUDE form_sign_in_no %]
+            [% INCLUDE form_sign_in_hackney_staff %]
+          [% END %]
+        </div>
+    </fieldset>
+</form>
+
+[% INCLUDE 'footer.html' %]
+
+[% BLOCK form_sign_in_yes %]
+    <p class="hidden-nojs js-sign-in-password-hide">
+        <input class="btn btn--primary btn--block js-sign-in-password-btn" type="submit" name="sign_in_by_password" value="[% loc('Sign in with a password') %]">
+    </p>
+    <div class="hidden-js js-sign-in-password">
+        <label for="password_sign_in">[% loc('Your password') %]</label>
+
+        <div class="form-txt-submit-box">
+            <input type="password" name="password_sign_in" class="form-control" id="password_sign_in" value="" autocomplete="current-password">
+            <input class="green-btn" type="submit" name="sign_in_by_password" value="[% loc('Sign in') %]">
+        </div>
+
+        <p>
+            <a href="/auth/forgot">[% loc('Forgotten your password?') %]</a>
+        </p>
+    </div>
+[% END %]
+
+[% BLOCK form_sign_in_no %]
+    <p><input class="fake-link" type="submit" name="sign_in_by_code" value="
+      [%~ IF c.config.SMS_AUTHENTICATION %]
+        [%~ loc('Email me a link or text me a code to sign in') %]
+      [%~ ELSE %]
+        [%~ loc('Email me a link to sign in') %]
+      [%~ END ~%]
+      "></p>
+[% END %]
+
+[% BLOCK form_sign_in_hackney_staff %]
+  [% IF c.cobrand.feature('oidc_login') %]
+      <button name="social_sign_in" id="oidc_sign_in" value="oidc" class="fake-link sso-staff-sign-in">
+          Hackney Staff Sign-in
+      </button>
+  [% END %]
+[% END %]
+\ No newline at end of file
diff --git a/templates/web/hackney/footer_extra.html b/templates/web/hackney/footer_extra.html
new file mode 100644
index 000000000..1e7c53aad
--- /dev/null
+++ b/templates/web/hackney/footer_extra.html
@@ -0,0 +1,10 @@
+ <div class="hackney-footer">
+    <div class="container">
+        <a href="https://hackney.gov.uk/" alt="Hackney.gov.uk" class="hackney-footer__logo">Hackney</a>
+        [% IF NOT bodyclass.match('mappage') %]
+            <p class="footer-powered-by">
+            Powered by <a class="platform-logo" href="https://www.fixmystreet.com/pro/">FixMyStreet Platform</a>
+            </p>
+        [% END %]
+    </div>
+</div>
+\ No newline at end of file
diff --git a/templates/web/hackney/footer_extra_js.html b/templates/web/hackney/footer_extra_js.html
new file mode 100644
index 000000000..61b8dacea
--- /dev/null
+++ b/templates/web/hackney/footer_extra_js.html
@@ -0,0 +1,7 @@
+[%
+IF bodyclass.match('mappage');
+  scripts.push(
+    version('/cobrands/fixmystreet-uk-councils/alloy.js'),
+  );
+END %]
+[% PROCESS 'footer_extra_js_base.html' highways=1 tfl=1 cobrand_js=1 validation=1 %]
diff --git a/templates/web/hackney/header_extra.html b/templates/web/hackney/header_extra.html
new file mode 100644
index 000000000..73d214ae0
--- /dev/null
+++ b/templates/web/hackney/header_extra.html
@@ -0,0 +1,2 @@
+[% INCLUDE 'tracking_code.html' %]
+<link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,600,700&amp;display=swap" rel="stylesheet">
diff --git a/templates/web/hackney/report/form/user.html b/templates/web/hackney/report/form/user.html
new file mode 100644
index 000000000..bced8c189
--- /dev/null
+++ b/templates/web/hackney/report/form/user.html
@@ -0,0 +1,29 @@
+<!-- report/form/user.html -->
+<div class="js-new-report-user-hidden form-section-preview form-section-preview--next
+    [%~ ' hidden-nojs' IF c.user_exists OR NOT c.cobrand.social_auth_enabled %]">
+    <h2 class="form-section-heading form-section-heading--private hidden-nojs">
+        [% loc('Next:') %] [% loc('Tell us about you') %]
+    </h2>
+  <button type="button" class="btn btn--block hidden-nojs js-new-report-user-show">[% loc('Continue') %]</button>
+[% IF NOT c.user_exists AND c.cobrand.feature('oidc_login') %]
+  <button name="social_sign_in" id="oidc_sign_in" value="oidc" class="fake-link sso-staff-sign-in">
+      Hackney Staff Sign-in
+  </button>
+[% END %]
+  <div class="js-show-if-anonymous
+    [%~ ' hidden-js' UNLESS type == 'report' AND c.cobrand.allow_anonymous_reports == 'button' %]">
+    <small id="or">[% loc('or') %]</small>
+    <button name="report_anonymously" value="yes" class="btn btn--block js-new-report-submit">[% loc('Report anonymously') %]</button>
+    <small>[% loc('No personal details will be stored, and you will not receive updates about this report.') %]</small>
+  </div>
+</div>
+
+[% IF (c.user_exists OR NOT c.cobrand.social_auth_enabled) AND type == 'report' AND c.cobrand.allow_anonymous_reports == 'button' %]
+<div class="form-section-preview form-section-preview--next hidden-js">
+    <button name="report_anonymously" value="yes" class="btn btn--block">[% loc('Report anonymously') %]</button>
+    <small>[% loc('No personal details will be stored, and you will not receive updates about this report.') %]</small>
+    <small id="or">[% loc('or') %]</small>
+</div>
+[% END %]
+
+<!-- /report/form/user.html -->
diff --git a/templates/web/hackney/site-name.html b/templates/web/hackney/site-name.html
new file mode 100644
index 000000000..29d7f1480
--- /dev/null
+++ b/templates/web/hackney/site-name.html
@@ -0,0 +1 @@
+Report A Problem
diff --git a/templates/web/hackney/tracking_code.html b/templates/web/hackney/tracking_code.html
new file mode 100644
index 000000000..ac9a5bcf4
--- /dev/null
+++ b/templates/web/hackney/tracking_code.html
@@ -0,0 +1,11 @@
+[% IF c.config.BASE_URL == "https://www.fixmystreet.com" %]
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-171536255-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-171536255-1');
+</script>
+[% END %]