Add PNG image support.

Store image type along with hash in photo column, and use that when
outputting images / generating URLs. Make sure all public photo URL
generation goes through appropriate functions, and change temp URLs
so the filename can be output directly from the list.

9 files changed, 9 insertions, 9 deletions

diff --git a/templates/web/base/questionnaire/index.html b/templates/web/base/questionnaire/index.html
index 86887c163..a523cd439 100644
--- a/templates/web/base/questionnaire/index.html
+++ b/templates/web/base/questionnaire/index.html
@@ -82,7 +82,7 @@
       [% IF upload_fileid %]
         <p>[% loc('You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed).') %]</p>
         [% FOREACH id IN upload_fileid.split(',') %]
-        <img align="right" src="/photo/[% id %].temp.jpeg" alt="">
+        <img align="right" src="/photo/temp.[% id %]" alt="">
         [% END %]
     [% END %]
         <input type="file" name="photo1" id="form_photo">
diff --git a/templates/web/base/report/new/form_report.html b/templates/web/base/report/new/form_report.html
index 68fb2c796..3fbf7c160 100644
--- a/templates/web/base/report/new/form_report.html
+++ b/templates/web/base/report/new/form_report.html
@@ -31,7 +31,7 @@
       [% IF upload_fileid %]
         <p>[% loc('You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed).') %]</p>
         [% FOREACH id IN upload_fileid.split(',') %]
-        <img align="right" src="/photo/[% id %].temp.jpeg" alt="">
+        <img align="right" src="/photo/temp.[% id %]" alt="">
         [% END %]
       [% END %]
         <input type="file" name="photo1" id="form_photo">
diff --git a/templates/web/base/report/update/form_update.html b/templates/web/base/report/update/form_update.html
index fb977e00e..007bd68d8 100644
--- a/templates/web/base/report/update/form_update.html
+++ b/templates/web/base/report/update/form_update.html
@@ -13,7 +13,7 @@
       [% IF upload_fileid %]
         <p>[% loc('You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed).') %]</p>
         [% FOREACH id IN upload_fileid.split(',') %]
-        <img align="right" src="/photo/[% id %].temp.jpeg" alt="">
+        <img align="right" src="/photo/temp.[% id %]" alt="">
         [% END %]
     [% END %]
         <input type="file" name="photo1" id="form_photo">
diff --git a/templates/web/bromley/report/display.html b/templates/web/bromley/report/display.html
index 1484bc489..da83e005f 100644
--- a/templates/web/bromley/report/display.html
+++ b/templates/web/bromley/report/display.html
@@ -72,7 +72,7 @@
               [% IF upload_fileid %]
                 <p>[% loc('You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed).') %]</p>
                 [% FOREACH id IN upload_fileid.split(',') %]
-                <img align="right" src="/photo/[% id %].temp.jpeg" alt="">
+                <img align="right" src="/photo/temp.[% id %]" alt="">
                 [% END %]
             [% END %]
                 <input type="file" name="photo1" id="form_photo">
diff --git a/templates/web/bromley/report/new/fill_in_details_form.html b/templates/web/bromley/report/new/fill_in_details_form.html
index 858da1a07..96f23d1fb 100644
--- a/templates/web/bromley/report/new/fill_in_details_form.html
+++ b/templates/web/bromley/report/new/fill_in_details_form.html
@@ -60,7 +60,7 @@
               [% IF upload_fileid %]
                 <p>[% loc('You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed).') %]</p>
                 [% FOREACH id IN upload_fileid.split(',') %]
-                <img align="right" src="/photo/[% id %].temp.jpeg" alt="">
+                <img align="right" src="/photo/temp.[% id %]" alt="">
                 [% END %]
               [% END %]
                 <input type="file" name="photo1" id="form_photo">
diff --git a/templates/web/eastsussex/report/update-form.html b/templates/web/eastsussex/report/update-form.html
index ae9cceac4..abcc2f532 100644
--- a/templates/web/eastsussex/report/update-form.html
+++ b/templates/web/eastsussex/report/update-form.html
@@ -72,7 +72,7 @@
               [% IF upload_fileid %]
                 <p>[% loc('You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed).') %]</p>
                 [% FOREACH id IN upload_fileid.split(',') %]
-                <img align="right" src="/photo/[% id %].temp.jpeg" alt="">
+                <img align="right" src="/photo/temp.[% id %]" alt="">
                 [% END %]
             [% END %]
                 <input type="file" name="photo1" id="form_photo">
diff --git a/templates/web/emptyhomes/report/new/fill_in_details_form.html b/templates/web/emptyhomes/report/new/fill_in_details_form.html
index 1b82748c9..049ffa076 100644
--- a/templates/web/emptyhomes/report/new/fill_in_details_form.html
+++ b/templates/web/emptyhomes/report/new/fill_in_details_form.html
@@ -76,7 +76,7 @@
       [% IF upload_fileid %]
         <p>[% loc('You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed).') %]</p>
         [% FOREACH id IN upload_fileid.split(',') %]
-        <img align="right" src="/photo/[% id %].temp.jpeg" alt="">
+        <img align="right" src="/photo/temp.[% id %]" alt="">
         [% END %]
       [% END %]
         <input type="file" name="photo1" id="form_photo">
diff --git a/templates/web/seesomething/report/new/fill_in_details_form.html b/templates/web/seesomething/report/new/fill_in_details_form.html
index 1cc841af5..728b27e41 100644
--- a/templates/web/seesomething/report/new/fill_in_details_form.html
+++ b/templates/web/seesomething/report/new/fill_in_details_form.html
@@ -58,7 +58,7 @@
                   [% IF upload_fileid %]
                     <p>[% loc('You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed).') %]</p>
                     [% FOREACH id IN upload_fileid.split(',') %]
-                    <img align="right" src="/photo/[% id %].temp.jpeg" alt="">
+                    <img align="right" src="/photo/temp.[% id %]" alt="">
                     [% END %]
                   [% END %]
                     <input type="file" name="photo1" id="form_photo">
diff --git a/templates/web/zurich/report/new/fill_in_details_form.html b/templates/web/zurich/report/new/fill_in_details_form.html
index 7628bf23f..1e9db6b31 100644
--- a/templates/web/zurich/report/new/fill_in_details_form.html
+++ b/templates/web/zurich/report/new/fill_in_details_form.html
@@ -54,7 +54,7 @@
               [% IF upload_fileid %]
                 <p>[% loc('You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed).') %]</p>
                 [% FOREACH id IN upload_fileid.split(',') %]
-                <img align="right" src="/photo/[% id %].temp.jpeg" alt="">
+                <img align="right" src="/photo/temp.[% id %]" alt="">
                 [% END %]
               [% END %]
                 <input type="file" name="photo1" id="form_photo">