Merge branch 'migrate_to_catalyst' of ssh://git.mysociety.org/data/git/public/fixmystreet into migrate_to_catalyst

4 files changed, 10 insertions, 17 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
index 370fe7b89..2bfd52633 100644
--- a/perllib/FixMyStreet/App/Controller/Around.pm
+++ b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -195,15 +195,13 @@ sub display_location : Private {
         } @$on_map_all, @$around_map;
     }
 
-    {    # FIXME - ideally this indented code should be in the templates
-        FixMyStreet::Map::display_map(
-            $c,
-            latitude  => $latitude,
-            longitude => $longitude,
-            clickable => 1,
-            pins      => \@pins,
-        );
-    }
+    FixMyStreet::Map::display_map(
+        $c,
+        latitude  => $latitude,
+        longitude => $longitude,
+        clickable => 1,
+        pins      => \@pins,
+    );
 
     return 1;
 }
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 4d9bcd672..078b0b994 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -875,8 +875,7 @@ Add the html needed to for the map to the stash.
 
 =cut
 
-# FIXME - much of this should not happen here or in maps code but in the
-# templates. Perhaps also create a map 'None' to use when map is skipped.
+# Perhaps also create a map 'None' to use when map is skipped.
 
 sub generate_map : Private {
     my ( $self, $c ) = @_;
diff --git a/templates/web/default/alert/index.html b/templates/web/default/alert/index.html
index 3c01c44d4..4d63e7f34 100644
--- a/templates/web/default/alert/index.html
+++ b/templates/web/default/alert/index.html
@@ -26,7 +26,7 @@ postcode or street name and area:' ) %]
   </p>
 </form>
 
-[% IF photos %]
+[% IF photos.size %]
 <div id="alert_recent">
   <h2>[% loc('Some photos of recent reports') %]</h2>
     [% FOREACH p IN photos %]
@@ -35,6 +35,5 @@ postcode or street name and area:' ) %]
     [% END %]
 </div>
 [% END %]
-[%# FIXME - put in blurb here %]
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/default/alert/list.html b/templates/web/default/alert/list.html
index 32c531247..38007ea62 100644
--- a/templates/web/default/alert/list.html
+++ b/templates/web/default/alert/list.html
@@ -24,7 +24,7 @@
 
   [% cobrand_form_elements %]
 
-  [% IF photos %]
+  [% IF photos.size %]
     <div id="alert_photos">
       <h2>[% loc('Photos of recent nearby reports') %]</h2>
         [% FOREACH p IN photos %]
@@ -72,7 +72,6 @@
     [% ELSE %]
       <div><ul id="rss_feed">
     [% END %]
-  [%# FIXME errors here %]
 
   [% FOREACH option IN options %]
   <li>
@@ -109,8 +108,6 @@ for the county council.' ) %]
 <div id="rss_buttons">
     [% END %]
 
-  [%# FIXME rss options here %]
-
   <p>
     <input type="submit" name="rss" value="[% loc('Give me an RSS feed') %]">
   <p>