From ddf714b871156f8ae6a2516bc4adf4541fd1e9d7 Mon Sep 17 00:00:00 2001
From: Jon Kristensen <info@jonkri.com>
Date: Fri, 1 May 2015 15:38:08 +0200
Subject: [FixaMinGata] Remove link to wiki.ffkp.se

---
 templates/web/fixamingata/about/council.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'templates')

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>
-- 
cgit v1.2.3


From e1acea1360dcc917f0808f687a5bc0f17af02c6a Mon Sep 17 00:00:00 2001
From: Jon Kristensen <info@jonkri.com>
Date: Sat, 9 May 2015 20:19:17 +0200
Subject: [FixaMinGata] Shorten details text.

Move some of it to dos and don'ts.
---
 templates/web/fixamingata/report/new/inline-tips.html |  1 +
 templates/web/fixamingata/report/new/notes.html       | 10 ++--------
 templates/web/fixamingata/report/new/sidebar.html     |  5 +++++
 3 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 templates/web/fixamingata/report/new/sidebar.html

(limited to 'templates')

diff --git a/templates/web/fixamingata/report/new/inline-tips.html b/templates/web/fixamingata/report/new/inline-tips.html
index 90bb4f975..ce93a2498 100644
--- a/templates/web/fixamingata/report/new/inline-tips.html
+++ b/templates/web/fixamingata/report/new/inline-tips.html
@@ -4,6 +4,7 @@
         <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>Använd inte FixaMinGata för rena synpunkter och förslag</li>
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>
-- 
cgit v1.2.3


From c43a93e08c8beadede846a45159cd9a4a6828938 Mon Sep 17 00:00:00 2001
From: Jon Kristensen <info@jonkri.com>
Date: Wed, 26 Aug 2015 17:49:41 +0200
Subject: [FixaMinGata] Add App Store icon and link.

---
 templates/web/fixamingata/front/recent.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates')

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') %]
-- 
cgit v1.2.3


From 459bb4cd04486cd8f3ef1dfd3e80536bfbe3e627 Mon Sep 17 00:00:00 2001
From: Jon Kristensen <info@jonkri.com>
Date: Fri, 23 Oct 2015 15:12:16 +0200
Subject: [FixaMinGata] Remove Piwik code

---
 templates/web/fixamingata/footer.html | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'templates')

diff --git a/templates/web/fixamingata/footer.html b/templates/web/fixamingata/footer.html
index 376d79ff4..42161f669 100644
--- a/templates/web/fixamingata/footer.html
+++ b/templates/web/fixamingata/footer.html
@@ -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>
-- 
cgit v1.2.3


From 33c9470e59d56d12d579f54beaba90def78ac695 Mon Sep 17 00:00:00 2001
From: Jon Kristensen <info@jonkri.com>
Date: Mon, 9 Nov 2015 19:44:56 +0100
Subject: [FixaMinGata] Make submit email easier to parse.

---
 templates/email/fixamingata/submit.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'templates')

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.
-- 
cgit v1.2.3


From 0911cc09048292f9f9711307df0b5ee4f56bbc1c Mon Sep 17 00:00:00 2001
From: Jon Kristensen <info@jonkri.com>
Date: Sun, 31 Jan 2016 19:26:27 +0100
Subject: [FixaMinGata] Extend dos and don'ts information

---
 templates/web/fixamingata/report/new/inline-tips.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'templates')

diff --git a/templates/web/fixamingata/report/new/inline-tips.html b/templates/web/fixamingata/report/new/inline-tips.html
index ce93a2498..4fab9c81c 100644
--- a/templates/web/fixamingata/report/new/inline-tips.html
+++ b/templates/web/fixamingata/report/new/inline-tips.html
@@ -7,6 +7,7 @@
         <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>
-- 
cgit v1.2.3


From 8f9aa9e22faf42bd210852058921874dbc90a214 Mon Sep 17 00:00:00 2001
From: Jon Kristensen <info@jonkri.com>
Date: Fri, 12 Feb 2016 13:49:42 +0100
Subject: [FixaMinGata] Move suggestions link to FAQ page

---
 templates/web/fixamingata/about/faq-sv.html | 2 ++
 templates/web/fixamingata/footer.html       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'templates')

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 42161f669..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>
-- 
cgit v1.2.3