From 87442399df6984d8430af30c65a41f449a6b34f0 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 8 Apr 2016 20:30:12 +0100 Subject: Update remaining cobrand multiple photo templates. --- .../report/new/fill_in_details_form.html | 25 +++++++++---------- .../report/new/fill_in_details_form.html | 28 +++++++++++----------- 2 files changed, 27 insertions(+), 26 deletions(-) (limited to 'templates') 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..1b82748c9 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 @@ [% IF c.cobrand.allow_photo_upload %] + + [% IF field_errors.photo %]
[% field_errors.photo %]
[% END %] -
- [% IF upload_fileid || report.photo %] -

[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]

- [% IF upload_fileid %] - +
+ [% IF upload_fileid %] +

[% 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).') %]

+ [% FOREACH id IN upload_fileid.split(',') %] + [% END %] - [% IF report.photo %] - - [% END %] - [% END %] - - - + [% END %] + + + + +
[% 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..1cc841af5 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 @@
[% IF c.cobrand.allow_photo_upload %] + - [% IF upload_fileid || report.photo %] - [% IF upload_fileid %] - - - [% END %] - -

[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]

- - [% IF report.photo %] - - [% END %] - [% END %] - [% IF field_errors.photo %]

[% field_errors.photo %]

[% END %] - +
+ [% IF upload_fileid %] +

[% 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).') %]

+ [% FOREACH id IN upload_fileid.split(',') %] + + [% END %] + [% END %] + + + + + +
[% END %]

Personal Details:

-- cgit v1.2.3 From 0802b7f04091c1022dce0d77cc806a46ecc4ebba Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 8 Apr 2016 20:44:22 +0100 Subject: Use correct URL for partial report photo. Since multiple photo support, partial photos can only be looked at via their temporary URL, not their confirmed one. --- templates/web/base/around/_error_multiple.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') 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 %]

- + [% 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 :") %]

[% END %] -- cgit v1.2.3 From b7099e8e513fe64ec183b1403515f46a7cc25f19 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 8 Apr 2016 21:11:48 +0100 Subject: 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. --- templates/web/base/questionnaire/index.html | 2 +- templates/web/base/report/new/form_report.html | 2 +- templates/web/base/report/update/form_update.html | 2 +- templates/web/bromley/report/display.html | 2 +- templates/web/bromley/report/new/fill_in_details_form.html | 2 +- templates/web/eastsussex/report/update-form.html | 2 +- templates/web/emptyhomes/report/new/fill_in_details_form.html | 2 +- templates/web/seesomething/report/new/fill_in_details_form.html | 2 +- templates/web/zurich/report/new/fill_in_details_form.html | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'templates') 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 %]

[% 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).') %]

[% FOREACH id IN upload_fileid.split(',') %] - + [% END %] [% END %] 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 %]

[% 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).') %]

[% FOREACH id IN upload_fileid.split(',') %] - + [% END %] [% END %] 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 %]

[% 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).') %]

[% FOREACH id IN upload_fileid.split(',') %] - + [% END %] [% END %] 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 %]

[% 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).') %]

[% FOREACH id IN upload_fileid.split(',') %] - + [% END %] [% END %] 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 %]

[% 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).') %]

[% FOREACH id IN upload_fileid.split(',') %] - + [% END %] [% END %] 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 %]

[% 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).') %]

[% FOREACH id IN upload_fileid.split(',') %] - + [% END %] [% END %] 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 %]

[% 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).') %]

[% FOREACH id IN upload_fileid.split(',') %] - + [% END %] [% 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 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 %]

[% 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).') %]

[% FOREACH id IN upload_fileid.split(',') %] - + [% END %] [% END %] 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 %]

[% 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).') %]

[% FOREACH id IN upload_fileid.split(',') %] - + [% END %] [% END %] -- cgit v1.2.3