Merge branch 'issues/commercial/864-update-contact-form'

4 files changed, 29 insertions, 8 deletions

diff --git a/templates/web/base/contact/blurb.html b/templates/web/base/contact/blurb.html
index 3f9e88ed0..1142dc874 100644
--- a/templates/web/base/contact/blurb.html
+++ b/templates/web/base/contact/blurb.html
@@ -1,9 +1,3 @@
-[% 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>
diff --git a/templates/web/base/contact/index.html b/templates/web/base/contact/index.html
index f24f8afea..dfd3ef6b2 100644
--- a/templates/web/base/contact/index.html
+++ b/templates/web/base/contact/index.html
@@ -77,13 +77,17 @@
         [% END %]
         <input type="text" class="form-control required" name="name" id="form_name" value="[% form_name | html %]" size="30">
 
-
         <label for="form_email">[% loc('Your email') %]</label>
         [% IF field_errors.em %]
            <div class="form-error">[% field_errors.em %]</div>
         [% END %]
         <input type="text" class="form-control required email" name="em" id="form_email" value="[% em | html %]" size="30">
 
+        <div class="form-group">
+          <label for="form_phone">[% loc('Your phone number') %]</label>
+          <span class="required-text required-text--optional">optional</span>
+          <input type="text" class="form-control extra.phone" name="extra.phone" id="form_phone" value="" size="30">
+        </div>
 
         <label for="form_subject">[% loc('Subject') %]</label>
         [% IF field_errors.subject %]
@@ -100,7 +104,7 @@
         <textarea class="form-control required" name="message" id="form_message" rows="7" cols="50">[% message | html %]</textarea>
 
 
-        <input class="final-submit green-btn" type="submit" value="[% loc('Post') %]">
+        <input class="final-submit green-btn" type="submit" value="[% loc('Send') %]">
 
     </fieldset>
 </form>
diff --git a/templates/web/fixmystreet.com/about/council.html b/templates/web/fixmystreet.com/about/council.html
index d36421fef..062a66a21 100644
--- a/templates/web/fixmystreet.com/about/council.html
+++ b/templates/web/fixmystreet.com/about/council.html
@@ -659,6 +659,11 @@
         <p class="form-note">Ending in .gov.uk</p>
       </div>
       <div class="form-group">
+        <label for="extra.phone">Contact phone number</label>
+        <span class="required required--optional">optional</span>
+        <input type="text" name="extra.phone" id="extra.phone">
+      </div>
+      <div class="form-group">
         <label for="email-newsletter" class="checkbox-label"> <input type="checkbox" name="extra.newsletter" value="Sign me up to the Better Cities newsletter" id="email-newsletter" class="checkbox-input"> Sign up for the Better Cities newsletter for news and insights on smarter technology for councils.</label>
       </div>
       <div class="form-group submit-group">
diff --git a/templates/web/fixmystreet.com/contact/blurb.html b/templates/web/fixmystreet.com/contact/blurb.html
new file mode 100644
index 000000000..1f25aa795
--- /dev/null
+++ b/templates/web/fixmystreet.com/contact/blurb.html
@@ -0,0 +1,18 @@
+<h4>If you have questions about FixMyStreet</h4>
+
+<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 this site, not a council. To report a problem,
+please <a href="/">go to the front page</a> and follow the instructions.') %]
+</p>
+
+<h4>From a UK Local Council and interested in finding out about FixMyStreet Pro?</h4>
+<p>
+ Please get in touch <a href="/about/council#order">via our sales enquiry form</a>
+</p>
+
+<h3>Send a message to FixMyStreet's technical support team</h3>