aboutsummaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeLines
* .js-make-bar-chart now accepts custom chart/bar dimensionsZarino Zappia2018-09-13-2/+4
| | | | | | We needed this for Collideoscope, where we’re displaying small bar charts on the Statistics page, and the default bar height of 30px was much too small when the chart was reduced in size.
* [Bromley] Use service_sub_code codes, not text.Matthew Somerville2018-09-12-5/+5
| | | | Couple of texts have newlines in them, and may change anyway.
* Merge branch 'asset-consolidation'Matthew Somerville2018-09-12-45/+62
|\
| * Move get_select_control/select_nearest_asset inside class.Matthew Somerville2018-09-12-32/+32
| |
| * [Bromley] Use service_sub_code for asset display.Matthew Somerville2018-09-12-1/+17
| |
| * Move check_layer_relevant to layer.relevant.Matthew Somerville2018-09-11-12/+13
| |
* | make fixed reports line on reports graph optionalStruan Donald2018-09-12-11/+16
| | | | | | | | | | Collideoscope doesn't have fixed reports so only add a line for fixed reports if there is data.
* | do not generate labels for empty dashboard graphsStruan Donald2018-09-12-0/+3
|/ | | | | Avoid a JS error if a line graph has no points. This is mostly useful for collideoscope where we only want to show one line.
* [Bromley] Update asset for category changes.Matthew Somerville2018-09-11-5/+29
|
* [Buckinghamshire] Do not report on non-Bucks roadsMatthew Somerville2018-09-10-3/+5
| | | | | | Sending to Bucks reports made on non-Bucks roads was only disabled if Bucks was the only body concerned; flytipping is a concern of both tiers, but reports on non-Bucks roads should still not be sent to Bucks.
* Change KML to GeoJSON in OpenLayers.fixmystreet.js.Matthew Somerville2018-09-07-399/+317
| | | | GeoJSON is used by the /reports page now, not KML.
* Merge branch 'issues/collideoscope/44-home-clickable'Matthew Somerville2018-09-04-1/+1
|\
| * Make sure Home clickable with Try again overlay.Matthew Somerville2018-08-28-1/+1
| |
* | Check resolutions exist before zooming asset layerMatthew Somerville2018-08-30-1/+1
| | | | | | | | | | It is possible to get here on e.g. a /report/new page load where the asset is being shown but hasn't yet been added to the map.
* | [Bristol] Fix spot asset layer display.Matthew Somerville2018-08-29-2/+6
| | | | | | | | | | | | Confusion over client/server side filtering meant Bristol was filtering client-side on an attribute it was not asking to be returned by the server.
* | Check we have by-category data/map before action.Matthew Somerville2018-08-29-1/+8
|/
* Remove need for category_extras ajax call.Matthew Somerville2018-08-28-43/+68
| | | | | | 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.
* only try and set fields from layer attributes if existStruan Donald2018-08-23-4/+12
| | | | | If a layer doesn't have attributes the set_fields_from_attributes function dies because $.each doesn't like undefined things.
* Repeat of 0e497596.Matthew Somerville2018-08-23-1/+1
| | | | Include instructions to fork to prevent this happening again.
* Remove unused parts of OpenLayers.Matthew Somerville2018-08-23-63/+49
|
* [Zurich] Use HTTPS map tiles, update OpenLayers.Matthew Somerville2018-08-22-431/+439
|
* [Bristol] Update OpenLayers to add filter strategyStruan Donald2018-08-22-508/+374
|
* [Lincolnshire] Add assets to map & roadworks.org integrationDave Arter2018-08-17-0/+283
|
* [Lincolnshire] Add cobrand templates & stylesDave Arter2018-08-17-0/+334
|
* Allow asset layer to hide ‘pick an asset’ message entirelyDave Arter2018-08-17-1/+1
|
* Make roadworks.org integration more configurableDave Arter2018-08-17-6/+10
| | | | | Allows cobrands to customise message displayed, and includes description in GeoJSON feature properties.
* Fix asset filtering for single-category layersDave Arter2018-08-17-0/+1
|
* [Buckinghamshire] Factor roadworks.org organisation ID out to cobrand JSDave Arter2018-08-17-4/+12
|
* Allow asset layer ‘filter_value’ to be a functionDave Arter2018-08-17-1/+6
|
* Fix inspector dragging of pins.Matthew Somerville2018-08-09-5/+15
|
* [UK] OS map only shown from zoom 12+.Matthew Somerville2018-08-09-1/+1
| | | | Bing no longer shows it at zoom level 11.
* Merge remote-tracking branch 'origin/2012-new-report-near-here'Matthew Somerville2018-08-07-1/+72
|\
| * "Report a problem here" button in nav when viewing a locationZarino Zappia2018-08-07-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Better padding for "report a problem" nav buttonZarino Zappia2018-08-07-1/+1
| |
* | Merge remote-tracking branch 'origin/2012-report-another'Matthew Somerville2018-08-07-0/+6
|\ \
| * | "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.
* | Merge branch 'issues/commercial/1118-confirm-flytipping'Matthew Somerville2018-08-07-0/+6
|\ \
| * | [Buckinghamshire] Update flytipping handling.Matthew Somerville2018-08-07-0/+6
| |/ | | | | | | | | | | Allow flytipping reporting on cobrand and .com, with road reports going to Bucks Confirm and email, and non-road reports going to district and Bucks emails.
* | Merge branch 'bristol-map-resolution'Matthew Somerville2018-08-07-5/+14
|\ \
| * | [Bristol] Fix display of assets on .com map.Matthew Somerville2018-08-07-2/+11
| | |
| * | [UK] Show assets at more zoomed out level.Matthew Somerville2018-08-07-3/+3
| |/
* / call inspector setup when display reportStruan Donald2018-08-07-0/+8
|/ | | | | | | | If an inspector clicks on a report from an around page the code to setup the pin dragging needs to be called. This adds a method to the map to allow the setup code to be called on report load. Fixes #2073
* Do update layer visibility on extras received.Matthew Somerville2018-08-06-0/+3
| | | | | | | Asset layer visibility depends on fixmystreet.bodies, which is updated from ajax request by pin selection or category change, but the visibility change happens before the ajax request - so if visibility is not also checked when category_extras returns it can get out of sync.
* allow front end to not send to specific bodyStruan Donald2018-08-06-10/+74
| | | | | | | | 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.
* [Buckinghamshire] Display not-road message better.Struan Donald2018-08-06-2/+9
| | | | | | is_only_body() checks if the supplied body is the only one listed in fixmystreet.bodies and hence if it's the only one that reports for the current pin position will be sent to.
* [UK] Pull in cobrand asset files on national site.Struan Donald2018-08-03-3676/+1089
| | | | | | | 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.
* [Bromley] Fix selection on TfL red routes.Matthew Somerville2018-08-03-1/+11
|
* Allow asset layer display to be body dependent.Struan Donald2018-08-03-36/+110
| | | | | | | | | | | Return a list of associated bodies on around/new pages and in category ajax calls, and use that when deciding whether to show/hide layers. If the layer has no body information, then we show it as before, maybe based on category selected; if it does, it is only shown if the layer body matches the bodies for the point. As part of this create a new VectorAsset class to handle all the visibility changes for asset layers as it makes it a bit tidier.
* [UK] A few IE8-compatible JS fixes.Matthew Somerville2018-08-03-6/+6
|
* Favour .form-hints over input placeholder attributesZarino Zappia2018-08-01-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2180. Input placeholders are a generally problematic UI convention, and we’ve accidentally started using them in more and more parts of FMS over the last few years. In some cases, the placeholders simply repeated text from the input’s existing label element. In cases like those, the placeholder attribute could just be removed. In other cases, we broke the placeholder text out into a .form-hint element, between the input and its label, so that the text is easily accessible and falls into the top-to-bottom reading flow. Notable changes: * Form hint on main postcode search form, instead of placeholder. * Form hint on alert search form, instead of placeholder. * Form hints in reporting form (problem summary and description), instead of placeholders. * Removed placeholders from most login/password inputs. * The character limit for "Inspector" report updates is no longer displayed in the textarea placeholder. * Form hints now `#666` grey, and better spaced when immediately following a label element.