aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web')
-rw-r--r--templates/web/base/admin/defecttypes/list.html3
-rw-r--r--templates/web/base/admin/exordefects/index.html39
-rw-r--r--templates/web/base/common_scripts.html5
-rw-r--r--templates/web/base/defect_type/format.html9
-rw-r--r--templates/web/base/report/_inspect.html35
-rw-r--r--templates/web/base/report/new/category_extras_fields.html2
-rw-r--r--templates/web/oxfordshire/defect_type/format.html4
-rw-r--r--templates/web/oxfordshire/footer_extra_js.html1
-rw-r--r--templates/web/oxfordshire/report/_inspect_extra_info.html8
9 files changed, 7 insertions, 99 deletions
diff --git a/templates/web/base/admin/defecttypes/list.html b/templates/web/base/admin/defecttypes/list.html
index ffff89eff..5730710d9 100644
--- a/templates/web/base/admin/defecttypes/list.html
+++ b/templates/web/base/admin/defecttypes/list.html
@@ -10,10 +10,9 @@
</tr>
</thead>
<tbody>
- [% PROCESS 'defect_type/format.html' %]
[% FOR d IN defect_types %]
<tr>
- <td> [% defect_type_format(defect_type=d) %] </td>
+ <td> [% d.name | html %] </td>
<td> [% d.description | html %] </td>
<td>
[% UNLESS d.contacts.size %]
diff --git a/templates/web/base/admin/exordefects/index.html b/templates/web/base/admin/exordefects/index.html
deleted file mode 100644
index 65b2aa486..000000000
--- a/templates/web/base/admin/exordefects/index.html
+++ /dev/null
@@ -1,39 +0,0 @@
-[% INCLUDE 'admin/header.html' title=('Download Exor RDI') -%]
-
-[% IF error_message %]
- <h2>Error</h2>
- <p>[% error_message %]</p>
-[% END %]
-
-<form method="get" action="[% c.uri_for('download') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
- <div class="filters">
- <p>
- <label for="start_date">[% ('Start Date:') %]</label><input type="date" class="form-control"
- name="start_date" id="start_date"
- value="[% start_date ? start_date.strftime( '%Y-%m-%d') : '' | html %]" />
- </p>
-
- <p>
- <label for="end_date">[% ('End Date:') %]</label><input type="date" class="form-control"
- name="end_date" id="end_date" size="5"
- value="[% end_date ? end_date.strftime( '%Y-%m-%d') : '' | html %]" />
- </p>
-
- <p>
- <label for="user_id">[% ('Inspector:') %]</label>
- <select class="form-control" id='user_id' name='user_id'>
- <option value=''>[% ('All inspectors') %]</option>
- [% FOR inspector IN inspectors %]
- <option value="[% inspector.id %]" [% 'selected' IF user_id == inspector.id %]>[% inspector.name %] ([% inspector.get_extra_metadata('initials') %])</option>
- [% END %]
- </select>
- </p>
- </div>
-
- <p>
- <input type="submit" class="btn" size="30" value="Download RDI file" />
- </p>
-</form>
-
-
-[% INCLUDE 'admin/footer.html' %]
diff --git a/templates/web/base/common_scripts.html b/templates/web/base/common_scripts.html
index 60775fcae..56b2e6d2e 100644
--- a/templates/web/base/common_scripts.html
+++ b/templates/web/base/common_scripts.html
@@ -39,6 +39,11 @@ IF c.user_exists AND (c.user.from_body OR c.user.is_superuser);
version('/jslib/jquery-1.7.2.min.js'),
version('/cobrands/fixmystreet/staff.js')
);
+ IF bodyclass.match('mappage');
+ scripts.push(
+ version('/js/duplicates.js')
+ );
+ END;
IF c.user.has_body_permission_to('planned_reports');
scripts.push(
version('/cobrands/fixmystreet/offline.js'),
diff --git a/templates/web/base/defect_type/format.html b/templates/web/base/defect_type/format.html
deleted file mode 100644
index 3c0781501..000000000
--- a/templates/web/base/defect_type/format.html
+++ /dev/null
@@ -1,9 +0,0 @@
-[%
-# This template can be overridden by cobrands if they've added extra fields
-# to the DefectType model (e.g Cobrand::Oxfordshire->defect_type_extra_fields)
-# which should be used to represent this DefectType
-# to the user in the inspect form.
-~%]
-[% MACRO defect_type_format BLOCK ~%]
-[%~ defect_type.name | html ~%]
-[%~ END %] \ No newline at end of file
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index 10f3b6b84..c6873d473 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -1,6 +1,3 @@
-[% extra_js = [
- version('/js/duplicates.js'),
-] -%]
[% permissions = c.user.permissions(problem) %]
[% second_column = BLOCK -%]
<div id="side-inspect">
@@ -27,7 +24,6 @@
<p data-category="[% cat_name | html %]"
[%~ IF cat_name != problem.category %] class="hidden"[% END %]
data-priorities='[% priorities_by_category.$cat_name | html %]'
- data-defect-types='[% category_defect_types.$cat_name | html %]'
data-templates='[% templates_by_category.$cat_name | html %]'>
[% IF cat_name == problem.category %]
[% INCLUDE 'report/new/category_extras_fields.html' metas=category_extras.$cat_name hide_notices=1 show_hidden=1 %]
@@ -38,32 +34,10 @@
[% END %]
[% IF permissions.report_inspect %]
- [% PROCESS 'defect_type/format.html' %]
- <p>
- <label for="defect_type">[% loc('Defect type') %]</label>
- <select id="defect_type" name="defect_type" class="form-control">
- <option value=""[% ' selected' IF NOT problem.defect_type %]>-</option>
- [% FOREACH defect_type IN problem.defect_types %]
- <option[% ' selected' IF problem.defect_type_id == defect_type.id %] value="[% defect_type.id %]">[% defect_type_format() %]</option>
- [% END %]
- </select>
- </p>
-
<p>
<label for="state">[% loc('State') %]</label>
[% INCLUDE 'report/inspect/state_groups_select.html' %]
</p>
- [% IF permissions.report_instruct AND NOT problem.get_extra_metadata('inspected') %]
- <div id="js-inspect-action-scheduled" class="[% "hidden" UNLESS problem.state == 'action scheduled' %]">
- <p>[% loc('Do you want to automatically raise a defect?') %]</p>
- <p class="segmented-control segmented-control--radio">
- <input type="radio" name="raise_defect" id="raise_defect_yes" value="1">
- <label class="btn" for="raise_defect_yes">[% loc('Yes') %]</label>
- <input type="radio" name="raise_defect" id="raise_defect_no" value="0">
- <label class="btn" for="raise_defect_no">[% loc('No') %]</label>
- </p>
- </div>
- [% END %]
<div id="js-duplicate-reports" class="[% "hidden" UNLESS problem.duplicate_of %]">
<input type="hidden" name="duplicate_of" value="[% problem.duplicate_of.id %]">
<p class="[% "hidden" UNLESS problem.duplicate_of %]"><strong>[% loc('Duplicate of') %]</strong></p>
@@ -132,15 +106,6 @@
[% INCLUDE 'report/inspect/public_update.html' %]
[% END %]
- [% IF problem.get_extra_metadata('inspected') %]
- [% IF problem.whensent %]
- <p>[% loc("<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on.") %]</p>
- [% ELSE %]
- <p>[% loc("<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on.") %]</p>
- [% END %]
- [% TRY %][% INCLUDE 'report/_inspect_extra_info.html' %][% CATCH file %][% END %]
- [% END %]
-
<p>
<input type="hidden" name="token" value="[% csrf_token %]" />
[% IF permissions.planned_reports %]
diff --git a/templates/web/base/report/new/category_extras_fields.html b/templates/web/base/report/new/category_extras_fields.html
index e9237f83b..9ab9722cf 100644
--- a/templates/web/base/report/new/category_extras_fields.html
+++ b/templates/web/base/report/new/category_extras_fields.html
@@ -8,7 +8,7 @@
[% ELSIF meta.variable != 'false' || NOT hide_notices %]
- <label for="[% cat_prefix %]form_[% meta_name %]">[% meta.description %]</label>
+ <label for="[% cat_prefix %]form_[% meta_name %]">[% meta.description OR meta.code %]</label>
[% TRY %][% INCLUDE 'report/new/_category_extra_field_notice.html' %][% CATCH file %][% END %]
[% IF field_errors.$x_meta_name %]
<p class='form-error'>[% field_errors.$x_meta_name %]</p>
diff --git a/templates/web/oxfordshire/defect_type/format.html b/templates/web/oxfordshire/defect_type/format.html
deleted file mode 100644
index 9cbf2d873..000000000
--- a/templates/web/oxfordshire/defect_type/format.html
+++ /dev/null
@@ -1,4 +0,0 @@
-[% MACRO defect_type_format BLOCK ~%]
-[%~ defect_type.get_extra_metadata('defect_code') | html %] - [% defect_type.get_extra_metadata('activity_code') | html %]
-([% defect_type.name | html %])
-[%~ END %] \ No newline at end of file
diff --git a/templates/web/oxfordshire/footer_extra_js.html b/templates/web/oxfordshire/footer_extra_js.html
index 1c48aa5cf..d3f1f03ee 100644
--- a/templates/web/oxfordshire/footer_extra_js.html
+++ b/templates/web/oxfordshire/footer_extra_js.html
@@ -3,7 +3,6 @@ IF bodyclass.match('mappage');
scripts.push(
version('/cobrands/fixmystreet/assets.js'),
version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'),
- version('/cobrands/oxfordshire/js.js'),
version('/cobrands/highways/assets.js'),
version('/cobrands/fixmystreet-uk-councils/council_validation_rules.js'),
);
diff --git a/templates/web/oxfordshire/report/_inspect_extra_info.html b/templates/web/oxfordshire/report/_inspect_extra_info.html
deleted file mode 100644
index 6151d79ae..000000000
--- a/templates/web/oxfordshire/report/_inspect_extra_info.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<p><small>
-RDI sent:
-[% IF problem.get_extra_metadata('rdi_processed') %]
- [% problem.get_extra_metadata('rdi_processed') %]
-[% ELSE %]
- <strong>not yet sent</strong>
-[% END %]
-</small></p>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 14:25:17 +0000