aboutsummaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeLines
...
* [Bristol] add branding to email templatesStruan Donald2019-04-02-0/+0
|
* [Lincolnshire] add branding to email templatesStruan Donald2019-04-02-0/+0
|
* [Buckinghamshire] add branding to email templatesStruan Donald2019-04-02-0/+0
| | | | Fixes mysociety/fixmystreet-commercial#1272
* Merge branch 'issues/commercial/1304-duplicate-report-feedback'Matthew Somerville2019-03-29-142/+115
|\
| * If no category selected, default to main bodies.Matthew Somerville2019-03-28-1/+5
| | | | | | | | | | | | Otherwise, e.g. going straight to /report/new when category groups enabled may cause always visible layers to disappear because bodies gets emptied.
| * [UK] Make roadworks layer a standard road layer.Matthew Somerville2019-03-28-37/+17
| | | | | | | | This gives us the "set up on load" functionality.
| * Matching vertical margins for new `js-post-category-messages`Zarino Zappia2019-03-28-62/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | * Shared margin rules for `.box-warning` and `.extra-category-questions` in `_base.scss` and `_layout.scss` (where the margin can potentially change based on the `$mappage-sidebar-padding` variable). * Move the Sass rules for `.box-warning` further up `_base.scss` to be next to `.extra-category-questions` since they’re both so similar. * No need for `.full-width` on the `.extra-category-questions` div since we were overriding the margin-top anyway. * Remove the little triangle between the category select box and the grey `.extra-category-questions` div, since the category questions isn’t always presented immediately after the category select box.
| * Move added messages to the same place.Matthew Somerville2019-03-28-5/+5
| |
| * Fetch reporting data if needed, even if no map.Matthew Somerville2019-03-28-9/+12
| |
| * Tidy up duplicate fetching code.Matthew Somerville2019-03-28-26/+8
| | | | | | | | | | | | Run immediately, not onready, so the category change listener is in place; listen to a better event, removing need for a debouncer; don't look up if empty category.
| * Fix duplicate email alert signup.Matthew Somerville2019-03-28-1/+1
| |
| * Avoid broken looking singleton images in expandable list itemsZarino Zappia2019-03-28-0/+1
| | | | | | | | | | | | | | | | When an expanded list item has a single image, it would previously float to the right of the list item action buttons, which looked messy. Now, the buttons clear below the floated image, just like the buttons in the individual report page `.problem-header`.
| * Show detailed delivery info in expanded list itemsZarino Zappia2019-03-28-0/+10
|/ | | | | | | | | | | | Make the expandable list item’s expanded state look more like the regular `.problem-header`, to more strongly imply that you don’t need to visit the individual report page to read more. Since expandable list items now *always* contain more information in their expanded state, there’s no need for the `show_more` flag in the templates. Addresses part of the feedback in mysociety/fixmystreet-commercial#1304.
* [Bucks,Oxon] Fix .com RoW message display.Matthew Somerville2019-03-27-20/+25
| | | | The two functions were conflicting with one another.
* Merge branch 'category-js-tidy'Matthew Somerville2019-03-27-33/+29
|\
| * Stop category_change firing more than it should.Matthew Somerville2019-03-27-13/+15
| | | | | | | | | | | | | | | | | | | | Previously, when update_pin was called, category change events were fired: 1. if category wasn't blank, 2. if category groups were enabled, and 3. if category groups were enabled, a group was selected, and a category was not. Now we sort out everything inside the category_groups setup function, only triggering a change event once, at the end.
| * Allow things to reset if "Pick a category" picked.Matthew Somerville2019-03-27-9/+4
| | | | | | | | | | This is most noticeable with category groups, where changing the parent would leave visible any asset/attribute questions.
| * Stop filter category overriding chosen category.Matthew Somerville2019-03-27-11/+10
| | | | | | | | | | | | If you had one filter category selected, clicked the map (category auto pre-selected), changed the category, and clicked the map again, it would re-select the filter category, not the changed category.
* | [Buckinghamshire] Message on Rights of Way category.Matthew Somerville2019-03-27-0/+15
|/
* [Oxfordshire] correctly display PRoW messageStruan Donald2019-03-27-2/+4
| | | | | | This makes sure that we re-enable the report form if you select a non OCC category after selecting PRoW, and also enables correct hiding and displaying of the message.
* [Northamptonshire] stray protocol in asset configStruan Donald2019-03-26-1/+1
|
* make sure found and not_found actions exists before callingStruan Donald2019-03-25-2/+2
| | | | | | just because fixmystreet.actions exists on a layer it does not mean the found or not_found methods are there so check for them too. Otherwise we don't fall back to the default actions as the JS errors.
* [Northamptonshire] Show warning to user when clicking an asset that overlaps ↵Dave Arter2019-03-25-4/+42
| | | | with others
* Add Layer.Vector.getFeaturesWithinDistance methodDave Arter2019-03-25-0/+28
|
* Set this to the current Layer in asset_found/asset_not_found callsDave Arter2019-03-25-8/+8
|
* [Northamptonshire] use Alloy vector tiles for assetsStruan Donald2019-03-25-2/+616
| | | | | | | | | | | | | | | | | | | | | | | | | | Use the Vector tiles layers which Alloy provided which don't require and API key or paging. This code is still a bit work in progress as it makes a few assumptions: * the zoom level is hard coded * adding assets to layers assumes things are not async when they are * we are using itemId which is not the correct thing This uses an event to notify that loading a request for a new set of tiles has started and then uses counting to check we've fetched them all and hence can get the layer to check for an asset. It also uses start times to throw away requests for tiles in a previous request if they come in after a new request has started. This also doesn't have anything for putting labels on assets because that information doesn't seem to be in the tiles. A final point is that the tiles can contain multiple assets at the same coőrdinates and we don't do anything about that at the moment so the user will just get the last one added when they click. This includes a dump of all the layers from alloy and then matches them up to categories displayed on FixMyStreet
* [Northamptonshire] cobrand config, template and css changesStruan Donald2019-03-25-0/+144
| | | | | Co-authored-by: Zarino Zappia <zarino@mysociety.org> Co-authored-by: Matthew Somerville <matthew@mysociety.org>
* Listen for all inspector form duplicate events.Matthew Somerville2019-03-06-2/+2
| | | | | | The form may be brought in via JS, so we have to add an event to something that will always be there (or alternatively set up when pulled in, which was the old pre-duplicates.js behaviour).
* Remove call to removed function.Matthew Somerville2019-03-06-1/+0
|
* Merge branch 'issues/commercial/1303-bath-pin-drag-roadworks'Matthew Somerville2019-03-05-70/+48
|\
| * [UK Councils] Factor roadworks functions together.Matthew Somerville2019-03-04-69/+47
| |
| * [BANES] Pin rather than map centre for roadworks.Matthew Somerville2019-03-04-1/+1
| | | | | | | | | | If the pin is dragged, then category changed, the pin will not be in the centre of the map.
* | Improve inline checkbox spacing.Matthew Somerville2019-03-04-16/+1
|/ | | | | | | | | | | Reduce the space between checkbox and label, so the text isn't lost if the page is zoomed in. Fixes #2411. Replace the creator_fixed question with segmented control to match the full questionnaire, and the admin verified checkboxes with inline-text as they need no padding. Having done that, all uses of .inline are now on their own lines, so no post-padding is needed any longer, but we’ll leave some in case of future use.
* Increase vertical spacing of front page example.Matthew Somerville2019-03-01-2/+4
|
* [Oxfordshire] Limit appears to be lower than 30.Matthew Somerville2019-02-28-1/+1
|
* [Bromley] Initial heatmap page.Matthew Somerville2019-02-28-1/+377
|
* [Bromley] Fix colour contrast on active segmented controlZarino Zappia2019-02-28-2/+6
|
* [UK] Add mapzoom to roadworks parameters.Matthew Somerville2019-02-26-0/+1
|
* Merge remote-tracking branch 'origin/issues/commercial/1229-duplicate-reporting'Matthew Somerville2019-02-25-104/+391
|\
| * Duplicate suggestion UI when reporting problems.Zarino Zappia2019-02-25-89/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previously staff-only fixmystreet.set_up.manage_duplicates() has been promoted from staff.js to its own file so that we can use it to display the duplicate suggestions on the `/report/new` form. render_duplicate_list (the old refresh_duplicate_list) no longer filters or slices the reports_list returned by the ajax call, since it turns out the server handles all of that (`sub _nearby_json` in `Report.pm` and `sub nearby` in `Nearby.pm`). Since the expandable list items include the "fancybox" image previews, the fancybox CSS now has to be included in the `/report/new` page head, hence the addition of "photo-js.html" in `fill_in_details.html`. The “Get updates” flow reuses the same JavaScript that handles the submission of the "Get updates" drawer at the bottom of around pages.
| * Remove --reports from .item-list--reports__item classes in Inspector UIZarino Zappia2019-02-25-7/+4
| | | | | | | | | | There’s no need for this `--reports` to be there, so let’s start phasing it out.
| * Expandable list item componentZarino Zappia2019-02-25-1/+98
| | | | | | | | | | | | | | | | | | | | `_item_expandable.html` is an alternative to regular list items, where you can display extra information on the first click on the item, and then also, optionally, offer a further action, as a separate button. Right now the expandable list items aren’t used anywhere, but we’ll soon be using them in the duplicate report suggestion UI for council staff and the public.
| * Add space below "map page" contents on narrow screensZarino Zappia2019-02-25-13/+17
| | | | | | | | | | Moving the 4em padding from _layout.scss to _base.scss helps separate the content on /report/<id> and /report/new pages from the nav below.
* | [Buckinghamshire] Tidy up asset attributes.Matthew Somerville2019-02-25-24/+1
|/
* [FixaMinGata] Changes to a site logo in svg.Joe Siltberg2019-02-21-4/+125
| | | | Makes sure the logo looks nice on devices with high resolution.
* Fix server-side WFS property filteringDave Arter2019-02-19-5/+9
| | | | | | | | The previous approach of filtering features that match one of many values worked client side for e.g. GeoJSON format WFS layers, but crashed when attemping to build the XML request for server-side feature filtering (e.g. Bristol). This code instead builds a proper Logical filter which OpenLayers can use in both situations.
* [Bristol] Use new WFS server for street lights.Dave Arter2019-02-19-13/+77
|
* Merge branch '2397-show-old-url-fix'Matthew Somerville2019-02-18-2/+1
|\
| * Add parameter to URL when “Show older” clicked.Matthew Somerville2019-02-14-2/+1
| | | | | | | | | | The behaviour should be the same whether “Show older” or “Show older reports” is clicked, but only the latter was updating the URL.
* | Merge branch 'issues/commercial/1270-user-areas'Matthew Somerville2019-02-15-1/+1
|\ \ | |/ |/|