Merge remote-tracking branch 'origin/1302-support-pngs'

10 files changed, 35 insertions, 34 deletions

diff --git a/templates/web/base/around/_error_multiple.html b/templates/web/base/around/_error_multiple.html
index 15089ba6b..b47a91ca9 100644
--- a/templates/web/base/around/_error_multiple.html
+++ b/templates/web/base/around/_error_multiple.html
@@ -13,7 +13,7 @@
 
 [% IF partial_token %]
     <p style="margin-top: 0; color: #cc0000;">
-        <img align="right" src="/photo/[% partial_report.id %].jpeg" hspace="5">
+        <img align="right" src="[% partial_report.photos.first.url_temp %]" hspace="5">
         [% loc("Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above&nbsp;:") %]
     </p>
 [% END %]
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 20b0b6842..049ffa076 100644
--- a/templates/web/emptyhomes/report/new/fill_in_details_form.html
+++ b/templates/web/emptyhomes/report/new/fill_in_details_form.html
@@ -66,23 +66,24 @@
 </div>
 
 [% IF c.cobrand.allow_photo_upload %]
+    <input type="hidden" name="upload_fileid" value="[% upload_fileid %]" />
+    <label for="form_photo">[% loc('Photo') %]</label>
     [% IF field_errors.photo %]
         <div class='form-error'>[% field_errors.photo %]</div>
     [% END %]
 
-    <div class='form-field'>
-    [% IF upload_fileid || report.photo %]
-        <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p>
-        [% IF upload_fileid %]
-        <input type="hidden" name="upload_fileid" value="[% upload_fileid %]" />
+    <div id="form_photos">
+      [% 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/temp.[% id %]" alt="">
         [% END %]
-        [% IF report.photo %]
-        <img align="right" src="/photo/[% report.id %].jpeg" hspace="5">
-        [% END %]
-    [% END %]
-
-        <label for="form_photo">[% loc('Photo:') %]</label>
-        <input type="file" name="photo" id="form_photo" style="width:20em">
+      [% END %]
+        <input type="file" name="photo1" id="form_photo">
+        <label for="form_photo2">[% loc('Photo') %]</label>
+        <input type="file" name="photo2" id="form_photo2">
+        <label for="form_photo3">[% loc('Photo') %]</label>
+        <input type="file" name="photo3" id="form_photo3">
     </div>
 [% END %]
 
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 659fadd04..728b27e41 100644
--- a/templates/web/seesomething/report/new/fill_in_details_form.html
+++ b/templates/web/seesomething/report/new/fill_in_details_form.html
@@ -49,24 +49,24 @@
             </div>
 
             [% IF c.cobrand.allow_photo_upload %]
+                <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
                 <label for="form_photo">[% loc('Photo') %]</label>
-                [% 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 %]
-
                 [% IF field_errors.photo %]
                     <p class='form-error'>[% field_errors.photo %]</p>
                 [% END %]
-                <input type="file" name="photo" id="form_photo">
+                <div id="form_photos">
+                  [% 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/temp.[% id %]" alt="">
+                    [% END %]
+                  [% END %]
+                    <input type="file" name="photo1" id="form_photo">
+                    <label for="form_photo2">[% loc('Photo') %]</label>
+                    <input type="file" name="photo2" id="form_photo2">
+                    <label for="form_photo3">[% loc('Photo') %]</label>
+                    <input type="file" name="photo3" id="form_photo3">
+                </div>
             [% END %]
 
             <h2>Personal Details:</h2>
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">