9 files changed, 55 insertions, 10 deletions
diff --git a/templates/web/zurich/admin/body-form.html b/templates/web/zurich/admin/body-form.html
index 5ae8eb8a6..4e570a058 100644
--- a/templates/web/zurich/admin/body-form.html
+++ b/templates/web/zurich/admin/body-form.html
@@ -10,7 +10,6 @@
         <input type="text" name="endpoint" id="email" value="[% body.endpoint %]" size="50">
     </p>
 
-[% IF admin_type == 'super' %]
     <p>
         <label for="parent">[% loc('Parent') %]</label>
         <select name="parent" id="parent">
@@ -31,7 +30,11 @@
             [% END %]
         </select>
     </p>
-[% END %]
+
+    <p>
+        <label for="deleted">[% loc('Flag as deleted') %]</label>
+        <input type="checkbox" name="deleted" id="deleted" value="1"[% ' checked' IF body.deleted %] />
+    </p>
 
         <input type="hidden" name="send_method" value="Email">
         <input type="hidden" name="jurisdiction" id="jurisdiction" value="[% body.jurisdiction %]">
diff --git a/templates/web/zurich/admin/header.html b/templates/web/zurich/admin/header.html
index be146f0e1..281b1de23 100644
--- a/templates/web/zurich/admin/header.html
+++ b/templates/web/zurich/admin/header.html
@@ -14,6 +14,7 @@
 %]
 <style type="text/css">
     .adminhidden { color: #666666; }
+    .admininternal { background-color: #eeeeff; }
     .active { background-color: #ffffee; cursor: pointer; }
     .error { color: red; }
     .overdue { background-color: #ffcccc; }
diff --git a/templates/web/zurich/admin/index-dm.html b/templates/web/zurich/admin/index-dm.html
index 530e72c59..e0b62d5d2 100644
--- a/templates/web/zurich/admin/index-dm.html
+++ b/templates/web/zurich/admin/index-dm.html
@@ -26,6 +26,7 @@
     [% IF include_subdiv %]
         <th>[% loc('Subdivision/Body') %]</th>
     [% END %]
+        <th>[% loc('Photo') %]</th>
         <th class='edit'>*</th>
     </tr>
     <tr class="filter-row">
diff --git a/templates/web/zurich/admin/index-sdm.html b/templates/web/zurich/admin/index-sdm.html
index 76593ead0..707bb2d9d 100644
--- a/templates/web/zurich/admin/index-sdm.html
+++ b/templates/web/zurich/admin/index-sdm.html
@@ -21,6 +21,7 @@
       [% FOREACH col IN [ [ 'category', loc('Category') ], [ 'created', loc('Submitted') ], [ 'lastupdate', loc('Updated') ], [ 'state', loc('Status') ] ] %]
         <th><a href="[% INCLUDE sort_link choice = col.0 %]#[% hash %]">[% col.1 %] [% INCLUDE sort_arrow choice = col.0 %]</a></th>
       [% END %]
+        <th>[% loc('Photo') %]</th>
         [% IF NOT no_edit %]
         <th class='edit'>*</th>
         [% END %]
diff --git a/templates/web/zurich/admin/list_updates.html b/templates/web/zurich/admin/list_updates.html
index c475d839e..80029462b 100644
--- a/templates/web/zurich/admin/list_updates.html
+++ b/templates/web/zurich/admin/list_updates.html
@@ -5,12 +5,14 @@
     <tr>
         <th>[% loc('ID') %]</th>
         <th>[% loc('Created') %]</th>
+        <th>[% loc('User') %]</th>
         <th>[% loc('Text') %]</th>
     </tr>
 [% FOREACH update IN updates -%]
-    <tr[% ' class="adminhidden"' IF update.state == 'hidden' || update.problem.state == 'hidden' %]>
-        <td>[%- update.id %]</td>
+    <tr class="[% 'adminhidden' IF update.state == 'hidden' || update.problem.state == 'hidden' %] [% 'admininternal' IF update.extra.is_internal_note %]">
+        <td>[% update.id %]</td>
         <td>[% PROCESS format_date this_date=update.created %] [% update.created.hms %]</td>
+        <td><a href="mailto:[% update.user.email %]">[% update.user.name || update.user.email %]</a></td>
         <td>[% update.text | html %]</td>
     </tr>
 [% END -%]
diff --git a/templates/web/zurich/admin/problem_row.html b/templates/web/zurich/admin/problem_row.html
index 8b1a30cb0..71b64839a 100644
--- a/templates/web/zurich/admin/problem_row.html
+++ b/templates/web/zurich/admin/problem_row.html
@@ -32,6 +32,12 @@
             </td>
         [% END %]
 
+        <td>
+        [% IF problem.photo %]
+            <img class="img" height="60" width="90" src="[% c.cobrand.base_url %]/photo/[% problem.photo %].temp.jpeg" alt="">
+        [% END %]
+        </td>
+
         [% IF NOT no_edit %]
             <td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td>
         [% END %]
diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html
index fcdb03602..599c60b77 100644
--- a/templates/web/zurich/admin/report_edit-sdm.html
+++ b/templates/web/zurich/admin/report_edit-sdm.html
@@ -22,6 +22,9 @@
 
 <ul class="no-bullets">
 <li><a href="[% c.uri_for_email( '/report', problem.id ) %]">[% loc('View report on site' )%]</a></li>
+
+<li><a href="http://webgis.intra.stzh.ch/AV_Online/Direct.asp?Map=UP&Search=Koord&West=[% problem.local_coords.1 %]&Nord=[% problem.local_coords.0 %]&B=300" target="_blank">Standort in AV-Online anzeigen</a></li>
+
 <li><span class="mock-label">[% loc('Details:') %]</span> [% problem.detail | html %]
 [% IF problem.extra.original_detail %]
 <br>[%
@@ -52,8 +55,8 @@
 
 <li><span class="mock-label">[% loc('State:') %]</span> [% states.${problem.state} %]</li>
 
-<li><label for="internal_notes">[% loc('Internal notes:') %]</label>
-<textarea name='internal_notes' id='internal_notes' cols=60 rows=5>[% problem.extra.internal_notes | html %]</textarea></li>
+<li><label for="new_internal_note">[% loc('New internal note:') %]</label>
+<textarea name='new_internal_note' id='new_internal_note' cols=60 rows=5></textarea></li>
 
 <li><label for="status_update">[% loc('New update:') %]</label>
 <textarea name='status_update' id='status_update' cols=60 rows=5></textarea></li>
diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html
index 5c5b1f7b1..cd399f23b 100644
--- a/templates/web/zurich/admin/report_edit.html
+++ b/templates/web/zurich/admin/report_edit.html
@@ -1,4 +1,5 @@
 [%
+    PROCESS "report/photo-js.html";
     PROCESS "maps/zurich.html";
     INCLUDE 'admin/header.html'
         title = tprintf(loc('Editing problem %d'), problem.id ),
@@ -21,6 +22,8 @@
 <ul class="no-bullets">
 <li><a href="[% c.uri_for_email( '/report', problem.id ) %]">[% loc('View report on site' )%]</a></li>
 
+<li><a href="http://webgis.intra.stzh.ch/AV_Online/Direct.asp?Map=UP&Search=Koord&West=[% problem.local_coords.1 %]&Nord=[% problem.local_coords.0 %]&B=300" target="_blank">Standort in AV-Online anzeigen</a></li>
+
 [% IF problem.state == 'fixed - council' OR problem.state == 'closed' %]
     <li><span class="mock-label">[% loc('Details:') %]</span> [% problem.detail | html %]
     [% IF problem.extra.original_detail %]
@@ -62,7 +65,13 @@
 
 
 [% IF problem.photo %]
-<li><img alt="" src="[% c.cobrand.base_url %]/photo/[% problem.photo %].temp.jpeg">
+<li>
+[% photo = problem.get_photo_params %]
+<div class="update-img">
+    <a href="[% c.cobrand.base_url %]/photo/[% problem.photo %].fulltemp.jpeg" rel="fancy">
+        <img alt="Photo of this report" src="[% c.cobrand.base_url %]/photo/[% problem.photo %].temp.jpeg">
+    <span>zoom</span></a>
+</div>
 <br>
 <input type="submit" name="rotate_photo" value="[% loc('Rotate Left') %]">
 <input type="submit" name="rotate_photo" value="[% loc('Rotate Right') %]">
@@ -72,8 +81,8 @@
 [% END %]
 </ul>
 
-<p><label for="internal_notes">[% loc('Internal notes:') %]</label>
-<textarea name='internal_notes' id='internal_notes' cols=60 rows=5>[% problem.extra.internal_notes | html %]</textarea></p>
+<p><label for="new_internal_note">[% loc('New internal note:') %]</label>
+<textarea name='new_internal_note' id='new_internal_note' cols=60 rows=5>[% new_internal_note | html %]</textarea></p>
 
 <p><span class="mock-label">[% loc('State:') %]</span> <select name="state"  id="state">
     <option value="">--</option>
@@ -94,6 +103,24 @@
   [% END %]
 </select></p>
 
+<p id="automatic-reply">
+    <span class="mock-label">automatische Antwort</span>
+    <input type="checkbox" name="send_rejected_email" id="send_rejected_email" value="1" checked="checked" />
+</p>
+
+<script type="text/javascript">
+$(function(){
+    // Show or hide the automatic reply field
+    $('#state').change(function(){
+        if ($(this).val() === 'hidden') {
+            $('#automatic-reply').show();
+        } else {
+            $('#automatic-reply').hide();
+        }
+    }).change();
+});
+</script>
+
 [% IF problem.state == 'unconfirmed' OR problem.state == 'confirmed' %]
 
 <ul class="no-bullets">
@@ -127,7 +154,7 @@
     <select name="body_external" id="body_external">
         <option value="">--</option>
     [% FOR body IN bodies %]
-        [% NEXT IF body.parent OR body.bodies %]
+        [% NEXT IF body.parent OR body.bodies OR body.deleted %]
         <option value="[% body.id %]"[% IF body.id == problem.bodies_str %] selected[% END %]>[% body.name %]</option>
     [% END %]
     </select>
diff --git a/templates/web/zurich/admin/reports.html b/templates/web/zurich/admin/reports.html
index b0bc733c4..68f98c44a 100644
--- a/templates/web/zurich/admin/reports.html
+++ b/templates/web/zurich/admin/reports.html
@@ -13,6 +13,7 @@
       [% FOREACH col IN [ [ 'category', loc('Category') ], [ 'created', loc('Submitted') ], [ 'lastupdate', loc('Updated') ], [ 'state', loc('Status') ] ] %]
         <th><a href="[% INCLUDE sort_link choice = col.0 %]">[% col.1 %] [% INCLUDE sort_arrow choice = col.0 %]</a></th>
       [% END %]
+        <th>[% loc('Photo') %]</th>
         <th class='edit'>*</th>
     </tr>
     [% INCLUDE 'admin/problem_row.html' %]