aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web/zurich
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web/zurich')
-rw-r--r--templates/web/zurich/about/faq-de-ch.html (renamed from templates/web/zurich/faq/faq-de-ch.html)0
-rw-r--r--templates/web/zurich/admin/index.html6
-rw-r--r--templates/web/zurich/admin/problem_row.html4
-rw-r--r--templates/web/zurich/admin/report_edit-sdm.html6
-rw-r--r--templates/web/zurich/admin/report_edit.html6
-rw-r--r--templates/web/zurich/admin/update_edit.html4
-rw-r--r--templates/web/zurich/auth/token.html25
-rw-r--r--templates/web/zurich/email_sent.html11
-rw-r--r--templates/web/zurich/report/_item.html6
-rw-r--r--templates/web/zurich/report/new/fill_in_details_form.html46
10 files changed, 39 insertions, 75 deletions
diff --git a/templates/web/zurich/faq/faq-de-ch.html b/templates/web/zurich/about/faq-de-ch.html
index deda32a1c..deda32a1c 100644
--- a/templates/web/zurich/faq/faq-de-ch.html
+++ b/templates/web/zurich/about/faq-de-ch.html
diff --git a/templates/web/zurich/admin/index.html b/templates/web/zurich/admin/index.html
index a51c7f6fe..275f50183 100644
--- a/templates/web/zurich/admin/index.html
+++ b/templates/web/zurich/admin/index.html
@@ -1,9 +1,9 @@
[% PROCESS 'admin/header.html' title=loc('Summary') -%]
<ul>
- <li>[% tprintf( loc('<strong>%d</strong> live problems'), total_problems_live ) %];
- [% tprintf( loc('from %d different users'), total_problems_users ) %]</li>
- <li>[% tprintf( loc('%d council contacts &ndash; %d confirmed, %d unconfirmed'), contacts.total, contacts.1, contacts.0) %]</li>
+ <li>[% tprintf( loc('<strong>%s</strong> live problems'), total_problems_live ) %];
+ [% tprintf( loc('from %s different users'), total_problems_users ) %]</li>
+ <li>[% tprintf( loc('%s council contacts &ndash; %s confirmed, %s unconfirmed'), contacts.total, contacts.1, contacts.0) %]</li>
</ul>
<h2>[% loc('Problem breakdown by state') %]</h2>
diff --git a/templates/web/zurich/admin/problem_row.html b/templates/web/zurich/admin/problem_row.html
index baa8d3ac7..acbf17017 100644
--- a/templates/web/zurich/admin/problem_row.html
+++ b/templates/web/zurich/admin/problem_row.html
@@ -36,9 +36,9 @@
<td>
[% IF problem.photo %]
- [% FOR photo IN problem.get_photoset(c).images %]
+ [% FOR photo IN problem.photos %]
<div class="update-img">
- <img height="60" width="90" alt="" src="[% c.cobrand.base_url %]/photo/[% photo.0 %].temp.jpeg">
+ <img height="60" width="90" alt="" src="[% c.cobrand.base_url %][% photo.url_temp %]">
</div>
[% END %]
[% END %]
diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html
index 8e576a718..a0ff1038d 100644
--- a/templates/web/zurich/admin/report_edit-sdm.html
+++ b/templates/web/zurich/admin/report_edit-sdm.html
@@ -82,10 +82,10 @@
[% IF problem.photo %]
<dd>
- [% FOR photo IN problem.get_photoset(c).images %]
+ [% FOR photo IN problem.photos %]
<div class="update-img">
- <a href="[% c.cobrand.base_url %]/photo/[% photo.0 %].fulltemp.jpeg" rel="fancy">
- <img alt="Photo of this report" src="[% c.cobrand.base_url %]/photo/[% photo.0 %].temp.jpeg">
+ <a href="[% c.cobrand.base_url %][% photo.url_temp_full %]" rel="fancy">
+ <img alt="Photo of this report" src="[% c.cobrand.base_url %][% photo.url_temp %]">
<span>zoom</span>
</a>
</div>
diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html
index 64d0950ee..dd876935c 100644
--- a/templates/web/zurich/admin/report_edit.html
+++ b/templates/web/zurich/admin/report_edit.html
@@ -106,10 +106,10 @@
[% IF problem.photo %]
<dd>
- [% FOR photo IN problem.get_photoset(c).images %]
+ [% FOR photo IN problem.photos %]
<div class="update-img">
- <a href="[% c.cobrand.base_url %]/photo/[% photo.0 %].fulltemp.jpeg" rel="fancy">
- <img alt="Photo of this report" src="[% c.cobrand.base_url %]/photo/[% photo.0 %].temp.jpeg">
+ <a href="[% c.cobrand.base_url %][% photo.url_temp_full %]" rel="fancy">
+ <img alt="Photo of this report" src="[% c.cobrand.base_url %][% photo.url_temp %]">
<span>zoom</span>
</a>
</div>
diff --git a/templates/web/zurich/admin/update_edit.html b/templates/web/zurich/admin/update_edit.html
index ab40981a5..fbd96f3a5 100644
--- a/templates/web/zurich/admin/update_edit.html
+++ b/templates/web/zurich/admin/update_edit.html
@@ -29,8 +29,8 @@
<li>[% loc('Created:') %] [% PROCESS format_date this_date=update.created %] [% update.created.hms %]</li>
[% IF update.photo %]
-[% photo = update.get_photo_params %]
-<li><img alt="" height="[% photo.height %]" width="[% photo.width %]" src="[% photo.url %]">
+[% photo = update.photos.first %]
+<li><img alt="" src="[% photo.url %]">
<input type="checkbox" id="remove_photo" name="remove_photo" value="1">
<label for="remove_photo" class="inline">[% loc("Remove photo (can't be undone!)") %]</label></li>
[% END %]
diff --git a/templates/web/zurich/auth/token.html b/templates/web/zurich/auth/token.html
deleted file mode 100644
index e199691e0..000000000
--- a/templates/web/zurich/auth/token.html
+++ /dev/null
@@ -1,25 +0,0 @@
-[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Confirm account') %]
-
-[% IF token_not_found %]
-
- <div class="confirmation-header confirmation-header--failure">
-
- <h1>[% loc('We have not been able to confirm your account - sorry.') %]</h1>
- <p>[% loc('This may be because the link is too old or already used, or the address was not copied correctly.') %]</p>
-
- </div>
-
-[% ELSE %]
-
- <div class="confirmation-header confirmation-header--inbox">
-
- <h1>[% loc('Please check your email') %]</h1>
- <p>[% loc("We have sent you an email containing a link to confirm your account.") %]</p>
-
- <p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p>
-
- </div>
-
-[% END %]
-
-[% INCLUDE 'footer.html' %]
diff --git a/templates/web/zurich/email_sent.html b/templates/web/zurich/email_sent.html
deleted file mode 100644
index 90bfcdbda..000000000
--- a/templates/web/zurich/email_sent.html
+++ /dev/null
@@ -1,11 +0,0 @@
-[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Create a report') %]
-
-<div class="confirmation-header confirmation-header--inbox">
-
- <h1>[% loc("Nearly Done! Now check your email...") %]</h1>
-
- <p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p>
-
-</div>
-
-[% INCLUDE 'footer.html' %]
diff --git a/templates/web/zurich/report/_item.html b/templates/web/zurich/report/_item.html
index 9ba5e6fcb..a4d274a8e 100644
--- a/templates/web/zurich/report/_item.html
+++ b/templates/web/zurich/report/_item.html
@@ -1,9 +1,7 @@
<li class="item-list__item item-list--reports__item">
<a href="[% c.uri_for('/report', problem.id ) %]">
- [% IF problem.state != 'unconfirmed' AND problem.photo AND c.cobrand.allow_photo_display(problem);
- photo = problem.get_photo_params
- %]
- <img class="img" height="60" width="90" src="[% photo.url_fp %]" alt="">
+ [% IF problem.state != 'unconfirmed' AND problem.photo AND c.cobrand.allow_photo_display(problem) %]
+ <img class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt="">
[% END %]
[% IF problem.state != 'unconfirmed' %]
<h4>[% problem.title | html %]</h4>
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 c8c567786..7628bf23f 100644
--- a/templates/web/zurich/report/new/fill_in_details_form.html
+++ b/templates/web/zurich/report/new/fill_in_details_form.html
@@ -39,39 +39,41 @@
<p class='form-error'>[% field_errors.bodies %]</p>
[% END %]
- <label for="form_detail">[% loc('Details') %]</label>
- [% IF field_errors.detail %]
- <p class='form-error'>[% field_errors.detail %]</p>
- [% END %]
- <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem.') %]" required>[% report.detail | html %]</textarea>
-
- [% PROCESS "report/new/category_wrapper.html" %]
-
- [% IF c.cobrand.allow_photo_upload %]
+ [% IF c.cobrand.allow_photo_upload %]
+ <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
<label for="form_photo">
[% loc('Photo') %]
[% loc('(Defect &amp; location of defect)') %]
</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 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>
- [% 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 %]
- [% IF field_errors.photo %]
- <p class='form-error'>[% field_errors.photo %]</p>
+ <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/[% id %].temp.jpeg" 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 %]
+
+ [% TRY %][% PROCESS 'report/new/after_photo.html' %][% CATCH file %][% END %]
+
+ <label for="form_detail">[% loc('Details') %]</label>
+ [% IF field_errors.detail %]
+ <p class='form-error'>[% field_errors.detail %]</p>
[% END %]
+ <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem.') %]" required>[% report.detail | html %]</textarea>
+
+ [% PROCESS "report/new/category_wrapper.html" %]
<label for="form_email">[% loc('Your email') %]</label>
[% IF field_errors.email %]
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-08 05:27:36 +0000