Merge branch 'borsetshire-pro-changes'

18 files changed, 97 insertions, 22 deletions

diff --git a/templates/web/base/open311/index.html b/templates/web/base/open311/index.html
index 2a8044a54..68f83c445 100644
--- a/templates/web/base/open311/index.html
+++ b/templates/web/base/open311/index.html
@@ -40,8 +40,8 @@ about future-proofing your communication channels in an easy and economical way
 
 [% IF c.cobrand.moniker == 'fixmystreet' %]
 <p>You may be interested to know about <a
-href="https://www.fixmystreet.com/about/professional">FixMyStreet
-Professional</a>, our hosted service which sits seamlessly on your council
+href="https://www.fixmystreet.com/pro/">FixMyStreet
+Pro</a>, our hosted service which sits seamlessly on your council
 website.</p>
 
 <p>We can integrate it with any council back-end system, but if you use
diff --git a/templates/web/borsetshire/front/footer-marketing.html b/templates/web/borsetshire/front/footer-marketing.html
index 78b4fa89b..7f1f3515a 100644
--- a/templates/web/borsetshire/front/footer-marketing.html
+++ b/templates/web/borsetshire/front/footer-marketing.html
@@ -1,6 +1,6 @@
 <div class="fms-pro-promo">
-    <h2>FixMyStreet Professional</h2>
+    <h2>FixMyStreet Pro</h2>
     <p class="lead">The one-stop street reporting service for councils.</p>
     <p>Integrate FixMyStreet with your council system for smooth, end-to-end report fullfilment.</p>
-    <p><a href="/about/professional" class="btn--borsetshire">Learn more</a></p>
+    <p><a href="https://www.fixmystreet.com/pro/" class="btn--borsetshire">Learn more</a></p>
 </div>
diff --git a/templates/web/borsetshire/header_site.html b/templates/web/borsetshire/header_site.html
index 51f42881b..6db1f950e 100644
--- a/templates/web/borsetshire/header_site.html
+++ b/templates/web/borsetshire/header_site.html
@@ -1,3 +1,14 @@
+<div class="ms-header clearfix">
+    <div class="container">
+        <div class="ms-header__logo">
+            <a href="https://www.mysociety.org/">mySociety</a>
+        </div>
+        <a class="ms-header__back-to-fms" href="https://www.fixmystreet.com/pro/">
+            Get <strong>FixMyStreet Pro</strong> – the one-stop street reporting service for councils
+        </a>
+    </div>
+</div>
+
 <header id="site-header" role="banner">
     <div class="container">
         [% INCLUDE 'header_logo.html' %]
diff --git a/templates/web/bromley/front/footer-marketing.html b/templates/web/bromley/front/footer-marketing.html
index c519eba66..189547091 100644
--- a/templates/web/bromley/front/footer-marketing.html
+++ b/templates/web/bromley/front/footer-marketing.html
@@ -12,7 +12,7 @@
 
     <div id="footer-help">
         <p>
-        Powered by <a class="platform-logo" href="https://www.fixmystreet.com/about/professional">FixMyStreet Platform</a>
+        Powered by <a class="platform-logo" href="https://www.fixmystreet.com/pro/">FixMyStreet Platform</a>
         </p>
     </div>
 </div>
diff --git a/templates/web/eastherts/footer.html b/templates/web/eastherts/footer.html
index 59d998959..e8a54e462 100644
--- a/templates/web/eastherts/footer.html
+++ b/templates/web/eastherts/footer.html
@@ -41,7 +41,7 @@
 					<p>&copy; 2017 mySociety</p>
 				</div>
 				<div class="footer__goss">
-					<a href="https://www.fixmystreet.com/about/professional">Powered by FixMyStreet</a>
+					<a href="https://www.fixmystreet.com/pro/">Powered by FixMyStreet</a>
 				</div>
 			</div>
 		</div>
diff --git a/templates/web/fixmystreet.com/about/council-dashboard.html b/templates/web/fixmystreet.com/about/council-dashboard.html
index 7acaee207..c109b612f 100644
--- a/templates/web/fixmystreet.com/about/council-dashboard.html
+++ b/templates/web/fixmystreet.com/about/council-dashboard.html
@@ -6,7 +6,7 @@
 [% IF no_body_found %]
 
 [% INCLUDE header.html
-    title = 'FixMyStreet Professional', bodyclass = 'fullwidthpage'
+    title = 'FixMyStreet Pro', bodyclass = 'fullwidthpage'
 %]
 
 <div class="confirmation-header confirmation-header--inbox">
@@ -17,12 +17,12 @@
 [% ELSE %]
 
 [% INCLUDE header.html
-    title = 'FixMyStreet Professional', bodyclass = 'fms-for-councils fullwidthpage'
+    title = 'FixMyStreet Pro', bodyclass = 'fms-for-councils fullwidthpage'
 %]
 
 <div class="fixed-container">
   <div class="council-header">
-    <h1 class="councils-logo">FixMyStreet Professional</h1>
+    <h1 class="councils-logo">FixMyStreet Pro</h1>
   </div>
   <div class="councils-hero">
     <div class="councils-hero__demo-access">
diff --git a/templates/web/fixmystreet.com/about/faq-en-gb.html b/templates/web/fixmystreet.com/about/faq-en-gb.html
index 4bc98f7df..0d6b95523 100755
--- a/templates/web/fixmystreet.com/about/faq-en-gb.html
+++ b/templates/web/fixmystreet.com/about/faq-en-gb.html
@@ -357,7 +357,7 @@ categories if you wish.
 <p>FixMyStreet reports usually come by email. If you reply to the email in your
 normal way, your response will go directly into the user's inbox.
 <p>Your reply is not published on the FixMyStreet website (unless you are a
-FixMyStreet Professional customer who has chosen this option – see 'Can
+FixMyStreet Pro customer who has chosen this option – see 'Can
 FixMyStreet connect directly with council systems?', below).
 </dd>
 
@@ -397,11 +397,11 @@ FixMyStreet about as easy to use as possible.
 <dt>FixMyStreet is better than our own reporting system</dt>
 <dd>
 <p>Then why not replace it with FixMyStreet? We now offer a <a
-href="/about/professional">complete fault-reporting solution for councils</a>, that
+href="/pro/">complete fault-reporting solution for councils</a>, that
 integrates with your own website.
 <p>It has all the benefits of FixMyStreet's focus on usability, and is a
 robust, economical, cloud-based option.
-<p><a href="/council">Read case studies here</a>.
+<p><a href="/pro/">Read case studies here</a>.
 </dd>
 
 </dl>
diff --git a/templates/web/fixmystreet.com/contact/blurb.html b/templates/web/fixmystreet.com/contact/blurb.html
index 27412f894..28f6f45a9 100644
--- a/templates/web/fixmystreet.com/contact/blurb.html
+++ b/templates/web/fixmystreet.com/contact/blurb.html
@@ -12,7 +12,7 @@ please <a href="/">go to the front page</a> and follow the instructions.') %]
 
 <h4>From a UK Local Council and interested in finding out about FixMyStreet Pro?</h4>
 <p>
- Please get in touch <a href="/about/professional#order">via our sales enquiry form</a>
+ Please look at our <a href="/pro/">dedicated site</a>.
 </p>
 
 <h3>Send a message to FixMyStreet's technical support team</h3>
diff --git a/templates/web/fixmystreet.com/footer_extra.html b/templates/web/fixmystreet.com/footer_extra.html
index 6edf23b9f..e958ca35c 100644
--- a/templates/web/fixmystreet.com/footer_extra.html
+++ b/templates/web/fixmystreet.com/footer_extra.html
@@ -31,7 +31,7 @@
                             %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>
                     </ul>
                     <ul>
-                        <li><a href="/about/professional">FixMyStreet Professional</a></li>
+                        <li><a href="/pro/">FixMyStreet Pro</a></li>
                         <li><[% IF c.req.uri.path == '/posters' %]span[% ELSE %]a href="[% base %]/posters"[% END
                             %]>[% loc("FixMyStreet Goodies") %]</[% c.req.uri.path == '/posters' ? 'span' : 'a' %]></li>
                         <li><[% IF c.req.uri.path == '/contact' %]span[% ELSE %]a href="[% base %]/contact"[% END
diff --git a/templates/web/fixmystreet.com/front/footer-marketing.html b/templates/web/fixmystreet.com/front/footer-marketing.html
index fa9c188d0..2d1acc084 100644
--- a/templates/web/fixmystreet.com/front/footer-marketing.html
+++ b/templates/web/fixmystreet.com/front/footer-marketing.html
@@ -1,8 +1,8 @@
 <div class="fms-pro-promo">
-    <h2>FixMyStreet Professional</h2>
+    <h2>FixMyStreet Pro</h2>
     <p class="lead">The one-stop street reporting service for councils.</p>
     <p>Integrate FixMyStreet with your council system for smooth, end-to-end report fullfilment.</p>
-    <p><a href="/about/professional" class="btn">Learn more</a></p>
+    <p><a href="/pro/" class="btn">Learn more</a></p>
 </div>
 
 <div class="footer-marketing">
diff --git a/templates/web/fixmystreet.com/report/_report_meta_info.html b/templates/web/fixmystreet.com/report/_report_meta_info.html
index f0b3503b9..2eab84c9e 100644
--- a/templates/web/fixmystreet.com/report/_report_meta_info.html
+++ b/templates/web/fixmystreet.com/report/_report_meta_info.html
@@ -1,6 +1,6 @@
 [% problem.meta_line(c) | html %]
 [% IF c.cobrand.moniker != problem.get_cobrand_logged.moniker AND problem.get_cobrand_logged.is_council %]
-    using <a href="https://www.fixmystreet.com/about/professional">FixMyStreet Professional</a>
+    using <a href="https://www.fixmystreet.com/pro/">FixMyStreet Pro</a>
 [% END %]
 [% IF c.user_exists AND c.user.id == problem.user_id AND !problem.anonymous %]
     <small>(<a href="/my/anonymize?problem=[% problem.id | uri %]" class="js-hide-name">[% loc('Hide your name?') %]</a>)</small>
diff --git a/templates/web/greenwich/front/footer-marketing.html b/templates/web/greenwich/front/footer-marketing.html
index 773314aa9..c8b4ae416 100644
--- a/templates/web/greenwich/front/footer-marketing.html
+++ b/templates/web/greenwich/front/footer-marketing.html
@@ -13,7 +13,7 @@
 
     <div id="footer-help">
         <p>
-        Powered by <a class="platform-logo" href="https://www.fixmystreet.com/about/professional">FixMyStreet Platform</a>
+        Powered by <a class="platform-logo" href="https://www.fixmystreet.com/pro/">FixMyStreet Platform</a>
         </p>
     </div>
 </div>
diff --git a/templates/web/hart/footer.html b/templates/web/hart/footer.html
index 01cf76f9d..5a53fb978 100644
--- a/templates/web/hart/footer.html
+++ b/templates/web/hart/footer.html
@@ -96,7 +96,7 @@
             <strong>©</strong>
             <a href="http://www.hart.gov.uk/disclaimer" title="More information on the Disclaimer" class="hart">Hart District Council</a>
           </p>
-          <a href="https://www.fixmystreet.com/about/professional">Powered by <img src="/cobrands/hart/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a>
+          <a href="https://www.fixmystreet.com/pro/">Powered by <img src="/cobrands/hart/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a>
         </div>
       </div>
     </footer>
diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html
index b7e3d9829..7dd6b6254 100644
--- a/templates/web/oxfordshire/footer.html
+++ b/templates/web/oxfordshire/footer.html
@@ -12,7 +12,7 @@
                 <div id="main-nav" role="navigation">
                     [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area omit_wrapper=1 hide_privacy_link=1 %]
                     <ul class="nav-menu">
-                        <li><a id="mysoc-logo" href="https://www.fixmystreet.com/about/professional">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li>
+                        <li><a id="mysoc-logo" href="https://www.fixmystreet.com/pro/">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li>
                     </ul>
                 </div>
             </div>
diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html
index c2944e97b..d276094c1 100644
--- a/templates/web/stevenage/footer.html
+++ b/templates/web/stevenage/footer.html
@@ -19,7 +19,7 @@
                                     </li>
                                     <li>
                                         <h4>[% loc('Are you from a council?') %]</h4>
-                                        <p>[% loc('Would you like better integration with FixMyStreet? <a href="https://www.fixmystreet.com/about/professional">Find out about FixMyStreet Professional</a>.') %]</p>
+                                        <p>[% loc('Would you like better integration with FixMyStreet? <a href="https://www.fixmystreet.com/pro/">Find out about FixMyStreet Pro</a>.') %]</p>
                                     </li>
                                 </ul>
                             </div>
diff --git a/web/cobrands/borsetshire/_council-header.scss b/web/cobrands/borsetshire/_council-header.scss
index 73d531489..750c11ce0 100644
--- a/web/cobrands/borsetshire/_council-header.scss
+++ b/web/cobrands/borsetshire/_council-header.scss
@@ -1,5 +1,5 @@
 .nav-wrapper {
-    top: 5em;
+    top: 7.5em;
 }
 
 #main-nav {
diff --git a/web/cobrands/borsetshire/_mysoc-header.scss b/web/cobrands/borsetshire/_mysoc-header.scss
new file mode 100644
index 000000000..f1143736c
--- /dev/null
+++ b/web/cobrands/borsetshire/_mysoc-header.scss
@@ -0,0 +1,62 @@
+// Adapted from .ms-header component in FMS Pro WordPress theme.
+
+.ms-header {
+    background-color: #3B3F44;
+    color: #fff;
+}
+
+.ms-header__logo,
+.ms-header__back-to-fms {
+    box-sizing: border-box;
+    margin: 10px 0;
+}
+
+.ms-header__logo {
+    @media (min-width: 48em) {
+        float: right;
+        width: 25%;
+    }
+    padding-left: 1em;
+
+    a {
+        display: block;
+        width: 101px;
+        height: 0;
+        padding-top: 21px;
+        overflow: hidden;
+        background: transparent;
+        background-position: 0 0;
+        background-repeat: no-repeat;
+        background-size: 101px 21px;
+        @include svg-background-image('../fixmystreet.com/images/mysoc-footer/logo-mysociety');
+
+        // Centre on narrow screens, right align on wider screens.
+        margin: 0 auto;
+        @media (min-width: 48em) {
+            margin-right: 0;
+        }
+    }
+}
+
+.ms-header__back-to-fms {
+    @media (min-width: 48em) {
+        width: 75%;
+        float: left;
+    }
+
+    padding-right: 1em;
+
+    display: block; // .ms-header__back-to-fms is an <a> element
+
+    color: #ddd;
+    font-size: 0.875em;
+
+    &:visited {
+        color: #ddd;
+    }
+    &:hover,
+    &:focus {
+        color: #fff;
+        text-decoration: none;
+    }
+}
diff --git a/web/cobrands/borsetshire/base.scss b/web/cobrands/borsetshire/base.scss
index a92d54427..10973fea2 100644
--- a/web/cobrands/borsetshire/base.scss
+++ b/web/cobrands/borsetshire/base.scss
@@ -115,3 +115,5 @@ body.authpage {
 .btn--borsetshire {
   @include button-reset($text: #000, $hover-text: #000);
 }
+
+@import "mysoc-header";