aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web/zurich
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web/zurich')
-rw-r--r--templates/web/zurich/admin/bodies/contact-form.html10
-rw-r--r--templates/web/zurich/admin/bodies/form.html12
-rw-r--r--templates/web/zurich/admin/index-dm.html4
-rw-r--r--templates/web/zurich/admin/report_edit-sdm.html29
-rw-r--r--templates/web/zurich/admin/report_edit.html25
-rw-r--r--templates/web/zurich/header.html1
-rw-r--r--templates/web/zurich/header/title.html4
-rw-r--r--templates/web/zurich/header_opengraph.html8
-rw-r--r--templates/web/zurich/reports/_list-filter-status.html7
9 files changed, 56 insertions, 44 deletions
diff --git a/templates/web/zurich/admin/bodies/contact-form.html b/templates/web/zurich/admin/bodies/contact-form.html
index 7b59124fb..8449f2d39 100644
--- a/templates/web/zurich/admin/bodies/contact-form.html
+++ b/templates/web/zurich/admin/bodies/contact-form.html
@@ -15,6 +15,11 @@
<input type="text" class="form-control" name="extra[abbreviation]" id="abbreviation" size="30" value="[% contact.get_extra_metadata('abbreviation') | html %]">
</p>
+ <p>
+ <label for="admin_label">Admin-label</label>
+ <input type="text" class="form-control" name="extra[admin_label]" id="admin_label" size="30" value="[% contact.get_extra_metadata('admin_label') | html %]">
+ </p>
+
<p><strong>[% loc('Email:') %] </strong>
<input type="text" class="form-control" name="email" value="[% contact.email | html %]" size="30">
@@ -29,15 +34,12 @@
</div>
<p>
- [% IF contact.in_storage %]
<label for="state">[% loc('State') %]</label>
<select name="state" id="state">
<option value="confirmed"[% ' selected' IF contact.state == 'confirmed' %]>[% loc('Confirmed') %]
+ <option value="inactive"[% ' selected' IF contact.state == 'inactive' %]>[% loc('Inactive') %]
<option value="deleted"[% ' selected' IF contact.state == 'deleted' %]>[% loc('Deleted') %]
</select>
- [% ELSE %]
- <input type="hidden" name="state" value="confirmed" id="confirmed">
- [% END %]
<input type="checkbox" name="photo_required" value="1" id="photo_required"[% ' checked' IF contact.get_extra_metadata('photo_required') %]>
<label class="inline" for="photo_required">[% loc('Photo required') %]</label>
</p>
diff --git a/templates/web/zurich/admin/bodies/form.html b/templates/web/zurich/admin/bodies/form.html
index b625efc44..f9cd4f812 100644
--- a/templates/web/zurich/admin/bodies/form.html
+++ b/templates/web/zurich/admin/bodies/form.html
@@ -20,6 +20,18 @@
</select>
</p>
+ [% IF body AND NOT body.parent AND NOT body.bodies %]
+ <p>
+ <label for="category">[% loc('Category') %]</label>
+ <select class="form-control" name="extra[category]" id="category">
+ <option value="">[% loc('-- Pick a category --') %]</option>
+ [% FOR cat IN c.cobrand.category_options %]
+ <option value="[% cat.category %]"[% ' selected' IF cat.category == body.get_extra_metadata('category') %]>[% cat.category_display | html %]</option>
+ [% END %]
+ </select>
+ </p>
+ [% END %]
+
<p>
<label for="area_ids">[% loc('Area covered') %]</label>
<select class="form-control js-multiple" name="area_ids" id="area_ids" multiple data-none="-- [% loc('Select an area') %] --">
diff --git a/templates/web/zurich/admin/index-dm.html b/templates/web/zurich/admin/index-dm.html
index c93adbfb3..92df5b415 100644
--- a/templates/web/zurich/admin/index-dm.html
+++ b/templates/web/zurich/admin/index-dm.html
@@ -1,7 +1,9 @@
[% PROCESS 'admin/header.html' title=loc('Summary') -%]
[% PROCESS 'admin/report_blocks.html' %]
-[% INCLUDE status_message %]
+<div class="index-status">
+[% status_message %]
+</div>
<h2 id="submitted">[% loc('Submitted') %]</h2>
[% INCLUDE list, problems = submitted.all, hash = 'submitted' %]
diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html
index b9fb6ff4d..d8e6c2625 100644
--- a/templates/web/zurich/admin/report_edit-sdm.html
+++ b/templates/web/zurich/admin/report_edit-sdm.html
@@ -39,23 +39,11 @@
<dd class="screen-no-space-after">
<strong>[% PROCESS format_date this_date=problem.created %] [% problem.created.hms %]</strong>
</dd>
- <dt class="print-only">[% loc('Coordinates:') %] <!-- Koordinaten --></dt>
- <dd class="screen-no-space-after print-no-space-after">
- [% problem.local_coords.join(',') %]
- <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% problem.latitude %]">
- <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% problem.longitude %]">
- </dd>
- <dd class="screen-no-space-after print-no-space-after">
- [% IF problem.used_map %]
- [% loc('Used map') %]
- [% ELSE %]
- [% loc("Didn't use map") %]
- [% END %]
- </dd>
- <dd>[%
- safe = problem.postcode | html;
- tprintf( loc('originally entered: &ldquo;%s&rdquo;'), safe )
- %]</dd>
+
+ <dd>[% c.cobrand.admin_district_lookup(problem) %]</dd>
+
+ <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% problem.latitude %]">
+ <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% problem.longitude %]">
<dt class="print-only">[% loc('Reported by:') %] <!-- Meldende Person --></dt>
<dd>
@@ -78,10 +66,6 @@
<dt>[% loc('Time spent (in minutes):') %]</dt>
<dd>[% problem.get_time_spent %]</dd>
- <dd>
- [% INCLUDE status_message %]
- </dd>
-
[% IF problem.photo %]
<dd>
[% FOR photo IN problem.photos %]
@@ -102,6 +86,9 @@
<div class="admin-report-edit admin-report-edit--interact">
<p align="right" class="screen-only"><input [% sdm_disabled %] type="submit" class="btn" name="send_back" value="[% loc('Not for my subdivision') %]"></p>
+
+[% status_message %]
+
<p align="right" class="screen-only"><input [% sdm_disabled %] type="submit" class="btn" name="not_contactable" value="[% loc('Customer not contactable') %]"></p>
<ul class="no-bullets screen-only">
diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html
index 0186a6286..6f69161fe 100644
--- a/templates/web/zurich/admin/report_edit.html
+++ b/templates/web/zurich/admin/report_edit.html
@@ -58,23 +58,11 @@
<dd class="screen-no-space-after">
<strong>[% PROCESS format_date this_date=problem.created %] [% problem.created.hms %]</strong>
</dd>
- <dt class="print-only">[% loc('Coordinates:') %] <!-- Koordinaten --></dt>
- <dd class="screen-no-space-after print-no-space-after">
- [% problem.local_coords.join(',') %]
- <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% problem.latitude %]">
- <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% problem.longitude %]">
- </dd>
- <dd class="screen-no-space-after print-no-space-after">
- [% IF problem.used_map %]
- [% loc('Used map') %]
- [% ELSE %]
- [% loc("Didn't use map") %]
- [% END %]
- </dd>
- <dd>[%
- safe = problem.postcode | html;
- tprintf( loc('originally entered: &ldquo;%s&rdquo;'), safe )
- %]</dd>
+
+ <dd>[% c.cobrand.admin_district_lookup(problem) %]</dd>
+
+ <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% problem.latitude %]">
+ <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% problem.longitude %]">
[% SET fields = problem.get_extra_fields; IF fields.size %]
<dd>
@@ -129,7 +117,7 @@
<div class="admin-report-edit admin-report-edit--interact">
-[% INCLUDE status_message %]
+[% status_message %]
<dl [% IF status_message %]class="with-message"[% END %]>
@@ -280,6 +268,7 @@
[% ELSE %]
[% loc('Message to competent body:') %]
[% END %]
+ [% problem.body(c).endpoint %]
</h2>
<div class="admin-external-message">
[% problem.extra.external_message | html_para %]
diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html
index b453465f7..cd08e9503 100644
--- a/templates/web/zurich/header.html
+++ b/templates/web/zurich/header.html
@@ -9,6 +9,7 @@
<meta name="HandHeldFriendly" content="true">
<meta name="mobileoptimized" content="0">
+ [% INCLUDE 'header_opengraph.html' %]
[% INCLUDE 'header/css.html' %]
<link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/themes/redmond/jquery-ui.css">
diff --git a/templates/web/zurich/header/title.html b/templates/web/zurich/header/title.html
new file mode 100644
index 000000000..118817e48
--- /dev/null
+++ b/templates/web/zurich/header/title.html
@@ -0,0 +1,4 @@
+<title>
+ [% "$title :: " | html IF title %]
+ Züri wie neu – Infrastrukturschäden melden – Stadt Zürich
+</title>
diff --git a/templates/web/zurich/header_opengraph.html b/templates/web/zurich/header_opengraph.html
new file mode 100644
index 000000000..0a7dc42d7
--- /dev/null
+++ b/templates/web/zurich/header_opengraph.html
@@ -0,0 +1,8 @@
+ <meta property="og:url" content="[% c.cobrand.base_url %][% c.req.uri.path %]">
+ <meta property="og:title" content="[% title || site_name | html %]">
+ <meta property="og:site_name" content="[% site_name %]">
+ [% IF c.req.uri.path == '/' %]
+ <meta name="description" property="og:description" content="Melden Sie Schäden an der Infrastruktur der Stadt Zürich wie Schlaglöcher, defekte Beleuchtung/Signalisation, Graffitis, Schädlinge oder Abfall auf öffentlichem Grund.">
+ [% END %]
+ <meta property="og:type" content="website">
+ [% INCLUDE 'header_opengraph_image.html' %]
diff --git a/templates/web/zurich/reports/_list-filter-status.html b/templates/web/zurich/reports/_list-filter-status.html
new file mode 100644
index 000000000..bf56821f6
--- /dev/null
+++ b/templates/web/zurich/reports/_list-filter-status.html
@@ -0,0 +1,7 @@
+<select class="form-control js-multiple" name="status" id="statuses" multiple
+ data-all="[% loc('All') %]" data-all-options='["open","closed"]'
+ [% INCLUDE 'reports/_status_filter_options.html' %]
+>
+ <option value="open"[% ' selected' IF filter_status.open %]>[% prettify_state('confirmed') %]</option>
+ <option value="closed"[% ' selected' IF filter_status.closed %]>[% prettify_state('closed') %]</option>
+</select>
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-01 05:26:24 +0000