aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--templates/web/default/report/new/councils_text_all.html2
-rw-r--r--templates/web/fixmystreet/report/new/category.html10
-rw-r--r--templates/web/fixmystreet/report/new/councils_text.html9
-rw-r--r--templates/web/fixmystreet/report/new/councils_text_all.html19
-rw-r--r--templates/web/fixmystreet/report/new/councils_text_none.html20
-rw-r--r--templates/web/fixmystreet/report/new/councils_text_some.html28
-rw-r--r--templates/web/fixmystreet/report/new/form_heading.html0
-rw-r--r--templates/web/fixmystreet/report/new/report_import.html92
8 files changed, 1 insertions, 179 deletions
diff --git a/templates/web/default/report/new/councils_text_all.html b/templates/web/default/report/new/councils_text_all.html
index 8514e0b0a..2f06686d8 100644
--- a/templates/web/default/report/new/councils_text_all.html
+++ b/templates/web/default/report/new/councils_text_all.html
@@ -1,5 +1,5 @@
<p>
-[% IF all_councils.${area_ids_to_list.0}.type == 'LBO' %]
+[% IF all_councils.${area_ids_to_list.0}.type == 'LBO' AND area_ids_to_list.0 != 2482 %]
[%
tprintf(
loc('All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system.'),
diff --git a/templates/web/fixmystreet/report/new/category.html b/templates/web/fixmystreet/report/new/category.html
deleted file mode 100644
index 095cd7c2e..000000000
--- a/templates/web/fixmystreet/report/new/category.html
+++ /dev/null
@@ -1,10 +0,0 @@
-[% FILTER collapse %]
-[% IF category_options.size %]
- <label for='form_category'>[% category_label | html %]</label>
- <select name='category' id='form_category'[% ' onchange="form_category_onchange()"' IF category_extras.size %]>
- [% FOREACH cat_op IN category_options %]
- <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op %]>[% cat_op | html %]</option>
- [% END %]
- </select>
-[% END %]
-[% END -%]
diff --git a/templates/web/fixmystreet/report/new/councils_text.html b/templates/web/fixmystreet/report/new/councils_text.html
deleted file mode 100644
index 1da5746c1..000000000
--- a/templates/web/fixmystreet/report/new/councils_text.html
+++ /dev/null
@@ -1,9 +0,0 @@
-[% FILTER collapse %]
-[% IF area_ids_to_list.size == 0 %]
- [% PROCESS 'report/new/councils_text_none.html' %]
-[% ELSIF area_ids_to_list.size == all_councils.size %]
- [% PROCESS 'report/new/councils_text_all.html' %]
-[% ELSE %]
- [% PROCESS 'report/new/councils_text_some.html' %]
-[% END %]
-[% END -%]
diff --git a/templates/web/fixmystreet/report/new/councils_text_all.html b/templates/web/fixmystreet/report/new/councils_text_all.html
deleted file mode 100644
index 2f06686d8..000000000
--- a/templates/web/fixmystreet/report/new/councils_text_all.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<p>
-[% IF all_councils.${area_ids_to_list.0}.type == 'LBO' AND area_ids_to_list.0 != 2482 %]
-[%
- tprintf(
- loc('All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system.'),
- all_council_names.join( '</strong>' _ loc(' or ') _ '<strong>' )
- );
-%]
-[% ELSE %]
-[%
- tprintf(
- loc('All the information you provide here will be sent to <strong>%s</strong>.'),
- all_council_names.join( '</strong>' _ loc(' or ') _ '<strong>' )
- );
-%]
-[% END %]
-
-[% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %]
-</p>
diff --git a/templates/web/fixmystreet/report/new/councils_text_none.html b/templates/web/fixmystreet/report/new/councils_text_none.html
deleted file mode 100644
index 992d030c0..000000000
--- a/templates/web/fixmystreet/report/new/councils_text_none.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<p>[%
-
- nget(
- "We do not yet have details for the council that covers this location.",
- "We do not yet have details for the councils that cover this location.",
- all_councils.size
- );
-%]
-[%
- loc("If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council.");
-%]
-[%
- tprintf(
- loc("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."),
- all_council_names.join( loc(' or ') ),
- c.cobrand.contact_email,
- c.cobrand.contact_email
- );
-
-%]</p> \ No newline at end of file
diff --git a/templates/web/fixmystreet/report/new/councils_text_some.html b/templates/web/fixmystreet/report/new/councils_text_some.html
deleted file mode 100644
index 9f123fb9a..000000000
--- a/templates/web/fixmystreet/report/new/councils_text_some.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<p>
-[% loc('All the information you provide here will be sent to') %]
-
-[% FOREACH council_id IN area_ids_to_list %]
- [% loc( ' or ') IF ! loop.first %]
- <strong>[% all_councils.$council_id.name %]</strong>
- [%- '.' IF loop.last %]
-[% END %]
-
-[%
- loc('The subject and details of the problem will be public, plus your name if you give us permission.');
-%]
-[%
- nget(
- "We do <strong>not</strong> yet have details for the other council that covers this location.",
- "We do <strong>not</strong> yet have details for the other councils that cover this location.",
- missing_details_councils.size
- );
-%]
-[%
- tprintf(
- loc("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."),
- missing_details_council_names.join( loc(' or ') ),
- c.cobrand.contact_email,
- c.cobrand.contact_email
- );
-%]
-</p> \ No newline at end of file
diff --git a/templates/web/fixmystreet/report/new/form_heading.html b/templates/web/fixmystreet/report/new/form_heading.html
deleted file mode 100644
index e69de29bb..000000000
--- a/templates/web/fixmystreet/report/new/form_heading.html
+++ /dev/null
diff --git a/templates/web/fixmystreet/report/new/report_import.html b/templates/web/fixmystreet/report/new/report_import.html
deleted file mode 100644
index 7aa105afe..000000000
--- a/templates/web/fixmystreet/report/new/report_import.html
+++ /dev/null
@@ -1,92 +0,0 @@
-[% INCLUDE 'header.html', title => 'External import' %]
-
-<h1>External import</h1>
-
-<p>You may inject problem reports into FixMyStreet programatically using this
-simple interface. Upon receipt, an email will be sent to the address given,
-with a link the user must click in order to check the details of their report,
-add any other information they wish, and then submit to the council.
-
-<p>This interface returns a plain text response; either <samp>SUCCESS</samp> if
-the report has been successfully received, or if not, a list of errors, one per
-line each starting with <samp>ERROR:</samp>.
-
-<p>You may submit the following information by POST to this URL
-(i.e. <samp>[% c.uri_for('/import') %]</samp> ):</p>
-
-<style type="text/css" media="screen">
- input {
- /* Hide the form elements - they are just here for simpler testing */
- display: none;
- }
-</style>
-
-<form method="POST" action="/import" enctype="multipart/form-data">
-
-<dl>
- <dt>service</dt>
- <dd>
- <em>Required</em>.
- Name of application/service using this interface.
- <input type="text" name="service" />
- </dd>
-
- <dt>id</dt>
- <dd>
- Unique ID of a user/device, for possible future use.<br>
- <small>(e.g. used by Flickr import to know which accounts to look at)</small>
- <input type="text" name="id" />
- </dd>
-
- <dt>subject</dt>
- <dd>
- <em>Required</em>. Subject of problem report.
- <input type="text" name="subject" />
- </dd>
-
- <dt>detail</dt>
- <dd>
- Main body and details of problem report.
- <input type="text" name="detail" />
- </dd>
-
- <dt>name</dt>
- <dd>
- <em>Required</em>. Name of problem reporter.
- <input type="text" name="name" />
- </dd>
-
- <dt>email</dt>
- <dd>
- <em>Required</em>. Email address of problem reporter.
- <input type="text" name="email" />
- </dd>
-
- <dt>phone</dt>
- <dd>
- Telephone number of problem reporter.
- <input type="text" name="phone" />
- </dd>
-
- <dt>easting / northing</dt>
- <dt>lat / lon</dt>
- <dd>
- Location of problem report. You can either supply eastings/northings, or WGS84 latitude/longitude.
- <input type="text" name="easting" />
- <input type="text" name="northing" />
- <input type="text" name="lat" />
- <input type="text" name="lon" />
- </dd>
-
- <dt>photo</dt>
- <dd>
- Photo of problem (JPEG only).
- <input type="file" name="photo" />
- </dd>
-</dl>
-
-<input type="submit" />
-
-</form>
-
-[% INCLUDE 'footer.html' %] \ No newline at end of file