Merge branch 'jonkri-master-new'

10 files changed, 35 insertions, 108 deletions

diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
index b68ef7cdf..4dee6dbcb 100644
--- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: fixmystreet\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-05-03 10:41+0100\n"
-"PO-Revision-Date: 2016-04-29 13:21+0000\n"
+"PO-Revision-Date: 2016-05-29 15:42+0000\n"
 "Last-Translator: Jon Kristensen <info@jonkri.com>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/mysociety/fixmystreet/language/sv_SE/)\n"
 "Language: sv_SE\n"
@@ -24,7 +24,7 @@ msgstr ""
 #: perllib/FixMyStreet/DB/Result/Problem.pm:618
 #: perllib/FixMyStreet/Script/Reports.pm:189
 msgid " and "
-msgstr "eller"
+msgstr " och "
 
 #: templates/web/base/report/new/councils_text_all.html:2
 #: templates/web/base/report/new/councils_text_none.html:12
@@ -33,7 +33,7 @@ msgstr "eller"
 #: templates/web/base/report/new/councils_text_some.html:22
 #: templates/web/base/report/new/councils_text_some.html:5
 msgid " or "
-msgstr "eller"
+msgstr " eller "
 
 #: templates/web/base/admin/edit-league.html:12
 msgid "%d edits by %s"
@@ -294,8 +294,7 @@ msgstr "Alla rapporter som CSV"
 
 #: templates/web/base/footer.html:32
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:20
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Alla rapporter"
@@ -414,14 +413,13 @@ msgstr "Efter datum"
 
 #: templates/web/base/auth/token.html:21 templates/web/base/email_sent.html:18
 msgid "Can&rsquo;t find our email? Check your spam folder&nbsp;&ndash; that&rsquo;s the solution 99% of the time."
-msgstr "Kan du inte hitta vårt e-brev? Kolla din skräppostmapp &ndash;&ndash; det är lösningen 99% av tiden."
+msgstr "Kan du inte hitta vårt e-brev? Kolla din skräppostmapp &ndash; det är lösningen 99% av tiden."
 
 #: templates/web/base/around/_report_banner.html:5
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Kan du inte se kartan? <em>Hoppa över det här steget</em>"
 
-#: templates/web/base/admin/body.html:68
-#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/body.html:68 templates/web/base/admin/index.html:54
 #: templates/web/base/report/new/category.html:7
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -589,8 +587,7 @@ msgstr "Bekräfta via epost nedan genom att ange ett nytt lösenord. När du bek
 msgid "Confirmation"
 msgstr "Bekräftelse"
 
-#: templates/web/base/admin/body.html:164
-#: templates/web/base/admin/body.html:79
+#: templates/web/base/admin/body.html:164 templates/web/base/admin/body.html:79
 #: templates/web/base/admin/category_edit.html:37
 #: templates/web/base/admin/category_edit.html:92
 #: templates/web/zurich/admin/stats.html:40
@@ -715,8 +712,7 @@ msgid "Delete template"
 msgstr "Ta bort mall"
 
 #: templates/web/base/admin/bodies.html:27
-#: templates/web/base/admin/body.html:175
-#: templates/web/base/admin/body.html:81
+#: templates/web/base/admin/body.html:175 templates/web/base/admin/body.html:81
 #: templates/web/base/admin/category_edit.html:42
 #: templates/web/base/admin/category_edit.html:93
 msgid "Deleted"
@@ -1387,10 +1383,9 @@ msgid "Loading..."
 msgstr "Laddar..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1
 #: templates/web/base/tokens/confirm_alert.html:1
 msgid "Local RSS feeds and email alerts"
 msgstr "Lokala RSS-flöden och epostbevakningar"
@@ -2094,9 +2089,8 @@ msgstr "Ange om problemet har lösts eller ej"
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:150
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:152
 #: templates/web/base/js/translation_strings.html:53
-#, fuzzy
 msgid "Please upload an image only"
-msgstr "Ladda upp en JPEG-bild"
+msgstr "Ladda upp endast en bild"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:115
 msgid "Please write a message"
@@ -2143,8 +2137,7 @@ msgstr "Personlig integritet"
 msgid "Privacy and cookies"
 msgstr "Integritetsskydd och kakor"
 
-#: templates/web/base/admin/body.html:200
-#: templates/web/base/admin/body.html:85
+#: templates/web/base/admin/body.html:200 templates/web/base/admin/body.html:85
 #: templates/web/base/admin/category_edit.html:45
 #: templates/web/base/admin/report_edit.html:77
 msgid "Private"
@@ -2782,8 +2775,7 @@ msgstr "Prenumerera med epost"
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1272
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/bodies.html:25
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
@@ -3139,7 +3131,7 @@ msgstr "Den här rapporten skickades anonymt."
 
 #: perllib/FixMyStreet/Script/Reports.pm:85
 msgid "This web page also contains a photo of the problem, provided by the user."
-msgstr "Den här sidan innehåller också ett foto av problemet"
+msgstr "Länken ovan innehåller också ett foto av problemet."
 
 #: templates/web/zurich/admin/report_edit-sdm.html:123
 #: templates/web/zurich/admin/report_edit-sdm.html:76
@@ -3331,8 +3323,7 @@ msgstr "Användarsökningen matchar mot användares namn och e-postadresser."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1277
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:69
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:69
 msgid "Users"
 msgstr "Användare"
 
@@ -3903,51 +3894,3 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "Vi har ännu <strong>ingen</strong> information om kommunen på den platsen"
 msgstr[1] "Kommunen på platsen har valt att inte ta emot rapporter från FixaMinGata."
-
-#~ msgid "%s, reported at %s"
-#~ msgstr "%s, rapporterad %s"
-
-#~ msgid "About us"
-#~ msgstr "Om oss"
-
-#~ msgid "Email me new local problems"
-#~ msgstr "Eposta mig nya problem lokalt"
-
-#~ msgid "Empty flat or maisonette"
-#~ msgstr "Tom lägenhet"
-
-#~ msgid "Empty house or bungalow"
-#~ msgstr "Tomt hus"
-
-#~ msgid "Empty office or other commercial"
-#~ msgstr "Tomt kontor eller annan kommersiell lokal"
-
-#~ msgid "Empty pub or bar"
-#~ msgstr "Tom pub eller bar"
-
-#~ msgid "Empty public building - school, hospital, etc."
-#~ msgstr "Tom publik byggnad - skola, sjukhus, etc."
-
-#~ msgid "Enter a nearby street name and area, postal code or district in Delhi"
-#~ msgstr "Ange ett närligande gatunamn och ort, postnummer och distrikt i Delhi"
-
-#~ msgid "FixMyStreet"
-#~ msgstr "FixaMinGata"
-
-#~ msgid "I am afraid you cannot confirm unconfirmed reports."
-#~ msgstr "Tyvärr kan du inte bekräfta obekräftade rapporter"
-
-#~ msgid "Problems in this area"
-#~ msgstr "Problem i detta område"
-
-#~ msgid "Property type:"
-#~ msgstr "Fastighetstyp:"
-
-#~ msgid "RSS feed of problems in this %s"
-#~ msgstr "RSS-flöde för problem i denna %s"
-
-#~ msgid "Sorry, you can not log in with Facebook. Please try again later."
-#~ msgstr "Du kunde inte logga in med Facebook. Försök gärna igen."
-
-#~ msgid "Whole block of empty flats"
-#~ msgstr "Hela block med tomma lägenheter"
diff --git a/templates/email/fixamingata/submit.txt b/templates/email/fixamingata/submit.txt
index eab487051..4704cbd56 100644
--- a/templates/email/fixamingata/submit.txt
+++ b/templates/email/fixamingata/submit.txt
@@ -12,17 +12,15 @@ tror medborgaren behöver er uppmärksamhet.
 
     [% url %]
 
-[% has_photo %]
-
 ** Uppgiftslämnare
 
 Namn: [% name %]
 
 Epost: [% email %]
 
-[% phone_line %]
+[% phone_line %]** Information om ärendet
 
-** Information om ärendet
+ID: [% id %]
 
 [% category_line %]Ärende: [% title %]
 
@@ -34,7 +32,9 @@ Epost: [% email %]
 
 Longitude: [% longitude %]
 
-[% closest_address %]----------
+** Övrigt
+
+[% has_photo %][% closest_address %]----------
 
 Svar på det här brevet kommer att skickas till den person som lämnade
 rapporten.
diff --git a/templates/web/fixamingata/about/council.html b/templates/web/fixamingata/about/council.html
index 8d968f695..3019f79ff 100755
--- a/templates/web/fixamingata/about/council.html
+++ b/templates/web/fixamingata/about/council.html
@@ -185,9 +185,7 @@ bäst.
  verksamhetssystem för att höra dig för.
 </p>
 <p>
- Vi har också tagit fram en sida med
- <a href="https://wiki.ffkp.se/index.php?title=Open311_och_annan_integration_mot_FixaMinGata">teknisk information om integration av FixaMinGata</a> som
- kan vara lämplig att titta på för mer information.
+ Kontakta gärna oss för teknisk information kring integration av FixaMinGata.
 </p>
 
 <h2><a name="kostnader"></a>Kostnader för medverkan</h2>
diff --git a/templates/web/fixamingata/about/faq-sv.html b/templates/web/fixamingata/about/faq-sv.html
index 05ffdaddc..aea90743b 100755
--- a/templates/web/fixamingata/about/faq-sv.html
+++ b/templates/web/fixamingata/about/faq-sv.html
@@ -21,6 +21,8 @@ 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 376d79ff4..a3cf589b9 100644
--- a/templates/web/fixamingata/footer.html
+++ b/templates/web/fixamingata/footer.html
@@ -21,7 +21,7 @@
                             %]>[% 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>
+                          <!-- <li><a href="javascript:UserVoice.showPopupWidget();">Lämna förslag</a></li> -->
                     </ul>
                 </div>
             </div>
@@ -39,21 +39,4 @@
 </script>
 </body>
 
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://stats.jonkri.com/";
-    _paq.push(['setTrackerUrl', u+'piwik.php']);
-    _paq.push(['setSiteId', 4]);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
-    g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<noscript><p><img src="http://stats.jonkri.com/piwik.php?idsite=4" style="border:0;" alt="" /></p></noscript>
-<!-- End Piwik Code -->
-<!-- Note, Piwik really should be changed so that we have one for beta and one for www -->
-
 </html>
diff --git a/templates/web/fixamingata/front/recent.html b/templates/web/fixamingata/front/recent.html
index 255882f41..f3126c6c3 100644
--- a/templates/web/fixamingata/front/recent.html
+++ b/templates/web/fixamingata/front/recent.html
@@ -13,7 +13,7 @@
         }(document, 'script', 'facebook-jssdk'));</script>
         <link rel="canonical" href="https://plus.google.com/105025269316032228481" />
         <div style="height: 50px; position: relative;"><div class="fb-like" data-href="https://www.facebook.com/fixamingata" data-layout="button_count" data-action="like" data-show-faces="true" data-share="true" style="float: left;"></div>&nbsp;&nbsp;&nbsp;<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script><div style="float: left; padding-left: 20px; padding-top: 2px;"><g:plusone></g:plusone></div></div>
-        <div style="padding-bottom: 14px;"><a href="https://play.google.com/store/apps/details?id=se.sambruk.fixamingata"><img alt="FixaMin Gata på Google Play" style="height: 45px; width: 129px;" src="/cobrands/fixmystreet/images/google_play_logo.png" /></a></div>
+        <div style="padding-bottom: 14px;"><a href="https://play.google.com/store/apps/details?id=se.sambruk.fixamingata"><img alt="FixaMin Gata på Google Play" src="/cobrands/fixmystreet/images/google_play_logo.png" style="height: 45px; width: 129px;" /></a><a href="http://appstore.com/fixamingata"><img alt="FixaMin Gata på App Store" src="/cobrands/fixmystreet/images/itunes_store_logo.png" style="height: 40px; padding-left: 19px; padding-top: 1px; vertical-align: top; width: 135px;" /></a></div>
         [% IF recent_photos.size %]
         <h2>
             [% loc('Recently reported problems') %]
diff --git a/templates/web/fixamingata/report/new/inline-tips.html b/templates/web/fixamingata/report/new/inline-tips.html
index 90bb4f975..4fab9c81c 100644
--- a/templates/web/fixamingata/report/new/inline-tips.html
+++ b/templates/web/fixamingata/report/new/inline-tips.html
@@ -4,8 +4,10 @@
         <li>Var trevlig</li>
         <li>Ange platser noggrant</li>
         <li>Skriv hur gammalt problemet är</li>
+        <li>Fyll i tillräckligt med detaljer för att mottagaren skall kunna hjälpa till</li>
     </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>
diff --git a/templates/web/fixamingata/report/new/notes.html b/templates/web/fixamingata/report/new/notes.html
index 8f081f637..9ec6b0e29 100644
--- a/templates/web/fixamingata/report/new/notes.html
+++ b/templates/web/fixamingata/report/new/notes.html
@@ -1,14 +1,8 @@
-<p>[% loc("Please note:") %]</p>
-
 <ul class="plain-list">
-    <li>[% loc("We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>") %]</li>
-    <li>[% loc("Please be polite, concise and to the point.") %]</li>
-    <li>[% loc("Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users.") %]</li>
-    <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li>
 [% IF all_councils.items.first > 0 %]
-    <li>[% id = all_councils.items.first;
+    <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>[% 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>
+    <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
new file mode 100644
index 000000000..972fccf53
--- /dev/null
+++ b/templates/web/fixamingata/report/new/sidebar.html
@@ -0,0 +1,5 @@
+<div id="report-a-problem-sidebar">
+    <div class="sidebar-notes">
+        [% INCLUDE 'report/new/notes.html' %]
+    </div>
+</div>
diff --git a/web/cobrands/fixamingata/images/itunes_store_logo.png b/web/cobrands/fixamingata/images/itunes_store_logo.png
new file mode 100644
index 000000000..b37f4c230
--- /dev/null
+++ b/web/cobrands/fixamingata/images/itunes_store_logo.png