aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/web/base/js/translation_strings.html2
-rw-r--r--templates/web/base/report/_inspect.html82
-rw-r--r--templates/web/base/report/_main.html27
-rw-r--r--templates/web/base/report/display.html4
-rw-r--r--templates/web/base/report/inspect.html5
-rw-r--r--templates/web/fixmystreet-uk-councils/maps/fms.html10
-rw-r--r--templates/web/fixmystreet.com/maps/fms.html10
7 files changed, 131 insertions, 9 deletions
diff --git a/templates/web/base/js/translation_strings.html b/templates/web/base/js/translation_strings.html
index d006442af..d6aca9ccb 100644
--- a/templates/web/base/js/translation_strings.html
+++ b/templates/web/base/js/translation_strings.html
@@ -37,6 +37,8 @@
geolocation_no_result: '[% loc('No result returned') | replace("'", "\\'") %]',
geolocation_unknown: '[% loc('Unknown error') | replace("'", "\\'") %]',
+ correct_position: '[% loc('Right place?') | replace("'", "\\'") %]',
+
reporting_a_problem: '[% loc('Reporting a problem') | replace("'", "\\'") %]',
ok: '[% loc('OK') | replace("'", "\\'") %]',
map: '[% loc('MAP') | replace("'", "\\'") %]',
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
new file mode 100644
index 000000000..6f81cc04a
--- /dev/null
+++ b/templates/web/base/report/_inspect.html
@@ -0,0 +1,82 @@
+[% PROCESS 'admin/report_blocks.html'; # For the report state dropdown %]
+[% second_column = BLOCK -%]
+ <div id="side-report-secondary">
+ <div class="problem-inspector-fields clearfix">
+ <form id="report_inspect_form" method="post" action="[% c.uri_for( '/report', problem.id, 'inspect' ) %]">
+ <p class="left">
+ <label for="problem_id">[% loc('Report ID:') %]</label>
+ <input type="text" readonly id="problem_id" value="[% problem.id %]">
+ </p>
+ <p class="right">
+ <label for="problem_priority">[% loc('Priority:') %]</label>
+ <select name="priority" id="problem_priority">
+ <option value="" [% 'selected' UNLESS problem.get_extra_metadata('priority') %]>-</option>
+ [% FOREACH priority IN priorities %]
+ <option value="[% priority.key %]" [% 'selected' IF problem.get_extra_metadata('priority') == priority.key %]>[% priority.value %]</option>
+ [% END %]
+ </select>
+ </p>
+ <p class="left">
+ <label for="state">[% loc('State:') %]</label>
+ [%# XXX this is duplicated from admin/report_edit.html, should be refactored %]
+ <select name="state" id="state">
+ [% FOREACH group IN state_groups %]
+ <optgroup label="[% group.0 %]">
+ [% FOREACH state IN group.1 %]
+ <option [% 'selected ' IF state == problem.state %] value="[% state %]">[% state_pretty.$state %]</option>
+ [% END %]
+ </optgroup>
+ [% END %]
+ </select>
+ </p>
+ <p class="right">
+ <label for="category">[% loc('Category:') %]</label>
+ [%# XXX this is duplicated from admin/report_edit.html, should be refactored %]
+ <select name="category" id="category">
+ [% IF NOT problem.category OR NOT categories.grep(problem.category).size %]
+ <optgroup label="[% loc('Existing category') %]">
+ <option selected value="[% problem.category | html %]">[% (problem.category OR '-') | html %]</option>
+ </optgroup>
+ [% END %]
+ [% IF categories.size %]
+ <optgroup label="[% loc('Available categories') %]">
+ [% FOREACH cat IN categories %]
+ <option[% ' selected' IF problem.category == cat %]>[% cat | html %]</option>
+ [% END %]
+ </optgroup>
+ [% END %]
+ </select>
+ </p>
+ <p>
+ [% SET local_coords = problem.local_coords; %]
+ <strong>[% loc('Easting/Northing:') %]</strong>
+ <span id="problem_easting">[% local_coords.0 IF local_coords %]</span>,
+ <span id="problem_northing">[% local_coords.1 IF local_coords %]</span>
+ <input type="hidden" name="longitude" value="[% problem.longitude %]">
+ <input type="hidden" name="latitude" value="[% problem.latitude %]">
+ </p>
+ <p style="clear:both;">
+ <a href="#" id="geolocate_link">[% loc('Use my current location') %]</a>,
+ [% loc('or drag the pin on the map') %] &raquo;
+ </p>
+ <p>
+ <label for="detailed_information">[% loc('Detailed problem location:') %]</label>
+ <textarea rows="2" name="detailed_location">[% problem.get_extra_metadata('detailed_location') | html %]</textarea>
+ </p>
+ <p>
+ <label for="detailed_information">[% loc('Detailed problem information:') %]</label>
+ <textarea rows="2" name="detailed_information">[% problem.get_extra_metadata('detailed_information') | html %]</textarea>
+ </p>
+ <p>
+ <label for="traffic_information">[% loc('Traffic management information:') %]</label>
+ <textarea rows="2" name="traffic_information">[% problem.get_extra_metadata('traffic_information') | html %]</textarea>
+ </p>
+ <p>
+ <input type="hidden" name="token" value="[% csrf_token %]">
+ <a href="[% c.uri_for( '/report', problem.id ) %]" class="btn">[% loc('Cancel') %]</a>
+ <input type="submit" value="[% loc('Save changes') %]" name="save" />
+ </p>
+ </form>
+ </div>
+ </div>
+[%- END %] \ No newline at end of file
diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html
index 585200ac3..1b1a6e29e 100644
--- a/templates/web/base/report/_main.html
+++ b/templates/web/base/report/_main.html
@@ -1,4 +1,5 @@
-[% moderating = c.user && c.user.has_permission_to('moderate', problem.bodies_str) %]
+[% can_moderate = c.user && c.user.has_permission_to('moderate', problem.bodies_str) %]
+[% can_inspect = c.user && c.user.has_permission_to('report_inspect', problem.bodies_str) && !hide_inspect_button %]
<a href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]"
class="problem-back js-back-to-report-list">[% loc('Back to all reports') %]</a>
@@ -22,18 +23,15 @@
</form>
[% END %]
- [% IF moderating %]
+ [% IF can_moderate %]
[% original = problem_original %]
<form method="post" action="/moderate/report/[% problem.id %]">
<input type="hidden" name="token" value="[% csrf_token %]">
- <p class="moderate-display">
- <input type="button" class="btn moderate" value="Moderate this report">
- </p>
[% END %]
<h1 class="moderate-display">[% problem.title | html %]</h1>
- [% IF moderating %]
+ [% IF can_moderate %]
<div class="moderate-edit">
[% IF problem.title != original.title %]
<label>
@@ -62,7 +60,7 @@
[% INCLUDE 'report/_support.html' %]
- [% IF moderating %]
+ [% IF can_moderate %]
[% IF problem.photo or original.photo %]
<p class="moderate-edit">
<label>
@@ -78,7 +76,7 @@
[% problem.detail | add_links | html_para %]
</div>
- [% IF moderating %]
+ [% IF can_moderate %]
<p class="moderate-edit">
[% IF problem.detail != original.detail %]
<label>
@@ -105,7 +103,20 @@
<input type="button" class="btn cancel" value="Discard changes">
</p>
</div>
+ [% END %]
+
+ [% IF can_moderate OR can_inspect %]
+ <p class="moderate-display">
+ [% IF can_moderate %]
+ <input type="button" class="btn moderate" value="Moderate this report">
+ [% END %]
+ [% IF can_inspect %]
+ <a href="/report/[% problem.id %]/inspect" class="btn inspect">Inspect</a>
+ [% END %]
+ </p>
+ [% END %]
+ [% IF can_moderate %]
</form>
[% END %]
diff --git a/templates/web/base/report/display.html b/templates/web/base/report/display.html
index 50c649f9a..fb8cd8191 100644
--- a/templates/web/base/report/display.html
+++ b/templates/web/base/report/display.html
@@ -1,5 +1,5 @@
[%
- SET bodyclass = 'mappage';
+ DEFAULT bodyclass = 'mappage';
PROCESS "report/photo-js.html";
PROCESS "maps/${map.type}.html";
@@ -45,6 +45,8 @@
[% END %]
</div>
+
+ [% second_column %]
</div>
[% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/report/inspect.html b/templates/web/base/report/inspect.html
new file mode 100644
index 000000000..ad70b2ac5
--- /dev/null
+++ b/templates/web/base/report/inspect.html
@@ -0,0 +1,5 @@
+[%
+ SET bodyclass = 'mappage with-actions';
+ PROCESS 'report/_inspect.html';
+ INCLUDE 'report/display.html', hide_inspect_button = 1;
+%]
diff --git a/templates/web/fixmystreet-uk-councils/maps/fms.html b/templates/web/fixmystreet-uk-councils/maps/fms.html
new file mode 100644
index 000000000..3cf503c96
--- /dev/null
+++ b/templates/web/fixmystreet-uk-councils/maps/fms.html
@@ -0,0 +1,10 @@
+[% map_js = BLOCK %]
+<!-- <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0&mkt=en-GB"></script> -->
+<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/OpenLayers.Projection.OrdnanceSurvey.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/map-bing-ol.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/map-fms.js') %]"></script>
+[% END %]
+
+[% map_html = INCLUDE maps/openlayers.html include_key = 1 %]
diff --git a/templates/web/fixmystreet.com/maps/fms.html b/templates/web/fixmystreet.com/maps/fms.html
new file mode 100644
index 000000000..3cf503c96
--- /dev/null
+++ b/templates/web/fixmystreet.com/maps/fms.html
@@ -0,0 +1,10 @@
+[% map_js = BLOCK %]
+<!-- <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0&mkt=en-GB"></script> -->
+<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/OpenLayers.Projection.OrdnanceSurvey.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/map-bing-ol.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/map-fms.js') %]"></script>
+[% END %]
+
+[% map_html = INCLUDE maps/openlayers.html include_key = 1 %]
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-03 04:16:09 +0000