aboutsummaryrefslogtreecommitdiffstats
path: root/templates
Commit message (Collapse)AuthorAgeLines
* Merge branch 'version-2.4.1'v2.4.1Matthew Somerville2018-10-03-4/+1
|\
| * Revert 50693857 “Clearer relocation options...”Matthew Somerville2018-10-03-4/+1
| | | | | | | | So version 2.4.1 has no translation changes, putting back straight after.
* | [Oxfordshire] display message if user selects PROW categoryStruan Donald2018-10-03-0/+6
|/ | | | | Adds some div wrappers round the non category bit of the form so we can then hide easily.
* [FixaMinGata] Update "personuppgiftsombud"Jon Kristensen2018-10-03-1/+1
|
* [FixaMinGata] Update privacy policy link textJon Kristensen2018-10-03-1/+1
|
* HTML template for the "partial" report confirmation emailZarino Zappia2018-10-01-0/+22
| | | | Fixes #2263.
* [Oxfordshire] Update cobrand to match new OCCLSS style guideZarino Zappia2018-10-01-46/+156
| | | | | The change to web/js/front.js was required because Oxfordshire has no `.report-a-problem-btn`, so the front.js shouldn’t assume it’s there.
* [Oxfordshire] omit reference number from report confirm pageStruan Donald2018-10-01-0/+1
| | | | | | | | The reference number is a) the FMS report id which is irrelevant and b) we don't get an OCC reference number back immediately so could not show it anyway. Related to mysociety/fixmystreet-commercial#1193
* [Oxfordshire] display customer reference on report pageStruan Donald2018-10-01-4/+3
| | | | | OCC uses the customer reference from extra to store the enquiry reference so use that on the report page rather than external_id.
* [Oxfordshire] add WDM migration bannerStruan Donald2018-09-28-0/+8
|
* Merge branch 'body-list-speedup'Matthew Somerville2018-09-25-6/+5
|\
| * Speed up fetching lists of bodies.Matthew Somerville2018-09-25-6/+5
| | | | | | | | | | | | Use a HashRefInflator wherever all_sorted is used, with consequential changes to deal with it now not being an object (e.g. add some with_* functions for manual fetching of extra data).
* | [Lincolnshire] Remove UA string from contact emailsDave Arter2018-09-24-0/+49
|/ | | | For mysociety/fixmystreet-freshdesk#16.
* Clearer relocation options while you’re reporting a problemZarino Zappia2018-09-19-1/+4
| | | | | | | | | | | | | | | | Now that the "Report a problem" link in the nav bar links, more often than not, to the reporting form rather than the homepage, it could be challenging to actually start a new report in a location *other* than the one currently on screen. Rather than adding a link to the homepage, this change hopefully adds a link right at the moment the user expects it – right on the "Report a problem" form. It also gave us an opportunity to reword the "Wrong location" message and give it an icon more suitable for high-dpi displays. Fixes #2238.
* Say “Set password”, not Change, if none set.Matthew Somerville2018-09-13-1/+7
| | | | Fixes #2235.
* Add cobrand hook for disallowing updates.Dave Arter2018-09-13-9/+13
| | | | | Provides a template override for cobrands to show if updates aren't allowed on the problem.
* allow web based use of report importStruan Donald2018-09-13-0/+1
| | | | | | | | if a web parameter is passed to /import then display the email confirmation sent page rather than a SUCCESS message. Enables this page to be used for creating partial reports from a web page. For mysociety/collideoscope#17
* Add cobrand hook for disallowing title moderation.Matthew Somerville2018-09-13-3/+7
|
* Do not try and moderate questionnaire responses.Matthew Somerville2018-08-31-1/+1
|
* Merge branch 'issues/collideoscope/30-user-moderation'Matthew Somerville2018-08-29-16/+19
|\
| * Allow cobrand to add extra ability to moderate.Matthew Somerville2018-08-29-10/+13
| |
| * Move moderation check to own function, tidy up.Matthew Somerville2018-08-28-2/+2
| |
| * Refactor together similar moderate functions.Matthew Somerville2018-08-28-4/+4
| |
* | Merge branch 'dev-confirmation-pages'Matthew Somerville2018-08-29-0/+41
|\ \
| * | Move all test endpoints under /_dev.Zarino Zappia2018-08-29-0/+41
| |/
* | Use site name in contact email subject line.Matthew Somerville2018-08-28-1/+1
| |
* | Remove need for category_extras ajax call.Matthew Somerville2018-08-28-0/+2
|/ | | | | | Add by_category output to the /report/new/ajax call, containing all the data that /report/new/category_extras returns for one category. Then alter the JS to use that data immediately when needed.
* [Lincolnshire] Link logo to Lincs homepageDave Arter2018-08-24-1/+1
|
* Merge branch 'user-agent-in-contact'Matthew Somerville2018-08-21-1/+8
|\
| * Include user agent in contact form emails.Matthew Somerville2018-08-21-1/+8
| |
* | Make it easier to prevent a form_detail_placeholder being printedZarino Zappia2018-08-20-2/+11
|/ | | | | | | | | | | | Previously, if you didn’t want a hint to appear under the main "details" textarea on the new report form, you had to override the entire `form_report.html` template, or leave the hint element in the markup but hide it with CSS. Now, you can set `form_detail_placeholder` to a falsey value, and the template won’t output the hint element at all. It also amends the `aria-describedby` attribute on the textarea so it doesn’t end up referencing a hint element that doesn’t exist.
* [Lincolnshire] Update front page wordingDave Arter2018-08-20-1/+3
| | | | Lincolnshire uses ‘division’ instead of ‘ward’ as well as Oxfordshire.
* [Lincolnshire] Add contact email addressDave Arter2018-08-17-0/+1
|
* [Lincolnshire] Add external contractors disclaimer textDave Arter2018-08-17-0/+12
|
* [Lincolnshire] Send ‘report logged’ emails; don’t show FMS ID on ↵Dave Arter2018-08-17-0/+10
| | | | confirmation page
* [Lincolnshire] Add assets to map & roadworks.org integrationDave Arter2018-08-17-0/+1
|
* [Lincolnshire] Add cobrand templates & stylesDave Arter2018-08-17-0/+53
|
* Set bodyclass on alert disambiguation/questionnaire pagesDave Arter2018-08-17-1/+2
| | | | This was causing layout issues on the Lincolnshire cobrand.
* [Buckinghamshire] Use smaller template override for problem confirm messageDave Arter2018-08-17-44/+6
|
* Don’t show photo tips if cobrand doesn’t allow photo uploadDave Arter2018-08-14-0/+2
|
* [UK] New House Rule forbidding impersonationZarino Zappia2018-08-10-0/+4
|
* Fix inspector dragging of pins.Matthew Somerville2018-08-09-0/+1
|
* [Oxfordshire] Load UK projection JS library.Matthew Somerville2018-08-09-0/+1
|
* Merge remote-tracking branch 'origin/2012-new-report-near-here'Matthew Somerville2018-08-07-1/+15
|\
| * "Report a problem here" button in nav when viewing a locationZarino Zappia2018-08-07-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2016. When you load a page that includes either a problem report, or is centered on a location, the "Report a problem" button in the nav bar (that normally takes you to the homepage) becomes a "Report a(nother) problem here" button, that leads directly to the new report form for the location in question. On full map pages (/around and any /report/<id> pages loaded via it) the reporting form will be rendered client-side, avoiding a full page reload. On pages lacking the full map (eg: missing fixmystreet.bbox_strategy), namely /reports/<area> and any /report/<id> page that hasn’t been client-side loaded via /around, we fall back to a server-side page load. Finally, as you’d expect, the text and URL for the button dynamically update as you move around the map, or switch between the different client-side states of the reporting flow. We also hide the button entirely when you’re reporting a problem, which was something suggested a long time ago.
* | "Report another problem here" button on confirmation pageZarino Zappia2018-08-07-0/+6
|/ | | | | | | Part of #2012. Should make it much quicker to report multiple problems in the same location, one after the other.
* Add missing ID to /alert postcode input.Matthew Somerville2018-08-07-1/+1
| | | | Fixes #2197.
* allow front end to not send to specific bodyStruan Donald2018-08-06-0/+1
| | | | | | | | add a do_not_send parameter to reports which allows the front end to specify a comma separated list of bodies that reports should not be sent to even if there is a valid contact match. This enables asset layers to override backend body processing, e.g. if a body only accepts reports that are on a road this allows the front end to specify that.
* show not on roads message on national siteStruan Donald2018-08-03-0/+11
| | | | currently will show even if it's only appropriate for one body
* [UK] Pull in cobrand asset files on national site.Struan Donald2018-08-03-2/+7
| | | | | | | Also add body name to layer defaults, so they are only used where appropriate. Switch mapit area javascript calls to GeoJSON, so we can drop KML support in OpenLayers.wfs.js which saves a small amount of bandwidth.