diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/email/lincolnshire/contact.html | 38 | ||||
| -rw-r--r-- | templates/email/lincolnshire/contact.txt | 11 | ||||
| -rw-r--r-- | templates/web/base/admin/bodies.html | 4 | ||||
| -rw-r--r-- | templates/web/base/admin/defecttypes/index.html | 3 | ||||
| -rw-r--r-- | templates/web/base/dashboard/index.html | 2 | ||||
| -rwxr-xr-x | templates/web/base/reports/index.html | 2 |
6 files changed, 54 insertions, 6 deletions
diff --git a/templates/email/lincolnshire/contact.html b/templates/email/lincolnshire/contact.html new file mode 100644 index 000000000..d9e9b060a --- /dev/null +++ b/templates/email/lincolnshire/contact.html @@ -0,0 +1,38 @@ +[% + +subject_html = subject | html; +name = form_name | html; +email_summary = "“" _ subject_html _ "” – Message from " _ name _ " on " _ host; +email_footer = "Sent via " _ host _ ", IP " _ ip; +email_columns = 1; + +PROCESS '_email_settings.html'; + +INCLUDE '_email_top.html'; + +%] + +<th style="[% td_style %][% contact_meta_style %]"> + <table [% table_reset %]> + <tr> + <th style="[% contact_th_style %]">From</th> + <td style="[% contact_td_style %]">[% name %] <<a href="mailto:[% em | html %]">[% em | html %]</a>></td> + </tr> + </table> +</th> +</tr> + +<tr> +<th style="[% td_style %][% only_column_style %]"> + <h1 style="[% h1_style %]">[% subject | html %]</h1> + [% message | html | html_para | replace('<p>', '<p style="' _ p_style _ '">') %] + [%~ IF complaint %] + <p style="[% secondary_p_style %]"> + [% complaint | html %] + - <a href="[% problem_url %]">Report</a> + - <a href="[% admin_url %]">Admin</a> + </p> + [%~ END %] +</th> + +[% INCLUDE '_email_bottom.html' %] diff --git a/templates/email/lincolnshire/contact.txt b/templates/email/lincolnshire/contact.txt new file mode 100644 index 000000000..16abb3732 --- /dev/null +++ b/templates/email/lincolnshire/contact.txt @@ -0,0 +1,11 @@ +Subject: [% site_name %] message: [% subject %] + +[% message %] + +[% IF complaint %] +[ [% complaint %] - [% problem_url %] - [% admin_url %] ] +[% END %] + +-- +Sent by contact form on [% host %]. +IP address [% ip %] diff --git a/templates/web/base/admin/bodies.html b/templates/web/base/admin/bodies.html index 9f4b81340..33ae5b25a 100644 --- a/templates/web/base/admin/bodies.html +++ b/templates/web/base/admin/bodies.html @@ -32,12 +32,12 @@ </tr> [%- FOREACH body IN bodies %] [%- SET id = body.id %] - [% NEXT IF c.cobrand.moniker == 'zurich' AND admin_type == 'dm' AND (body.parent OR body.bodies) %] + [% NEXT IF c.cobrand.moniker == 'zurich' AND admin_type == 'dm' AND (body.parent OR body.children_count) %] <tr[% IF body.deleted %] class="adminhidden"[% END %] [% IF NOT counts.$id OR counts.$id.deleted == counts.$id.c %] class="is-deleted"[% END %]> <td> [% IF c.cobrand.moniker == 'zurich' %] - [% FILTER repeat(4*body.api_key) %] [% END %] + [% FILTER repeat(4*body.indent_level) %] [% END %] [% IF admin_type == 'super' %] <a href="[% c.uri_for( 'body', id ) %]">[% body.name | html %]</a> [% ELSE %] diff --git a/templates/web/base/admin/defecttypes/index.html b/templates/web/base/admin/defecttypes/index.html index c45a09e6e..9e753edb6 100644 --- a/templates/web/base/admin/defecttypes/index.html +++ b/templates/web/base/admin/defecttypes/index.html @@ -4,8 +4,7 @@ [% FOR body IN bodies %] <li> <a href="[% c.uri_for('', body.id) %]">[% body.name %]</a> - [% defect_types_count = body.defect_types.count %] - [% IF defect_types_count %]([% defect_types_count %])[% END %] + [% IF body.defect_type_count %]([% body.defect_type_count %])[% END %] </li> [% END %] </ul> diff --git a/templates/web/base/dashboard/index.html b/templates/web/base/dashboard/index.html index cb6ca154f..5377fa938 100644 --- a/templates/web/base/dashboard/index.html +++ b/templates/web/base/dashboard/index.html @@ -50,7 +50,7 @@ <label for="ward">[% loc('Council:') %]</label> <select class="form-control" name="body" id="body"><option value=''>[% loc('All') %]</option> [% FOR b IN bodies %] - [% NEXT IF NOT b.get_column("area_count") %] + [% NEXT IF NOT b.area_count %] <option value="[% b.id %]">[% b.name %]</option> [% END %] </select> diff --git a/templates/web/base/reports/index.html b/templates/web/base/reports/index.html index 9fcf0b4c5..dfb99f089 100755 --- a/templates/web/base/reports/index.html +++ b/templates/web/base/reports/index.html @@ -79,7 +79,7 @@ <option value="">[% loc('Pick your council') %]</option> [% FOR b IN bodies # Not body as 'body' may be on stash %] <option value="[% b.id %]">[% b.name | html ~%] - [% IF NOT b.get_column("area_count") %] [% loc('(no longer exists)') %][% END ~%] + [% IF NOT b.area_count %] [% loc('(no longer exists)') %][% END ~%] </option> [% END %] </select> |