9 files changed, 12 insertions, 28 deletions
diff --git a/templates/web/base/report/new/form_report.html b/templates/web/base/report/new/form_report.html
index e85d890c9..1d1a0e289 100644
--- a/templates/web/base/report/new/form_report.html
+++ b/templates/web/base/report/new/form_report.html
@@ -22,6 +22,8 @@
 [% END %]
     <input class="form-control" type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="[% loc('10 inch pothole on Example St, near post box') %]" required>
 
+[% TRY %][% PROCESS 'report/new/after_title.html' %][% CATCH file %][% END %]
+
 [% IF c.cobrand.allow_photo_upload %]
     <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
     <label for="form_photo">
diff --git a/templates/web/fixamingata/about/faq-sv.html b/templates/web/fixamingata/about/faq-sv.html
index aea90743b..05ffdaddc 100755
--- a/templates/web/fixamingata/about/faq-sv.html
+++ b/templates/web/fixamingata/about/faq-sv.html
@@ -21,8 +21,6 @@ markera problemen på en karta. Tjänsten bygger på en förlaga från Storbrita
 där tjänsten lanserades i Februari 2007. I Norge lanserades den 2011 och i
 Sverige 2013.
 </dd>
-        <dt>Hur kan jag lämna ett förbättringsförslag kring FixaMinGata?</dt>
-        <dd>Lämna ditt förslag <a href="javascript:UserVoice.showPopupWidget();">här</a>.</dd>
         <dt>Hur kommer jag i kontakt med FixaMinGata?</dt>
         <dd>Använd vårt <a href="/contact">kontaktformulär</a>.</dd>
         <dt>Vilken typ av problem ska jag rapportera i FixaMinGata?</dt>
diff --git a/templates/web/fixamingata/footer.html b/templates/web/fixamingata/footer.html
index 7fd490129..ad4d6c4a6 100644
--- a/templates/web/fixamingata/footer.html
+++ b/templates/web/fixamingata/footer.html
@@ -21,7 +21,6 @@
                             %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
                         %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
                             %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
-                          <!-- <li><a href="javascript:UserVoice.showPopupWidget();">Lämna förslag</a></li> -->
                     </ul>
                 </div>
             </div>
@@ -29,15 +28,6 @@
     </div> <!-- .wrapper -->
 
     [% INCLUDE 'common_footer_tags.html' %]
-
-<script type="text/javascript">
-  var uvOptions = {};
-  (function() {
-    var uv = document.createElement('script'); uv.type = 'text/javascript'; uv.async = true;
-    uv.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'widget.uservoice.com/vflswzMnwvfytYBz1rNw.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(uv, s);
-  })();
-</script>
 </body>
 
 </html>
diff --git a/templates/web/fixamingata/front/tips.html b/templates/web/fixamingata/front/tips.html
index fd309708f..038343d90 100644
--- a/templates/web/fixamingata/front/tips.html
+++ b/templates/web/fixamingata/front/tips.html
@@ -1 +1 @@
-<div style="height: 329px; padding-top: 20px;"><iframe width="100%" height="329" src="//www.youtube.com/embed/H5knzdalYI0" frameborder="0" allowfullscreen></iframe></div>
+<div style="height: 329px; padding-top: 20px;"><iframe width="100%" height="329" src="//www.youtube.com/embed/uyiRyuIV0qY" frameborder="0" allowfullscreen></iframe></div>
diff --git a/templates/web/fixamingata/header_opengraph_image.html b/templates/web/fixamingata/header_opengraph_image.html
index 7ec1aabb0..7a681484a 100644
--- a/templates/web/fixamingata/header_opengraph_image.html
+++ b/templates/web/fixamingata/header_opengraph_image.html
@@ -1,4 +1,4 @@
-        <meta property="og:image" content="[% c.cobrand.base_url %]/cobrands/fixmystreet/images/fms-og_image.jpg">
+        <meta property="og:image" content="[% c.cobrand.base_url %]/cobrands/fixamingata/images/fms-og_image.jpg">
         <meta property="og:image:type" content="image/jpeg">
         <meta property="og:image:width" content="1200">
         <meta property="og:image:height" content="630">
diff --git a/templates/web/fixamingata/report/new/after_title.html b/templates/web/fixamingata/report/new/after_title.html
new file mode 100644
index 000000000..ff38624f5
--- /dev/null
+++ b/templates/web/fixamingata/report/new/after_title.html
@@ -0,0 +1,8 @@
+<div class="description_tips" aria-label="Allmänna riktlinjer kring rapporter">
+    <ul class="do">
+        <li>Rapportera endast fysiska problem som kan åtgärdas</li>
+    </ul>
+    <ul class="dont">
+        <li>Använd inte FixaMinGata för rena synpunkter och förslag</li>
+    </ul>
+</div>
diff --git a/templates/web/fixamingata/report/new/inline-tips.html b/templates/web/fixamingata/report/new/inline-tips.html
index 4fab9c81c..5bce67257 100644
--- a/templates/web/fixamingata/report/new/inline-tips.html
+++ b/templates/web/fixamingata/report/new/inline-tips.html
@@ -8,7 +8,6 @@
     </ul>
     <ul class="dont">
         <li>Vid akut situation används inte FixaMinGata (ex. vattenläckor)</li>
-        <li>Använd inte FixaMinGata för rena synpunkter och förslag</li>
         <li>Inkludera inte privata kontaktdetaljer i beskrivningen</li>
     </ul>
 </div>
diff --git a/templates/web/fixamingata/report/new/notes.html b/templates/web/fixamingata/report/new/notes.html
deleted file mode 100644
index 9ec6b0e29..000000000
--- a/templates/web/fixamingata/report/new/notes.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<ul class="plain-list">
-[% IF all_councils.items.first > 0 %]
-    <li style="margin-bottom: 0em;">[% id = all_councils.items.first;
-           tprintf("Kom ihåg att FixaMinGata primärt är avsett för att rapportera fysiska problem som kan åtgärdas. Om ditt problem inte lämpar sig för att rapportera via den här webbsidan kan du kontakta din kommun direkt via <a href='%s'>deras webbsida</a>.", all_body_urls.$id); %]</li>
-[% ELSE %]
-    <li style="margin-bottom: 0em;">[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li>
-[% END %]
-</ul>
diff --git a/templates/web/fixamingata/report/new/sidebar.html b/templates/web/fixamingata/report/new/sidebar.html
index 972fccf53..e69de29bb 100644
--- a/templates/web/fixamingata/report/new/sidebar.html
+++ b/templates/web/fixamingata/report/new/sidebar.html
@@ -1,5 +0,0 @@
-<div id="report-a-problem-sidebar">
-    <div class="sidebar-notes">
-        [% INCLUDE 'report/new/notes.html' %]
-    </div>
-</div>