Update intro text on Open311 page (fixes #419).

3 files changed, 87 insertions, 5 deletions

diff --git a/templates/web/default/open311/index.html b/templates/web/default/open311/index.html
index 8ce18f68c..aa77a8381 100644
--- a/templates/web/default/open311/index.html
+++ b/templates/web/default/open311/index.html
@@ -1,6 +1,75 @@
-[% INCLUDE 'header.html', title => 'Open311' %]
+[% INCLUDE 'header.html', title = 'Open311', bodyclass = 'twothirdswidthpage' %]
+
+<div class="sticky-sidebar">
+    <aside>
+        <ul class="plain-list">
+            <li><a href="/faq">Frequently Asked Questions</a></li>
+            <li><a href="/faq#practical">Practical Questions</a></li>
+            <li><a href="/faq#organisation">Organisation Questions</a></li>
+            <li><a href="/privacy">Privacy and cookies</a></li>
+            <li><a href="/contact">Contact FixMyStreet</a></li>
+        </ul>
+    </aside>
+</div>
+
+<h1>FixMyStreet support for Open311</h1>
+
+<p>FixMyStreet supports Open311 both as a <a href="#client">client</a> (sending
+reports made on the site to an external service via the Open311 protocol), and
+partly as a <a href="#server">server</a> (returning reports made on the site when
+queried via the Open311 protocol).</p>
+
+<dl id="client">
+
+<dt>What is Open311?</dt>
+
+<dd>
+<p>In a nutshell, it's an international open standard that allows services to
+'talk to' council systems.</p>
+<p>As channels of communication diversify, it has become more and more
+important that council systems can recognise and accept reports from a variety
+of sources. For example, reports may come in via Twitter, SMS, email, services
+like FixMyStreet, and the council's own website.</p>
+</dd>
+
+<dt>Where can I find out more?</dt>
+
+<dd>
+<p>Open311 isn't as widely known as it deserves to be, so we wrote a
+<a href="http://www.mysociety.org/2013/01/10/open311-introduced/">short
+series of blog posts</a> to explain the basics. And you can find out lots more at
+<a href="http://open311.org/">open311.org</a>.</p>
+</dd>
+
+<dt>Why does it matter?</dt>
+
+<dd>
+<p>If you oversee problem reports at a council, you will of course be concerned
+about future-proofing your communication channels in an easy and economical way
+&ndash; Open311 gives you that assurance.</p>
+
+[% IF c.cobrand.moniker == 'fixmystreet' %]
+<p>You may be interested to know about <a
+href="http://www.google.com/url?q=http%3A%2F%2Fwww.mysociety.org%2Ffor-councils%2Ffixmystreet%2F&sa=D&sntz=1&usg=AFQjCNHo4eT2yOopyZ-39zz16jC-Faa5gQ">FixMyStreet
+for Councils</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
+Open311, we charge less. That's how much we believe it's the sane way forward
+for council problem-reporting systems.</p>
+[% END %]
+
+<dt>Any questions?</dt>
+
+<dd>
+<p>We're always happy to talk. Just <a href="/contact">drop us a line</a>.</p>
+</dd>
+
+</dl>
+
+<hr>
 
-<h1>[% loc('Open311 API for the mySociety FixMyStreet server') %]</h1>
+<h2 id="server">[% loc('Open311 API for the mySociety FixMyStreet server') %]</h2>
 
 [% IF error %]
 <p>[% tprintf( loc('Note: <strong>%s</strong>'), error ) %]</p>
diff --git a/templates/web/fixmystreet/contact/index.html b/templates/web/fixmystreet/contact/index.html
index f6648ab37..dfef39b9f 100644
--- a/templates/web/fixmystreet/contact/index.html
+++ b/templates/web/fixmystreet/contact/index.html
@@ -1,9 +1,21 @@
 [% INCLUDE 'header.html',
     title = loc('Contact Us')
     robots = 'noindex,nofollow'
-    bodyclass => 'twothirdswidthpage'
+    bodyclass = 'twothirdswidthpage'
 %]
 
+<div class="sticky-sidebar">
+    <aside>
+        <ul class="plain-list">
+            <li><a href="/faq">Frequently Asked Questions</a></li>
+            <li><a href="/faq#practical">Practical Questions</a></li>
+            <li><a href="/faq#organisation">Organisation Questions</a></li>
+            <li><a href="/privacy">Privacy and cookies</a></li>
+            <li><strong>Contact FixMyStreet</strong></li>
+        </ul>
+    </aside>
+</div>
+
 <h1>[% loc('Contact the team') %]</h1>
  
 <form method="post" action="/contact/submit" class="validate">
diff --git a/templates/web/fixmystreet/static/privacy.html b/templates/web/fixmystreet/static/privacy.html
index 92e096ef4..b280624ae 100755
--- a/templates/web/fixmystreet/static/privacy.html
+++ b/templates/web/fixmystreet/static/privacy.html
@@ -1,12 +1,13 @@
-[% INCLUDE 'header.html', title => loc('Frequently Asked Questions'), bodyclass => 'twothirdswidthpage' %]
+[% INCLUDE 'header.html', title = loc('Frequently Asked Questions'), bodyclass = 'twothirdswidthpage' %]
 
 <div class="sticky-sidebar">
     <aside>
         <ul class="plain-list">
-            <li><a href="/faq#faq">Frequently Asked Questions</a></li>
+            <li><a href="/faq">Frequently Asked Questions</a></li>
             <li><a href="/faq#practical">Practical Questions</a></li>
             <li><a href="/faq#organisation">Organisation Questions</a></li>
             <li><strong>Privacy and cookies</strong></li>
+            <li><a href="/contact">Contact FixMyStreet</a></li>
         </ul>
     </aside>
 </div>