7 files changed, 25 insertions, 14 deletions
diff --git a/templates/web/default/alert/index.html b/templates/web/default/alert/index.html
index 1f0635ae4..36c0daf91 100644
--- a/templates/web/default/alert/index.html
+++ b/templates/web/default/alert/index.html
@@ -40,9 +40,11 @@ To find out what local alerts we have for you, please enter your [% c.cobrand.co
 <div class="sticky-sidebar" id="alert_recent">
   <aside>
     <h2>[% loc('Some photos of recent reports') %]</h2>
-    [% FOREACH p IN photos %]
+    [% FOREACH p IN photos;
+        photo = p.get_photo_params;
+    %]
         <a href="/report/[% p.id %]"><img border="0" height="100"
-            src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a>
+            src="[% photo.url_tn %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a>
     [% END %]
   </aside>
 </div>
diff --git a/templates/web/default/alert/list.html b/templates/web/default/alert/list.html
index 20ebbf455..447bfcd76 100644
--- a/templates/web/default/alert/list.html
+++ b/templates/web/default/alert/list.html
@@ -24,9 +24,11 @@
     <div id="alert_photos" class="sticky-sidebar">
       <aside>
         <h2>[% loc('Photos of recent nearby reports') %]</h2>
-        [% FOREACH p IN photos %]
+        [% FOREACH p IN photos;
+            photo = p.get_photo_params;
+        %]
             <a href="/report/[% p.id %]"><img border="0" height="100"
-                src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a>
+                src="[% photo.url_tn %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a>
         [% END %]
       </aside>
     </div>
diff --git a/templates/web/default/index.html b/templates/web/default/index.html
index beaeefb20..9dc6f54b2 100644
--- a/templates/web/default/index.html
+++ b/templates/web/default/index.html
@@ -41,9 +41,11 @@
     <h2>[% loc('Recently reported problems') %]</h2>
     [% IF recent_photos.size %]
         <p id="front_photos">
-        [% FOREACH p IN recent_photos %]
+        [% FOREACH p IN recent_photos;
+            photo = p.get_photo_params;
+        %]
             <a href="/report/[% p.id %]"><img border="0" height="100"
-                src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a>
+                src="[% photo.url_tn %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a>
         [% END %]
         </p>
     [% END %]
diff --git a/templates/web/fixmybarangay/alert/index.html b/templates/web/fixmybarangay/alert/index.html
index d9bb74ee9..8e2ce7518 100644
--- a/templates/web/fixmybarangay/alert/index.html
+++ b/templates/web/fixmybarangay/alert/index.html
@@ -30,9 +30,11 @@ FixMyBarangay has a RSS feeds and email alerts for local problems.
 <div class="sticky-sidebar" id="alert_recent">
   <aside>
     <h2>[% loc('Some photos of recent reports') %]</h2>
-    [% FOREACH p IN photos %]
+    [% FOREACH p IN photos;
+        photo = p.get_photo_params
+    %]
         <a href="/report/[% p.id %]"><img border="0" height="100"
-            src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a>
+            src="[% photo.url_tn %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a>
     [% END %]
   </aside>
 </div>
diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html
index 5d7d31baa..f45509891 100644
--- a/templates/web/fixmystreet/index.html
+++ b/templates/web/fixmystreet/index.html
@@ -47,8 +47,7 @@ kinds of problems like missed bins use our
         <section class="full-width">
             <ul class="issue-list-a">
             [% FOREACH problem IN recent_photos %]
-            [%  problem.photo = 1; # Definitely is
-                INCLUDE 'report/_item.html', no_fixed = 1 %]
+            [% INCLUDE 'report/_item.html', no_fixed = 1 %]
             [% END %]
             </ul>
         </section>
diff --git a/templates/web/fixmystreet/report/_item.html b/templates/web/fixmystreet/report/_item.html
index 508b02614..f910d0f8c 100644
--- a/templates/web/fixmystreet/report/_item.html
+++ b/templates/web/fixmystreet/report/_item.html
@@ -1,7 +1,9 @@
 <li>
 <a class="text" href="[% c.uri_for('/report', problem.id ) %]">
-    [% IF problem.photo %]
-        <img class="img" height="60" width="90" src="/photo/[% problem.id %].fp.jpeg" alt="">
+    [% IF problem.photo;
+        photo = problem.get_photo_params
+    %]
+        <img class="img" height="60" width="90" src="[% photo.url_fp %]" alt="">
     [% END %]
         <h4>[% problem.title | html %]</h4>
         <small>[% prettify_dt( problem.confirmed_local, 1 ) %]
diff --git a/templates/web/zurich/report/_item.html b/templates/web/zurich/report/_item.html
index 41164cdd1..cd44a1b67 100644
--- a/templates/web/zurich/report/_item.html
+++ b/templates/web/zurich/report/_item.html
@@ -1,7 +1,9 @@
 <li>
 <a class="text" href="[% c.uri_for('/report', problem.id ) %]">
-    [% IF problem.state != 'unconfirmed' AND problem.photo AND problem.extra.publish_photo %]
-        <img class="img" height="60" width="90" src="/photo/[% problem.id %].fp.jpeg" alt="">
+    [% IF problem.state != 'unconfirmed' AND problem.photo AND problem.extra.publish_photo;
+        photo = problem.get_photo_params
+    %]
+        <img class="img" height="60" width="90" src="[% photo.url_fp %]" alt="">
     [% END %]
       [% IF problem.state != 'unconfirmed' %]
         <h4>[% problem.title | html %]</h4>