diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/web/default/admin/bodies.html | 4 | ||||
| -rw-r--r-- | templates/web/default/js/translation_strings.html | 3 | ||||
| -rw-r--r-- | templates/web/zurich/admin/body-form.html | 7 | ||||
| -rw-r--r-- | templates/web/zurich/admin/report_edit.html | 2 | ||||
| -rw-r--r-- | templates/web/zurich/admin/reports.html | 1 | ||||
| -rw-r--r-- | templates/web/zurich/js/validation_rules.html | 8 | ||||
| -rw-r--r-- | templates/web/zurich/report/new/fill_in_details_form.html | 5 |
7 files changed, 25 insertions, 5 deletions
diff --git a/templates/web/default/admin/bodies.html b/templates/web/default/admin/bodies.html index fabaf8923..c0824521e 100644 --- a/templates/web/default/admin/bodies.html +++ b/templates/web/default/admin/bodies.html @@ -16,6 +16,7 @@ <th>[% loc('Name') %]</th> [% IF c.cobrand.moniker == 'zurich' %] <th>[% loc('Email') %]</th> + <th>[% loc('Deleted') %]</th> [% ELSE %] <th>[% loc('Category') %]</th> [% END %] @@ -23,7 +24,7 @@ [%- FOREACH body IN bodies %] [%- SET id = body.id %] [% NEXT IF c.cobrand.moniker == 'zurich' AND admin_type == 'dm' AND (body.parent OR body.bodies) %] - <tr> + <tr[% IF c.cobrand.moniker == 'zurich' AND body.deleted %] class="muted"[% END %]> <td> [% IF c.cobrand.moniker == 'zurich' %] [% FILTER repeat(4*body.api_key) %] [% END %] @@ -39,6 +40,7 @@ </td> [% IF c.cobrand.moniker == 'zurich' %] <td>[% body.endpoint %]</td> + <td>[% IF body.deleted %]Yes[% END %]</td> [% ELSE %] <td> [% IF counts.$id %] diff --git a/templates/web/default/js/translation_strings.html b/templates/web/default/js/translation_strings.html index f6c4f7d41..8f834a81c 100644 --- a/templates/web/default/js/translation_strings.html +++ b/templates/web/default/js/translation_strings.html @@ -15,6 +15,9 @@ required: '[% loc('Please enter your email') | replace("'", "\\'") %]', email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]' }, + phone: { + required: '[% loc('Please enter your phone number') | replace("'", "\\'") %]' + }, fms_extra_title: '[% loc('Please enter your title') | replace("'", "\\'") %]', first_name: '[% loc('Please enter your first name') | replace("'", "\\'") %]', last_name: '[% loc('Please enter your second name') | replace("'", "\\'") %]', 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/report_edit.html b/templates/web/zurich/admin/report_edit.html index 128e74766..723086c46 100644 --- a/templates/web/zurich/admin/report_edit.html +++ b/templates/web/zurich/admin/report_edit.html @@ -136,7 +136,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' %] diff --git a/templates/web/zurich/js/validation_rules.html b/templates/web/zurich/js/validation_rules.html new file mode 100644 index 000000000..d98bc1118 --- /dev/null +++ b/templates/web/zurich/js/validation_rules.html @@ -0,0 +1,8 @@ + validation_rules = { + title: { required: true }, + detail: { required: true }, + email: { required: true }, + update: { required: true }, + phone: { required: true }, + rznvy: { required: true } + }; 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 1cecf036d..076536601 100644 --- a/templates/web/zurich/report/new/fill_in_details_form.html +++ b/templates/web/zurich/report/new/fill_in_details_form.html @@ -103,7 +103,10 @@ [% END %] <input type="text" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> - <label for="form_phone">[% loc('Phone number (optional)') %]</label> + <label for="form_phone">[% loc('Phone number') %]</label> + [% IF field_errors.phone %] + <p class='form-error'>[% field_errors.phone %]</p> + [% END %] <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]"> <div class="form-txt-submit-box"> |