7 files changed, 23 insertions, 17 deletions
diff --git a/templates/email/zurich/problem-confirm.txt b/templates/email/zurich/problem-confirm.txt
index d64d54e8c..7a76332bd 100644
--- a/templates/email/zurich/problem-confirm.txt
+++ b/templates/email/zurich/problem-confirm.txt
@@ -8,6 +8,8 @@ Besten Dank für Ihre Meldung auf <<Züri wie neu>>. Klicken Sie bitte auf diese
 
 Wir werden Ihr Anliegen innerhalb der nächsten sechs Arbeitstage beantworten.
 
+Achtung: Notfälle müssen der Polizei gemeldet werden via Telefon 117.
+
 
 Ihre Meldung lautet:
 
diff --git a/templates/web/base/admin/report_edit.html b/templates/web/base/admin/report_edit.html
index ff99bb907..911f4094e 100644
--- a/templates/web/base/admin/report_edit.html
+++ b/templates/web/base/admin/report_edit.html
@@ -135,7 +135,9 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a>
 <li>[% loc('Phone:') %] [% problem.user.phone_display | html %]</li>
 [% END %]
 [% IF problem.user.email != problem.user.username %]
-<li>[% loc('Email:') %] [% problem.user.email | html %]</li>
+<li>[% loc('Email:') %]
+<a href="mailto:[% problem.user.email | html %]">[% problem.user.email | html %]</a>
+</li>
 [% END %]
 <li><label class="inline-text" for="flagged">[% loc('Flagged:') %]</label>
     <input type="checkbox" id="flagged" name="flagged"[% ' checked' IF problem.flagged %]></li>
diff --git a/templates/web/base/report/photo.html b/templates/web/base/report/photo.html
index aa82baef6..5474fad28 100644
--- a/templates/web/base/report/photo.html
+++ b/templates/web/base/report/photo.html
@@ -1,13 +1,15 @@
-[% IF c.cobrand.allow_photo_display(object) && object.photo %]
+[% IF object.photo %]
   [% IF object.photos.size > 1 %]
     <div class="update-img-set">
   [% END %]
   [% FOR photo IN object.photos %]
-    <div class="update-img">
-        <a href="[% photo.url_full %]" rel="fancy">
-            <img alt="Photo of this report" src="[% photo.url %]">
-        <span>zoom</span></a>
-    </div>
+    [% IF c.cobrand.allow_photo_display(object, photo.idx) %]
+      <div class="update-img">
+          <a href="[% photo.url_full %]" rel="fancy">
+              <img alt="Photo of this report" src="[% photo.url %]">
+          <span>zoom</span></a>
+      </div>
+    [% END %]
   [% END %]
   [% IF object.photos.size > 1 %]
     </div>
diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html
index 07fc9ad36..0319fc565 100644
--- a/templates/web/zurich/admin/report_edit-sdm.html
+++ b/templates/web/zurich/admin/report_edit-sdm.html
@@ -62,7 +62,7 @@
         <strong>[% IF problem.name %][% problem.name | html %][% ELSE %][% loc('(No name)') %][% END %]</strong>
         <input type='hidden' name='name' id='name' value='[% problem.name | html %]'>
         <br>
-        [% problem.user.email | html %]
+        <a href="mailto:[% problem.user.email | html %]">[% problem.user.email | html %]</a>
         [% IF NOT problem.extra.email_confirmed %]<span class="error">[% loc('Unconfirmed') %]</span>[% END %]
         <input type='hidden' id='username' name='username' value='[% problem.user.username | html %]'>
         <br>
diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html
index 7e88fab30..fd03fb044 100644
--- a/templates/web/zurich/admin/report_edit.html
+++ b/templates/web/zurich/admin/report_edit.html
@@ -90,7 +90,7 @@
         <strong>[% IF problem.name %][% problem.name | html %][% ELSE %][% loc('(No name)') %][% END %]</strong>
         <input type='hidden' name='name' id='name' value='[% problem.name | html %]'>
         <br>
-        [% problem.user.email | html %]
+        <a href="mailto:[% problem.user.email | html %]">[% problem.user.email | html %]</a>
         [% IF NOT problem.extra.email_confirmed %]<span class="error">[% loc('Unconfirmed') %]</span>[% END %]
         <input type='hidden' id='username' name='username' value='[% problem.user.username | html %]'>
         <br>
@@ -117,10 +117,10 @@
         </div>
         <input type="submit" name="rotate_photo_[% loop.index %]" value="[% loc('Rotate Left') %]" class="screen-only">
         <input type="submit" name="rotate_photo_[% loop.index %]" value="[% loc('Rotate Right') %]" class="screen-only">
+        <br>
+        <input type="checkbox" id="publish_photo_[% loop.index %]" name="publish_photo_[% loop.index %]" value="1"[% ' checked' IF problem.extra.publish_photo.${loop.index} %]  class="screen-only">
+        <label class="inline screen-only" for="publish_photo_[% loop.index %]">[% loc("Publish photo") %]</label></li>
       [% END %]
-    <br>
-    <input type="checkbox" id="publish_photo" name="publish_photo" value="1"[% ' checked' IF problem.extra.publish_photo %]  class="screen-only">
-    <label class="inline screen-only" for="publish_photo">[% loc("Publish photo") %]</label></li>
   [% END %]
 
 </dl>
diff --git a/templates/web/zurich/report/_item.html b/templates/web/zurich/report/_item.html
index 560cbac51..ccae84271 100644
--- a/templates/web/zurich/report/_item.html
+++ b/templates/web/zurich/report/_item.html
@@ -1,7 +1,9 @@
 <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) %]
-        <img class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt="">
+    [% photo_to_display = c.cobrand.allow_photo_display(problem) %]
+    [% IF problem.state != 'unconfirmed' AND problem.photo AND photo_to_display %]
+        [% photo_idx = photo_to_display - 1 ~%]
+        <img class="img" height="60" width="90" src="[% problem.photos.${photo_idx}.url_fp %]" alt="">
     [% END %]
       [% IF problem.state != 'unconfirmed' %]
         <h3 class="item-list__heading">[% problem.title | html %]</h3>
diff --git a/templates/web/zurich/report/_main.html b/templates/web/zurich/report/_main.html
index b868c03e2..912e8b0c9 100644
--- a/templates/web/zurich/report/_main.html
+++ b/templates/web/zurich/report/_main.html
@@ -6,9 +6,7 @@
     </p>
 
   [% IF problem.state != 'unconfirmed' %]
-    [% IF c.cobrand.allow_photo_display(problem) %]
-      [% INCLUDE 'report/photo.html' object=problem %]
-    [% END %]
+    [% INCLUDE 'report/photo.html' object=problem %]
     [% problem.detail | add_links | html_para %]
   [% ELSE %]
     [% loc('This report is awaiting moderation.') %]