Merge branch 'jonkri-master'

16 files changed, 149 insertions, 369 deletions

diff --git a/perllib/FixMyStreet/Cobrand/FixaMinGata.pm b/perllib/FixMyStreet/Cobrand/FixaMinGata.pm
index c1abd3e77..e6e54926f 100644
--- a/perllib/FixMyStreet/Cobrand/FixaMinGata.pm
+++ b/perllib/FixMyStreet/Cobrand/FixaMinGata.pm
@@ -121,119 +121,13 @@ sub filter_all_council_ids_list {
     return  @all_councils_ids; # Är detta rätt? //Rikard
 }
 
-# Vad ska vi göra för svenska förhållanden här??? //Rikard
-sub council_rss_alert_options {
-    my $self         = shift;
-    my $all_councils = shift;
-    my $c            = shift;
-
-    my ( @options, @reported_to_options, $fylke, $kommune );
-
-    foreach ( values %$all_councils ) {
-        if ( $_->{type} eq 'NKO' ) {
-            $kommune = $_;
-        }
-        else {
-            $fylke = $_;
-        }
-    }
-
-    if ( $fylke->{id} == 3 ) {    # Oslo
-        my $short_name = $self->short_name($fylke, $all_councils);
-        ( my $id_name = $short_name ) =~ tr/+/_/;
-
-        push @options,
-          {
-            type => 'council',
-            id   => sprintf( 'council:%s:%s', $fylke->{id}, $id_name ),
-            rss_text =>
-              sprintf( _('RSS feed of problems within %s'), $fylke->{name} ),
-            text => sprintf( _('Problems within %s'), $fylke->{name} ),
-            uri => $c->uri_for( '/rss/reports', $short_name ),
-          };
-    }
-    else {
-        my $short_kommune_name = $self->short_name($kommune, $all_councils);
-        ( my $id_kommune_name = $short_kommune_name ) =~ tr/+/_/;
-
-        my $short_fylke_name = $self->short_name($fylke, $all_councils);
-        ( my $id_fylke_name = $short_fylke_name ) =~ tr/+/_/;
-
-        push @options,
-          {
-            type => 'area',
-            id   => sprintf( 'area:%s:%s', $kommune->{id}, $id_kommune_name ),
-            rss_text =>
-              sprintf( _('RSS feed of %s'), $kommune->{name} ),
-            text => $kommune->{name},
-            uri => $c->uri_for( '/rss/area', $short_kommune_name ),
-          },
-          {
-            type => 'area',
-            id   => sprintf( 'area:%s:%s', $fylke->{id}, $id_fylke_name ),
-            rss_text =>
-              sprintf( _('RSS feed of %s'), $fylke->{name} ),
-            text => $fylke->{name},
-            uri => $c->uri_for( '/rss/area', $short_fylke_name ),
-          };
-
-        push @reported_to_options,
-          {
-            type => 'council',
-            id => sprintf( 'council:%s:%s', $kommune->{id}, $id_kommune_name ),
-            rss_text =>
-              sprintf( _('RSS feed of %s'), $kommune->{name} ),
-            text => $kommune->{name},
-            uri => $c->uri_for( '/rss/reports', $short_kommune_name ),
-          },
-          {
-            type => 'council',
-            id   => sprintf( 'council:%s:%s', $fylke->{id}, $id_fylke_name ),
-            rss_text =>
-              sprintf( _('RSS feed of %s'), $fylke->{name} ),
-            text => $fylke->{name},
-            uri => $c->uri_for( '/rss/reports/', $short_fylke_name ),
-          };
-    }
-
-    return (
-          \@options, @reported_to_options
-        ? \@reported_to_options
-        : undef
-    );
-
-}
-
-# Vad ska vi göra för svenska förhållanden här??? //Rikard
-sub reports_council_check {
-    my ( $self, $c, $council ) = @_;
-
-    if ($council eq 'Oslo') {
-
-        # There are two Oslos (kommune and fylke), we only want one of them.
-        $c->stash->{council} = mySociety::MaPit::call('area', 3);
-        return 1;
-
-    } elsif ($council =~ /,/) {
-
-        # Some kommunes have the same name, use the fylke name to work out which.
-        my ($kommune, $fylke) = split /\s*,\s*/, $council;
-        my $area_types = $c->cobrand->area_types;
-        my $areas_k = mySociety::MaPit::call('areas', $kommune, type => $area_types);
-        my $areas_f = mySociety::MaPit::call('areas', $fylke, type => $area_types);
-        if (keys %$areas_f == 1) {
-            ($fylke) = values %$areas_f;
-            foreach (values %$areas_k) {
-                if ($_->{name} eq $kommune && $_->{parent_area} == $fylke->{id}) {
-                    $c->stash->{council} = $_;
-                    return 1;
-                }
-            }
-        }
-        # If we're here, we've been given a bad name.
-        $c->detach( 'redirect_index' );
-
-    }
+# The pin is green is it's fixed, yellow if it's closed (but not fixed), and
+# red otherwise.
+sub pin_colour {
+    my ( $self, $p, $context ) = @_;
+    return 'green' if $p->is_fixed;
+    return 'yellow' if $p->is_closed;
+    return 'red';
 }
 
 1;
diff --git a/templates/web/base/maps/mapquest-attribution.html b/templates/web/base/maps/mapquest-attribution.html
index 60aa1b000..d76e20817 100644
--- a/templates/web/base/maps/mapquest-attribution.html
+++ b/templates/web/base/maps/mapquest-attribution.html
@@ -10,5 +10,5 @@
 
 [% map_html = BLOCK %]
 [% INCLUDE maps/openlayers.html %]
-<div class="olControlAttribution" style="position: absolute;">Data, imagery and map information provided by <a href="http://www.mapquest.com/">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png" />, <a href="http://openstreetmap.org/">Open Street Map</a> and contributors, <a href="http://opendatacommons.org/licenses/odbl/">ODbL</a></div>
+<div class="olControlAttribution" style="position: absolute;">Data, imagery and map information provided by <a href="http://www.mapquest.com/">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png" />, <a href="http://openstreetmap.org/">OpenStreetMap</a> and contributors, <a href="http://opendatacommons.org/licenses/odbl/">ODbL</a></div>
 [% END %]
diff --git a/templates/web/base/report/new/councils_text_none.html b/templates/web/base/report/new/councils_text_none.html
index 9293c03a7..684879590 100644
--- a/templates/web/base/report/new/councils_text_none.html
+++ b/templates/web/base/report/new/councils_text_none.html
@@ -1,28 +1,16 @@
-<p>[%
+<p>
+[%
     nget(
         "We do not yet have details for the council that covers this location.",
         "We do not yet have details for the councils that cover this location.",
         missing_details_bodies.size || all_areas.size
     );
-%]
-[%
     loc("If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council.");
-%]
-[% IF c.cobrand.moniker == 'fixamingata' AND all_body_names.size == 1 %]
-[%
-    tprintf(
-        "Du kan istället kontakta %s via <a href='%s'>deras webbsida</a>.",
-        all_body_names.first, all_body_urls.first);
-%]
-[% ELSE %]
-[%
     tprintf(
         loc("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."),
         missing_details_body_names.join( loc(' or ') ) || all_area_names.join( loc(' or ') ),
         c.cobrand.contact_email,
         c.cobrand.contact_email
     );
-
 %]
-[% END %]
 </p>
diff --git a/templates/web/fixamingata/faq/faq-sv.html b/templates/web/fixamingata/faq/faq-sv.html
index c21b3b45a..05ffdaddc 100755
--- a/templates/web/fixamingata/faq/faq-sv.html
+++ b/templates/web/fixamingata/faq/faq-sv.html
@@ -31,7 +31,7 @@ till exempel:
 
     <ul><li>Övergivna bilar och cyklar
     <li>Graffiti
-    <li>Netskräpning
+    <li>Nedskräpning
     <li>Gatustädning, exempelvis trasigt glas på en cykelbana
     <li>Trasiga gatulysen
     <li>Hål i vägar och gångbanor
diff --git a/templates/web/fixamingata/footer.html b/templates/web/fixamingata/footer.html
index 697248b82..f8d67c64e 100644
--- a/templates/web/fixamingata/footer.html
+++ b/templates/web/fixamingata/footer.html
@@ -1,26 +1,6 @@
                     [% IF pagefooter %]
                     <footer role="content-info">
-                        <div class="tablewrapper bordered">
-                            <div id="footer-mobileapps">
-                            </div>
-                            <div id="footer-help">
-
-                                <ul>
-                                   <li>
-                                      <h4>Sekretess och kakor</h4>
-                                      <p>Vill du veta mer om det juridiska? Läs vår information <a href="/privacy">om sekretess och kakor</a></p>
-                                   </li>
-                                    <li>
-                                        <h4>[% loc('Are you a developer?') %]</h4>
-                                        <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %]</p>
-                                    </li>
-                                    <li>
-                                        <h4>[% loc('Are you from a council?') %]</h4>
-                                        <p>Vill du veta mer om FixaMinGata eller hur det kan fungera för er kommun? <a href="/kommun">Läs mer om FixaMinGata för kommuner</a>.</p>
-                                    </li>
-                                </ul>
-                            </div>
-                        </div>
+                        [% INCLUDE 'front/footer-marketing.html' %]
                     </footer>
                     [% END %]
                 </div><!-- .content role=main -->
diff --git a/templates/web/fixamingata/front/footer-marketing.html b/templates/web/fixamingata/front/footer-marketing.html
new file mode 100644
index 000000000..bc82aa5f1
--- /dev/null
+++ b/templates/web/fixamingata/front/footer-marketing.html
@@ -0,0 +1,26 @@
+                        <div class="tablewrapper bordered">
+                            <div id="footer-mobileapps">
+                                <!--
+                                <h4></h4>
+                                <p>
+                                </p>
+                                -->
+                            </div>
+
+                            <div id="footer-help">
+                                <ul>
+                                   <li>
+                                      <h4>Sekretess och kakor</h4>
+                                      <p>Vill du veta mer om det juridiska? Läs vår information <a href="/privacy">om sekretess och kakor</a></p>
+                                   </li>
+                                    <li>
+                                        <h4>[% loc('Are you a developer?') %]</h4>
+                                        <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://fixmystreet.org">available at fixmystreet.org</a>.') %]</p>
+                                    </li>
+                                    <li>
+                                        <h4>Är du anställd i en kommun?</h4>
+                                        <p>Vill du veta mer om FixaMinGata eller hur det kan fungera för er kommun? <a href="/kommun">Läs mer om FixaMinGata för kommuner</a>.</p>
+                                    </li>
+                                </ul>
+                            </div>
+                        </div>
diff --git a/templates/web/fixamingata/front/recent.html b/templates/web/fixamingata/front/recent.html
index 04873f144..bfe35832e 100644
--- a/templates/web/fixamingata/front/recent.html
+++ b/templates/web/fixamingata/front/recent.html
@@ -13,6 +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>
         [% IF recent_photos.size %]
         <h2>
             [% loc('Recently reported problems') %]
diff --git a/templates/web/fixamingata/front/tips.html b/templates/web/fixamingata/front/tips.html
index 6b423ed5e..fd309708f 100644
--- a/templates/web/fixamingata/front/tips.html
+++ b/templates/web/fixamingata/front/tips.html
@@ -1 +1 @@
-<div style="height: 329px; padding-top: 20px;"><div style="position: absolute; width: 581px;"><iframe width="581" height="329" src="//www.youtube.com/embed/H5knzdalYI0" frameborder="0" allowfullscreen></iframe></div></div>
+<div style="height: 329px; padding-top: 20px;"><iframe width="100%" height="329" src="//www.youtube.com/embed/H5knzdalYI0" frameborder="0" allowfullscreen></iframe></div>
diff --git a/templates/web/fixamingata/report/new/councils_text_none.html b/templates/web/fixamingata/report/new/councils_text_none.html
new file mode 100644
index 000000000..cdad54f18
--- /dev/null
+++ b/templates/web/fixamingata/report/new/councils_text_none.html
@@ -0,0 +1,22 @@
+<p>
+[% IF all_body_names.size == 1 %]
+[%
+    tprintf(
+        "%s har valt att inte ta emot rapporter från FixaMinGata, utan hänvisar fel- &amp; synpunktsrapportering till <a href='%s'>kommunens egen webbplats</a>.",
+        all_body_names.first, all_body_urls.first);
+%]
+[% END %]
+[%
+    loc("If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council.");
+%]
+[% IF all_body_names.size != 1 %]
+[%
+    tprintf(
+        loc("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."),
+        missing_details_body_names.join( loc(' or ') ) || all_area_names.join( loc(' or ') ),
+        c.cobrand.contact_email,
+        c.cobrand.contact_email
+    );
+%]
+[% END %]
+</p>
diff --git a/templates/web/fixamingata/report/new/fill_in_details_form.html b/templates/web/fixamingata/report/new/fill_in_details_form.html
deleted file mode 100644
index 63c4e8788..000000000
--- a/templates/web/fixamingata/report/new/fill_in_details_form.html
+++ /dev/null
@@ -1,217 +0,0 @@
-<div id="report-a-problem-main">
-    <h1>[% loc('Report your problem') %]</h1>
-
-  [% IF report.used_map %]
-    <p class="change_location">[% loc('Wrong location? Just click again on the map.') %]</p>
-  [% END %]
-
-    [% IF js %]
-        <p id="councils_text">
-        [%
-            tprintf(
-                loc('All the information you provide here will be sent to <strong>%s</strong>.'),
-                loc('the local council')
-            );
-        %]
-        [% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %]
-        </p>
-    [% ELSE %]
-        [% PROCESS 'report/new/councils_text.html' %]
-    [% END %]
-
-    <div id="report-a-problem-sidebar">
-        <div class="sidebar-tips">
-            [% IF report.used_map %]
-                [% IF partial_token %]
-                    <p id="unknown">[% loc('Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit.') %]</p>
-                [% END %]
-            [% END %]
-
-            <p>
-            [% IF report.used_map %]
-                [% INCLUDE 'report/new/fill_in_details_text.html' %]
-            [% ELSE %]
-                [% loc('Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box.') %]
-            [% END %]
-            </p>
-        </div>
-
-        <div class="sidebar-notes">
-            [% INCLUDE 'report/new/notes.html' %]
-        </div>
-
-    </div>
-
-    [% INCLUDE 'errors.html' %]
-    <fieldset>
-        <div id="problem_form">
-
-            [% INCLUDE 'report/new/form_heading.html' %]
-
-
-            [% IF field_errors.council %]
-                <p class='form-error'>[% field_errors.council %]</p>
-            [% END %]
-
-
-
-            <label for="form_title">[% loc('Subject') %]</label>
-            [% IF field_errors.title %]
-                <p class='form-error'>[% field_errors.title %]</p>
-            [% END %]
-            <input type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="[% loc('Provide a title') %]" required>
-
-            <label for="form_detail">[% loc('Details') %]</label>
-            [% IF field_errors.detail %]
-                <p class='form-error'>[% field_errors.detail %]</p>
-            [% END %]
-            <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem.') %]" required>[% report.detail | html %]</textarea>
-
-            [% IF js %]
-                <div id="form_category_row">
-                    <label for="form_category">[% loc('Category') %]</label>
-                    <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select>
-                </div>
-            [% ELSE %]
-                [% IF category_options.size %]
-                    [% IF field_errors.category %]
-                        <p class='form-error'>[% field_errors.category %]</p>
-                    [% END %]
-
-                    [% PROCESS "report/new/category.html" %]
-                [% END %]
-            [% END %]
-
-            [%- IF category_extras %]
-                [% PROCESS "report/new/category_extras.html" %]
-            [%- END %]
-
-            [% IF c.cobrand.allow_photo_upload %]
-                [% IF field_errors.photo %]
-                    <p class='form-error'>[% field_errors.photo %]</p>
-                [% END %]
-                
-                
-                [% IF upload_fileid || report.photo %]
-                    [% IF upload_fileid %]
-                        <img align="right" src="/photo/[% upload_fileid %].temp.jpeg" alt="">
-                        <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
-                    [% END %]
-
-                    <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p>
-
-                    [% IF report.photo %]
-                        <img align="right" src="/photo/[% report.id %].jpeg">
-                    [% END %]
-                [% END %]
-                
-                <label for="form_photo">[% loc('Photo') %]</label>
-                <input type="file" name="photo" id="form_photo">
-            [% END %]
-
-            [% IF c.user_exists %]
-                <div class="form-box">
-
-                    [% INCLUDE 'report/new/extra_name.html' %]
-
-                    <label for="form_name">[% loc('Name') %]</label>
-                    [% IF field_errors.name %]
-                        <p class='form-error'>[% field_errors.name %]</p>
-                    [% END %]
-                    <input type="text" class="validName" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]">
-
-                    [%# if there is nothing in the name field then set check box as default on form %]
-                    <div class="checkbox-group">
-                        <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous %]>
-                        <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label>
-                    </div>
-
-                    <label for="form_phone">[% loc('Phone number (optional)') %]</label>
-                    <input class="" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
-            
-                    <div class="general-notes">
-                        <p>[% loc('We never show your email address or phone number.') %]</p>
-                    </div>
-
-                    <div class="form-txt-submit-box">
-                        <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]">
-                    </div>
-                </div>
-            [% ELSE %]
-
-                <label for="form_email">[% loc('Your email') %]</label>
-                [% IF field_errors.email %]
-                    <p class='form-error'>[% field_errors.email %]</p>
-                [% END %]
-                <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" placeholder="[% loc('Please enter your email address') %]" required>
-
-                <div id="form_sign_in">
-                    <h3>[% loc("Now to submit your report&hellip;") %]</h3>
-
-                    <div id="form_sign_in_no" class="form-box">
-                        <h5>Om du inte har ett lösenord fyller du i ditt namn och eventuellt telefonnummer och nytt lösenord (valfria) här. När du skickar din rapport får du epost med en länk som du måste klicka på för att bekräfta rapporten. Om du redan har ett lösenord fyller du i detta längre ner på sidan och behöver då inte bekräfta rapporten.</h5>
-
-                        [% INCLUDE 'report/new/extra_name.html' %]
-
-                        <label for="form_name">[% loc('Name') %]</label>
-                        [% IF field_errors.name %]
-                            <p class='form-error'>[% field_errors.name %]</p>
-                        [% END %]
-
-                        <input type="text" class="form-focus-trigger validName" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]">
-
-                        [%# if there is nothing in the name field then set check box as default on form %]
-                        <div class="checkbox-group">
-                            <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous %]>
-                            <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label>
-                        </div>
-
-                        <label for="form_phone">[% loc('Phone number (optional)') %]</label>
-                        <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
-                
-                        <div class="general-notes form-focus-hidden">
-                            <p>[% loc('We never show your email address or phone number.') %]</p>
-                        </div>
-
-                        <label for="password_register">[% loc('Password (optional)') %]</label>
-
-                        <div class="general-notes form-focus-hidden">
-                            <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p>
-                        </div>
-
-                        <div class="form-txt-submit-box">
-                            <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
-                        <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]">
-                        </div>
-                    </div>
-                    <div id="form_sign_in_yes" class="form-box">
-
-                        <h5>Jag har ett lösenord sedan tidigare:</h5>
-
-                        <label class="hidden-js n" for="password_sign_in">[% loc('Yes I have a password') %]</label>
-                        <div class="form-txt-submit-box">
-                            [% IF field_errors.password %]
-                                <p class='form-error'>[% field_errors.password %]</p>
-                            [% END %]
-                            <input type="password" name="password_sign_in" id="password_sign_in" placeholder="[% loc('Your password') %]" value="">
-                            <input class="green-btn" type="submit" id="submit_sign_in" name="submit_sign_in" value="[% loc('Submit') %]">
-                        </div>
-                        
-                        <div class="checkbox-group">
-                            <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
-                            <label class="n inline" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
-                        </div>
-                    </div>
-
-                </div>
-
-            [% END %]
-        </div>
-    </fieldset>
-
-    [% IF partial_token %]
-        <input type="hidden" name="partial" value="[% partial_token.token %]">
-    [% END %]
-
-    <input type="hidden" name="submit_problem" value="1">
-</div>
diff --git a/templates/web/fixamingata/report/new/form_user_loggedout.html b/templates/web/fixamingata/report/new/form_user_loggedout.html
new file mode 100644
index 000000000..36e7d95f4
--- /dev/null
+++ b/templates/web/fixamingata/report/new/form_user_loggedout.html
@@ -0,0 +1,66 @@
+<label for="form_email">[% loc('Your email') %]</label>
+[% IF field_errors.email %]
+    <p class='form-error'>[% field_errors.email %]</p>
+[% END %]
+<input type="email" value="[% report.user.email | html %]" name="email" id="form_email" placeholder="[% loc('Please enter your email address') %]" required>
+
+<div id="form_sign_in">
+    <h3>[% loc("Now to submit your report&hellip;") %]</h3>
+
+    <div id="form_sign_in_no" class="form-box">
+        <h5>Om du inte har ett lösenord fyller du i ditt namn och eventuellt telefonnummer och nytt lösenord (valfria) här. När du skickar din rapport får du epost med en länk som du måste klicka på för att bekräfta rapporten. Om du redan har ett lösenord fyller du i detta längre ner på sidan och behöver då inte bekräfta rapporten.</h5>
+
+        [% INCLUDE 'report/new/extra_name.html' %]
+
+        [% name_public = report.anonymous==0 OR (c.cobrand.default_show_name AND report.anonymous=='') %]
+        <label for="form_name">[% loc('Name') %]</label>
+        [% IF field_errors.name %]
+            <p class='form-error'>[% field_errors.name %]</p>
+        [% END %]
+
+        <input type="text" class="form-focus-trigger validName" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]">
+
+        [%# if there is nothing in the name field then set check box as default on form %]
+        <div class="checkbox-group">
+            <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF name_public %]>
+            <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label>
+        </div>
+
+        <label for="form_phone">[% loc('Phone number (optional)') %]</label>
+        <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
+
+        <div class="general-notes form-focus-hidden">
+            <p>[% loc('We never show your email address or phone number.') %]</p>
+        </div>
+
+        <label for="password_register">[% loc('Password (optional)') %]</label>
+
+        <div class="general-notes form-focus-hidden">
+            <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p>
+        </div>
+
+        <div class="form-txt-submit-box">
+            <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
+        <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]">
+        </div>
+    </div>
+    <div id="form_sign_in_yes" class="form-box">
+
+        <h5>Jag har ett lösenord sedan tidigare:</h5>
+
+        <label class="hidden-js n" for="password_sign_in">[% loc('Yes I have a password') %]</label>
+        <div class="form-txt-submit-box">
+            [% IF field_errors.password %]
+                <p class='form-error'>[% field_errors.password %]</p>
+            [% END %]
+            <input type="password" name="password_sign_in" id="password_sign_in" placeholder="[% loc('Your password') %]" value="">
+            <input class="green-btn" type="submit" id="submit_sign_in" name="submit_sign_in" value="[% loc('Submit') %]">
+        </div>
+        
+        <div class="checkbox-group">
+            <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
+            <label class="n inline" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
+        </div>
+    </div>
+
+</div>
diff --git a/templates/web/fixamingata/report/new/inline-tips.html b/templates/web/fixamingata/report/new/inline-tips.html
new file mode 100644
index 000000000..90bb4f975
--- /dev/null
+++ b/templates/web/fixamingata/report/new/inline-tips.html
@@ -0,0 +1,12 @@
+<div class="description_tips">
+    <h4>Tips för bra rapporter:</h4>
+    <ul class="do">
+        <li>Var trevlig</li>
+        <li>Ange platser noggrant</li>
+        <li>Skriv hur gammalt problemet är</li>
+    </ul>
+    <ul class="dont">
+        <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/static/council.html b/templates/web/fixamingata/static/council.html
index ffa302691..8d968f695 100755
--- a/templates/web/fixamingata/static/council.html
+++ b/templates/web/fixamingata/static/council.html
@@ -59,7 +59,7 @@ Vaggeryd, Vetlanda och Värnamo.
 <p>
  <ul>
   <li>FixaMinGata använder
-      <a href="http://www.openstreetmap.org/">Open Street Map</a> för sin
+      <a href="http://www.openstreetmap.org/">OpenStreetMap</a> för sin
       kartinformation. Verifiera så att de kartor som finns för kommunen
       är relevanta. Om det finns fel i kartinformationen går detta att
       korrigera, av kommunen själva eller i samarbete med invånarna.</li>
diff --git a/web/cobrands/fixamingata/base.scss b/web/cobrands/fixamingata/base.scss
index 73ef7ea13..a132decd7 100644
--- a/web/cobrands/fixamingata/base.scss
+++ b/web/cobrands/fixamingata/base.scss
@@ -29,3 +29,9 @@ $image-sprite: '/cobrands/fixamingata/images/sprite.png';
         font-size: 0.9em;
     }
 }
+
+.description_tips {
+  h4 {
+    margin: 1em 0 0.5em; /* Jon added some margin-top here! */
+  }
+}
diff --git a/web/cobrands/fixamingata/images/google_play_logo.png b/web/cobrands/fixamingata/images/google_play_logo.png
new file mode 100644
index 000000000..9891cbbd3
--- /dev/null
+++ b/web/cobrands/fixamingata/images/google_play_logo.png
diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss
index 133fedc78..15a09ec77 100644
--- a/web/cobrands/fixamingata/layout.scss
+++ b/web/cobrands/fixamingata/layout.scss
@@ -113,3 +113,5 @@ h3, h4 {
 }
 
 #postcodeForm { margin-left: -1em !important; margin-right: -1em !important; }
+
+body.fullwidthpage .container .content footer .tablewrapper { background: #fff; }