aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web/zurich
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web/zurich')
-rw-r--r--templates/web/zurich/admin/body-form.html3
-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/stats/index.html (renamed from templates/web/zurich/admin/stats.html)0
-rw-r--r--templates/web/zurich/admin/templates.html28
-rw-r--r--templates/web/zurich/admin/update_edit.html2
-rw-r--r--templates/web/zurich/auth/general.html34
-rw-r--r--templates/web/zurich/footer.html3
-rw-r--r--templates/web/zurich/footer_extra_js.html6
-rw-r--r--templates/web/zurich/header.html8
-rw-r--r--templates/web/zurich/maps/zurich.html10
-rw-r--r--templates/web/zurich/report/new/fill_in_details_form.html8
-rwxr-xr-xtemplates/web/zurich/reports/index.html4
13 files changed, 66 insertions, 52 deletions
diff --git a/templates/web/zurich/admin/body-form.html b/templates/web/zurich/admin/body-form.html
index de9fac0e2..44adcbc72 100644
--- a/templates/web/zurich/admin/body-form.html
+++ b/templates/web/zurich/admin/body-form.html
@@ -22,8 +22,7 @@
<p>
<label for="area_ids">[% loc('Area covered') %]</label>
- <select class="form-control" name="area_ids" id="area_ids" multiple>
- <option value=""> -- [% loc('Select an area') %] -- </option>
+ <select class="form-control js-multiple" name="area_ids" id="area_ids" multiple data-none="-- [% loc('Select an area') %] --">
[% SET body_areas = body.areas %]
[% FOR area IN areas %]
[% SET aid = area.id %]
diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html
index 07f0332d5..07fc9ad36 100644
--- a/templates/web/zurich/admin/report_edit-sdm.html
+++ b/templates/web/zurich/admin/report_edit-sdm.html
@@ -1,9 +1,9 @@
[%
PROCESS "report/photo-js.html";
PROCESS "maps/zurich.html";
+ SET bodyclass = 'mappage';
PROCESS 'admin/header.html'
- title = tprintf(loc('Editing problem %d'), problem.id ),
- bodyclass = 'mappage';
+ title = tprintf(loc('Editing problem %d'), problem.id );
PROCESS 'admin/report_blocks.html'
-%]
@@ -64,7 +64,7 @@
<br>
[% problem.user.email | html %]
[% IF NOT problem.extra.email_confirmed %]<span class="error">[% loc('Unconfirmed') %]</span>[% END %]
- <input type='hidden' id='email' name='email' value='[% problem.user.email | html %]'>
+ <input type='hidden' id='username' name='username' value='[% problem.user.username | html %]'>
<br>
[% IF problem.user.phone %][% problem.user.phone | html %][% ELSE %]<em>[% loc('(No phone number)') %]</em>[% END %]
</dd>
diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html
index 35075a9f0..7e88fab30 100644
--- a/templates/web/zurich/admin/report_edit.html
+++ b/templates/web/zurich/admin/report_edit.html
@@ -1,9 +1,9 @@
[%
PROCESS "report/photo-js.html";
PROCESS "maps/zurich.html";
+ SET bodyclass = 'mappage';
INCLUDE 'admin/header.html'
- title = tprintf(loc('Editing problem %d'), problem.id ),
- bodyclass = 'mappage';
+ title = tprintf(loc('Editing problem %d'), problem.id );
PROCESS 'admin/report_blocks.html'
-%]
@@ -92,7 +92,7 @@
<br>
[% problem.user.email | html %]
[% IF NOT problem.extra.email_confirmed %]<span class="error">[% loc('Unconfirmed') %]</span>[% END %]
- <input type='hidden' id='email' name='email' value='[% problem.user.email | html %]'>
+ <input type='hidden' id='username' name='username' value='[% problem.user.username | html %]'>
<br>
[% IF problem.user.phone %][% problem.user.phone | html %][% ELSE %]<em>[% loc('(No phone number)') %]</em>[% END %]
</dd>
diff --git a/templates/web/zurich/admin/stats.html b/templates/web/zurich/admin/stats/index.html
index ce8e238f7..ce8e238f7 100644
--- a/templates/web/zurich/admin/stats.html
+++ b/templates/web/zurich/admin/stats/index.html
diff --git a/templates/web/zurich/admin/templates.html b/templates/web/zurich/admin/templates.html
new file mode 100644
index 000000000..2db9e2e34
--- /dev/null
+++ b/templates/web/zurich/admin/templates.html
@@ -0,0 +1,28 @@
+[% INCLUDE 'admin/header.html' title=tprintf(loc('Response Templates for %s'), body.name) -%]
+
+<h2> [% tprintf(loc('Response Templates for %s'), body.name) %] </h2>
+
+<table>
+ <thead>
+ <tr>
+ <th> [% loc('Title') %] </th>
+ <th> [% loc('Text') %] </th>
+ <th> [% loc('Created') %] </th>
+ <th> &nbsp; </th>
+ </tr>
+ </thead>
+ <tbody>
+[% FOR t IN response_templates %]
+ <tr>
+ <td> [% t.title %] </td>
+ <td> [% t.text %] </td>
+ <td> [% t.created %] </td>
+ <td> <a href="[% c.uri_for('templates', body.id, t.id) %]" class="btn">[% loc('Edit') %]</a> </td>
+ </tr>
+[% END %]
+ </tbody>
+</table>
+
+<a href="[% c.uri_for('templates', body.id, 'new') %]" class="btn">[% loc('New template') %]</a>
+
+[% INCLUDE 'admin/footer.html' %]
diff --git a/templates/web/zurich/admin/update_edit.html b/templates/web/zurich/admin/update_edit.html
index b2cde0b92..bcf849732 100644
--- a/templates/web/zurich/admin/update_edit.html
+++ b/templates/web/zurich/admin/update_edit.html
@@ -20,7 +20,7 @@
[% END %]
</select></li>
<input type='hidden' name='name' id='name' value='[% update.name | html %]'>
-<input type='hidden' id='email' name='email' value='[% update.user.email | html %]'>
+<input type='hidden' id='username' name='username' value='[% update.user.username | html %]'>
[% IF update.problem_state %]
<li>[% tprintf(loc('Update changed problem state to %s'), update.problem_state) %]</li>
[% END %]
diff --git a/templates/web/zurich/auth/general.html b/templates/web/zurich/auth/general.html
index fd34b79f8..899f0ca71 100644
--- a/templates/web/zurich/auth/general.html
+++ b/templates/web/zurich/auth/general.html
@@ -1,18 +1,18 @@
[% INCLUDE 'header.html', title = loc('Sign in or create an account') %]
-[% IF email_error;
+[% IF username_error;
# other keys include fqdn, mxcheck if you'd like to write a custom error message
errors = {
- missing => loc('Please enter your email'),
- other => loc('Please check your email address is correct')
+ missing_email = loc('Please enter your email'),
+ other_email = loc('Please check your email address is correct')
};
- loc_email_error = errors.$email_error || errors.other;
+ loc_username_error = errors.$username_error || errors.other_email;
END %]
-<form action="[% c.uri_for() %]" method="post" name="general_auth_login" class="validate">
+<form action="/auth" method="post" name="general_auth_login" class="validate">
<fieldset>
<h1>[% loc('Sign in') %]</h1>
@@ -21,18 +21,18 @@ END %]
<div id="form_sign_in_yes" class="form-box">
- <label class="n" for="email">[% loc('Email') %]</label>
- [% IF loc_email_error %]
- <div class="form-error">[% loc_email_error %]</div>
+ <label class="n" for="username">[% loc('Email') %]</label>
+ [% IF loc_username_error %]
+ <div class="form-error">[% loc_username_error %]</div>
[% ELSIF sign_in_error %]
- <div class="form-error">[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form.') %]</div>
+ <div class="form-error">[% loc('There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the &lsquo;No&rsquo; section of the form.') %]</div>
[% END %]
- <input type="email" class="required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]" autofocus>
+ <input type="email" class="required email" id="username" name="username" value="[% username | html %]" placeholder="[% loc('Your email address') %]" autofocus>
<label for="password_sign_in">[% loc('Password (optional)') %]</label>
<div class="form-txt-submit-box">
<input type="password" class="required" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]">
- <input class="green-btn" type="submit" name="sign_in" value="[% loc('Sign in') %]">
+ <input class="green-btn" type="submit" name="sign_in_by_password" value="[% loc('Sign in') %]">
</div>
<div class="form-txt-submit-box">
@@ -44,18 +44,18 @@ END %]
</fieldset>
</form>
-<form action="[% c.uri_for() %]" method="post" name="general_auth_register" class="validate">
+<form action="/auth" method="post" name="general_auth_register" class="validate">
<fieldset>
<input type="hidden" name="r" value="[% c.req.params.r | html %]">
<h1>[% loc('<strong>No</strong> let me sign in by email') %]</h1>
<div id="form_sign_in_no" class="form-box">
- <label class="n" for="email2">[% loc('Email') %]</label>
- [% IF loc_email_error %]
- <div class="form-error">[% loc_email_error %]</div>
+ <label class="n" for="username2">[% loc('Email') %]</label>
+ [% IF loc_username_error %]
+ <div class="form-error">[% loc_username_error %]</div>
[% END %]
- <input type="email" class="required email" id="email2" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]">
+ <input type="email" class="required email" id="username2" name="username" value="[% username | html %]" placeholder="[% loc('Your email address') %]">
<label for="name">[% loc('Name') %]</label>
<input type="text" class="required" name="name" value="" placeholder="[% loc('Your name') %]">
@@ -63,7 +63,7 @@ END %]
<label for="password_register">[% loc('Password (optional)') %]</label>
<div class="form-txt-submit-box">
<input type="password" class="required" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
- <input class="green-btn" type="submit" name="email_sign_in" value="Registrieren">
+ <input class="green-btn" type="submit" name="sign_in_by_code" value="Registrieren">
</div>
</div>
diff --git a/templates/web/zurich/footer.html b/templates/web/zurich/footer.html
index 0164dbcab..f68f80aea 100644
--- a/templates/web/zurich/footer.html
+++ b/templates/web/zurich/footer.html
@@ -34,10 +34,7 @@
</div>
</div>
- <script src="[% version('/cobrands/zurich/validation_rules.js') %]"></script>
[% INCLUDE 'common_footer_tags.html' %]
- <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js" charset="utf-8"></script>
- <script src="[% version('/cobrands/zurich/js.js') %]"></script>
</body>
</html>
diff --git a/templates/web/zurich/footer_extra_js.html b/templates/web/zurich/footer_extra_js.html
new file mode 100644
index 000000000..a98457363
--- /dev/null
+++ b/templates/web/zurich/footer_extra_js.html
@@ -0,0 +1,6 @@
+[% scripts.push(
+ version('/jslib/jquery-1.7.2.min.js'),
+ version('/cobrands/zurich/validation_rules.js'),
+ '//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js',
+ version('/cobrands/zurich/js.js'),
+) %]
diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html
index 0ab051aa7..117e44449 100644
--- a/templates/web/zurich/header.html
+++ b/templates/web/zurich/header.html
@@ -10,13 +10,7 @@
<meta name="HandHeldFriendly" content="true">
<meta name="mobileoptimized" content="0">
- <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
- <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="screen and (min-width:48em)">
- [% extra_css %]
- <!--[if (lt IE 9) & (!IEMobile)]>
- <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
- <![endif]-->
-
+ [% INCLUDE 'header/css.html' %]
<link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/themes/redmond/jquery-ui.css">
[% INCLUDE 'common_header_tags.html' %]
diff --git a/templates/web/zurich/maps/zurich.html b/templates/web/zurich/maps/zurich.html
index a9499f657..4000e1e52 100644
--- a/templates/web/zurich/maps/zurich.html
+++ b/templates/web/zurich/maps/zurich.html
@@ -1,13 +1,3 @@
-[%
-map_js = [
- version('/vendor/OpenLayers/OpenLayers.zurich.js'),
- version('/js/OpenLayers.Projection.CH1903Plus.js'),
- version('/js/map-OpenLayers.js'),
- version('/js/map-wmts-base.js'),
- version('/js/map-wmts-zurich.js'),
-]
-%]
-
[% map_sub_links = BLOCK %]
<a class="hidden-nojs" id="map_layer_toggle" href="">Stadtplan</a>
[% END %]
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 77d764950..fd21e0fff 100644
--- a/templates/web/zurich/report/new/fill_in_details_form.html
+++ b/templates/web/zurich/report/new/fill_in_details_form.html
@@ -50,11 +50,11 @@
[% PROCESS "report/new/category_wrapper.html" %]
- <label for="form_email">[% loc('Your email') %]</label>
- [% IF field_errors.email %]
- <p class='form-error'>[% field_errors.email %]</p>
+ <label for="form_username">[% loc('Your email') %]</label>
+ [% IF field_errors.username %]
+ <p class='form-error'>[% field_errors.username %]</p>
[% END %]
- <input class="form-control" type="email" value="[% report.user.email | html %]" name="email" id="form_email" placeholder="[% loc('Please enter your email address') %]" required>
+ <input class="form-control" type="email" value="[% report.user.email | html %]" name="username" id="form_username" placeholder="[% loc('Please enter your email address') %]" required>
<label for="form_name">[% loc('Name') %] [% loc('(optional)') %]</label>
[% IF field_errors.name %]
diff --git a/templates/web/zurich/reports/index.html b/templates/web/zurich/reports/index.html
index 8bec64c86..1389c666c 100755
--- a/templates/web/zurich/reports/index.html
+++ b/templates/web/zurich/reports/index.html
@@ -1,8 +1,8 @@
[%
PROCESS "maps/${map.type}.html";
+ SET bodyclass = 'mappage';
INCLUDE 'header.html',
- title = loc('Summary reports'),
- bodyclass = 'mappage';
+ title = loc('Summary reports');
%]
[% map_html %]
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-01 16:41:06 +0000