diff options
Diffstat (limited to 'templates')
18 files changed, 26 insertions, 21 deletions
diff --git a/templates/web/default/alert/index.html b/templates/web/default/alert/index.html index d8478cf98..274d61780 100644 --- a/templates/web/default/alert/index.html +++ b/templates/web/default/alert/index.html @@ -30,7 +30,7 @@ postcode or street name and area:' ) %] <h2>[% loc('Some photos of recent reports') %]</h2> [% FOREACH p IN photos %] <a href="/report/[% p.id %]"><img border="0" height="100" - src="/photo?tn=1;id=[% p.id %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a> + src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> [% END %] </div> [% END %] diff --git a/templates/web/default/alert/list.html b/templates/web/default/alert/list.html index c763331cc..9f2bd69d0 100644 --- a/templates/web/default/alert/list.html +++ b/templates/web/default/alert/list.html @@ -27,7 +27,7 @@ <h2>[% loc('Photos of recent nearby reports') %]</h2> [% FOREACH p IN photos %] <a href="/report/[% p.id %]"><img border="0" height="100" - src="/photo?tn=1;id=[% p.id %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a> + src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> [% END %] </div> [% END %] diff --git a/templates/web/default/around/around_index.html b/templates/web/default/around/around_index.html index c07eb2ca2..012354f4a 100644 --- a/templates/web/default/around/around_index.html +++ b/templates/web/default/around/around_index.html @@ -39,7 +39,7 @@ [% IF partial_token %] <p style="margin-top: 0; color: #cc0000;"> - <img align="right" src="/photo?id=[% report.id %]" hspace="5"> + <img align="right" src="/photo/[% report.id %].jpeg" 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 below :") %] </p> [% END %] diff --git a/templates/web/default/index.html b/templates/web/default/index.html index 0a0ee7170..e5f98b0c5 100644 --- a/templates/web/default/index.html +++ b/templates/web/default/index.html @@ -63,7 +63,7 @@ <p id="front_photos"> [% FOREACH p IN recent_photos %] <a href="/report/[% p.id %]"><img border="0" height="100" - src="/photo?tn=1&id=[% p.id %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a> + src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> [% END %] </p> [% END %] diff --git a/templates/web/default/report/new/fill_in_details_form.html b/templates/web/default/report/new/fill_in_details_form.html index 2809b9c0e..ed8b07ea1 100644 --- a/templates/web/default/report/new/fill_in_details_form.html +++ b/templates/web/default/report/new/fill_in_details_form.html @@ -95,7 +95,7 @@ <input type="hidden" name="upload_fileid" value="[% upload_fileid %]" /> [% END %] [% IF report.photo %] - <img align="right" src="/photo?id=[% report.id %]" hspace="5"> + <img align="right" src="/photo/[% report.id %].jpeg" hspace="5"> [% END %] [% END %] diff --git a/templates/web/default/static/fun.html b/templates/web/default/static/fun.html index abe9d4028..00976f3ec 100644 --- a/templates/web/default/static/fun.html +++ b/templates/web/default/static/fun.html @@ -10,7 +10,7 @@ Do let us know if you find any more.</p> <ul style='list-style-type: none; margin:0; padding:0'> -<li><img src='http://www.fixmystreet.com/photo?id=9468' align='right' hspace=8> +<li><img src='http://www.fixmystreet.com/photo/9468.jpeg' align='right' hspace=8> <h2>Dumped Piano (right)</h2> <p>The reporter of this problem summed it up with their report, which consisted solely of the one character “!”. — @@ -20,7 +20,7 @@ Do let us know if you find any more.</p> <p>“A seagull is attacking various cars within this road. He starts at around 05:45 every morning and continues until around 19:30. This causes a lot of noisy banging and wakes up children.” — <a href='http://www.fixmystreet.com/report/2722'>Problem report</a> -<li><img src='http://www.fixmystreet.com/photo?id=6553' align='right' hspace=8> +<li><img src='http://www.fixmystreet.com/photo/6553.jpeg' align='right' hspace=8> <h2>Boxes full of cheese dumped (right)</h2> <p>“About a dozen boxes full of mozzarella cheese have been dumped opposite 3 rufford street. if it warms up we could have nasty road topping problem (seriously there is a lot of cheese)” — <a href='http://www.fixmystreet.com/report/6553'>Problem report</a> diff --git a/templates/web/fixmystreet/alert/index.html b/templates/web/fixmystreet/alert/index.html index 0903937f7..7bec66305 100644 --- a/templates/web/fixmystreet/alert/index.html +++ b/templates/web/fixmystreet/alert/index.html @@ -33,7 +33,7 @@ within a certain distance of a particular location.') %] <h2>[% loc('Some photos of recent reports') %]</h2> [% FOREACH p IN photos %] <a href="/report/[% p.id %]"><img border="0" height="100" - src="/photo?tn=1;id=[% p.id %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a> + src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> [% END %] </aside> </div> diff --git a/templates/web/fixmystreet/alert/list.html b/templates/web/fixmystreet/alert/list.html index c488e72ee..8305fff6f 100644 --- a/templates/web/fixmystreet/alert/list.html +++ b/templates/web/fixmystreet/alert/list.html @@ -27,7 +27,7 @@ <h2>[% loc('Photos of recent nearby reports') %]</h2> [% FOREACH p IN photos %] <a href="/report/[% p.id %]"><img border="0" height="100" - src="/photo?tn=1;id=[% p.id %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a> + src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> [% END %] </aside> </div> diff --git a/templates/web/fixmystreet/around/around_index.html b/templates/web/fixmystreet/around/around_index.html index 7207a7292..331f34325 100644 --- a/templates/web/fixmystreet/around/around_index.html +++ b/templates/web/fixmystreet/around/around_index.html @@ -42,7 +42,7 @@ [% IF partial_token %] <p style="margin-top: 0; color: #cc0000;"> - <img align="right" src="/photo?id=[% partial_report.id %]" hspace="5"> + <img align="right" src="/photo/[% partial_report.id %].jpeg" 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 below :") %] </p> [% END %] diff --git a/templates/web/fixmystreet/around/around_map_list_items.html b/templates/web/fixmystreet/around/around_map_list_items.html index 86370017f..7dce76ce1 100644 --- a/templates/web/fixmystreet/around/around_map_list_items.html +++ b/templates/web/fixmystreet/around/around_map_list_items.html @@ -14,7 +14,7 @@ </div> [% IF p.problem.photo %] <div class="img"> - <img height="60" width="90" src="/photo?id=[% p.problem.id %];fp=1" alt=""> + <img height="60" width="90" src="/photo/[% p.problem.id %].fp.jpeg" alt=""> </div> [% END %] </a> diff --git a/templates/web/fixmystreet/around/on_map_list_items.html b/templates/web/fixmystreet/around/on_map_list_items.html index 3c3b66cf9..9329e6833 100644 --- a/templates/web/fixmystreet/around/on_map_list_items.html +++ b/templates/web/fixmystreet/around/on_map_list_items.html @@ -11,7 +11,7 @@ </div> [% IF p.photo %] <div class="img"> - <img height="60" width="90" src="/photo?id=[% p.id %];fp=1" alt=""> + <img height="60" width="90" src="/photo/[% p.id %].fp.jpeg" alt=""> </div> [% END %] </a> diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html index d393eeac6..605e428a3 100644 --- a/templates/web/fixmystreet/index.html +++ b/templates/web/fixmystreet/index.html @@ -81,7 +81,7 @@ Modernizr.load({ <small>[% prettify_epoch( p.confirmed_local.epoch, 1 ) %]</small> </div> <div class="img"> - <img alt="[% p.title | html %]" title="[% p.title | html %]" height="60" width="90" src="/photo?id=[% p.id %];fp=1"> + <img alt="[% p.title | html %]" title="[% p.title | html %]" height="60" width="90" src="/photo/[% p.id %].fp.jpeg"> </div> </a> </li> diff --git a/templates/web/fixmystreet/questionnaire/index.html b/templates/web/fixmystreet/questionnaire/index.html index a1a159aa8..3b23c81cd 100644 --- a/templates/web/fixmystreet/questionnaire/index.html +++ b/templates/web/fixmystreet/questionnaire/index.html @@ -83,6 +83,7 @@ your experience of getting the problem fixed?') %]</p> [% IF c.cobrand.allow_photo_upload %] <div id="fileupload_normalUI"> [% IF upload_fileid %] + <img align="right" src="/photo/[% upload_fileid %].temp.jpeg" alt=""> <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p> <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> [% END %] diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 2ac0f407c..a79cbe0ca 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -101,6 +101,7 @@ [% IF c.cobrand.allow_photo_upload %] <div id="fileupload_normalUI"> [% IF upload_fileid %] + <img align="right" src="/photo/[% upload_fileid %].temp.jpeg" alt=""> <p>[% loc('You have already attached a photo to this update, attaching another one will replace it.') %]</p> <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> [% END %] diff --git a/templates/web/fixmystreet/report/new/fill_in_details_form.html b/templates/web/fixmystreet/report/new/fill_in_details_form.html index 3ccc22c2c..d908aee99 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -93,14 +93,15 @@ [% 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 %]" /> + <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?id=[% report.id %]"> + <img align="right" src="/photo/[% report.id %].jpeg"> [% END %] [% END %] diff --git a/templates/web/fixmystreet/report/photo.html b/templates/web/fixmystreet/report/photo.html index e74f0bbfe..a338391ce 100644 --- a/templates/web/fixmystreet/report/photo.html +++ b/templates/web/fixmystreet/report/photo.html @@ -1,6 +1,8 @@ [% IF c.cobrand.allow_photo_display && object.photo %] [% photo = object.get_photo_params %] <div class="update-img"> - <img src="[% photo.url %]"> + [% IF photo.url_full %]<a href="[% photo.url_full %]">[% END + %]<img alt="Photo of this report" [% IF photo.height %]height="[% photo.height %]" width="[% photo.width %]"[% END %] src="[% photo.url %]"> + [%- IF photo.url_full %]</a>[% END %] </div> [% END %] diff --git a/templates/web/fixmystreet/reports/council.html b/templates/web/fixmystreet/reports/council.html index 3de6f81eb..142a1750d 100755 --- a/templates/web/fixmystreet/reports/council.html +++ b/templates/web/fixmystreet/reports/council.html @@ -118,7 +118,7 @@ </div> [% IF problem.photo %] <div class="img"> - <img height="60" width="90" src="/photo?id=[% problem.id %];fp=1" alt=""> + <img height="60" width="90" src="/photo/[% problem.id %].fp.jpeg" alt=""> </div> [% END %] </a> diff --git a/templates/web/fixmystreet/static/fun.html b/templates/web/fixmystreet/static/fun.html index b0402922a..57a74a0d7 100644 --- a/templates/web/fixmystreet/static/fun.html +++ b/templates/web/fixmystreet/static/fun.html @@ -10,7 +10,7 @@ Do let us know if you find any more.</p> <ul class="plain-list"> - <li><img src='http://www.fixmystreet.com/photo?id=9468' align='right' hspace=8> + <li><img src='http://www.fixmystreet.com/photo/9468.jpeg' align='right' hspace=8> <h2>Dumped Piano (right)</h2> <p>The reporter of this problem summed it up with their report, which consisted solely of the one character “!”. — @@ -20,7 +20,7 @@ Do let us know if you find any more.</p> <p>“A seagull is attacking various cars within this road. He starts at around 05:45 every morning and continues until around 19:30. This causes a lot of noisy banging and wakes up children.” — <a href='http://www.fixmystreet.com/report/2722'>Problem report</a> - <li><img src='http://www.fixmystreet.com/photo?id=6553' align='right' hspace=8> + <li><img src='http://www.fixmystreet.com/photo/6553.jpeg' align='right' hspace=8> <h2>Boxes full of cheese dumped (right)</h2> <p>“About a dozen boxes full of mozzarella cheese have been dumped opposite 3 rufford street. if it warms up we could have nasty road topping problem (seriously there is a lot of cheese)” — <a href='http://www.fixmystreet.com/report/6553'>Problem report</a> |