aboutsummaryrefslogtreecommitdiffstats
path: root/web/cobrands
Commit message (Collapse)AuthorAgeLines
* Clearer relocation options while reporting.Zarino Zappia2018-11-06-4/+35
| | | | | | | | | | | | | | | | 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.
* Revert "Clearer relocation options while reporting."Matthew Somerville2018-11-06-35/+4
| | | | This reverts commit ee3c4e05daf3f4df01762ead3d07697a12f13a28.
* [BANES] filter roadworks messages on typeStruan Donald2018-11-06-2/+9
| | | | use symbol code to limit the types of roadworks that show.
* [BANES] limit roadworks.org message by categoryStruan Donald2018-11-06-0/+14
| | | | | use the filter option to only display roadworks message for road related categories
* allow cobrands to filter when roadworks message shownStruan Donald2018-11-06-1/+5
| | | | | add a `fixmystreet.roadworks.filter` option which cobrands can override to control when the message is displayed. e.g. limit by category.
* [BANES] Add roadworks.org layerStruan Donald2018-11-06-0/+66
| | | | Uses same parsing of roadworks messages as Lincs
* [FixaMinGata] Don't scroll report on loadJoe Siltberg2018-11-05-0/+1
|
* Sort category groups correctlyDave Arter2018-11-02-0/+11
| | | | | Previously if there was a mix of groups and top-level categories they weren’t sorted together.
* Merge branch '2080-nav-fg-rename'Matthew Somerville2018-10-25-78/+88
|\
| * Rename nav SCSS variable names.Matthew Somerville2018-10-22-78/+88
| | | | | | | | | | Anything using old names should still work as long as they included the mixins file.
* | Allow multiple JS dropzones on a single page.Matthew Somerville2018-10-22-4/+10
|/ | | | | As well as the original form using #form_photo, add Dropzone to any form with a .js-photo-label in it.
* [Angus] Remove cobrand.Matthew Somerville2018-10-10-1403/+0
|
* reselect subcategory selects on /report/newStruan Donald2018-10-09-2/+6
| | | | | | | | | | | | If /report/new is opened directly then the fixmystreet.reporting_data is not set, but the categories are already in place. These are then replaced when update_pin is called. If this has been triggered by clicking on a category with a subcategory this replaces the category selects but did not correctly reset them. By saving any selected value in the main category select we can correctly reset this and hence the display of the subcategory select. Fixes #2276
* [BANES] Branding for HTML emailsZarino Zappia2018-10-08-0/+0
|
* Merge branch 'dashboard-update-csv-export'Matthew Somerville2018-10-05-1/+16
|\
| * More efficient horizontal spacing in dashboard-options-tabsZarino Zappia2018-10-03-1/+16
| |
* | [Oxfordshire] Only run PROW code in Oxfordshire.Matthew Somerville2018-10-04-1/+5
|/
* Clearer relocation options while reporting.Zarino Zappia2018-10-03-4/+35
| | | | | | | | | | | | | | | | 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.
* Merge branch 'version-2.4.1'v2.4.1Matthew Somerville2018-10-03-35/+4
|\
| * Revert 50693857 “Clearer relocation options...”Matthew Somerville2018-10-03-35/+4
| | | | | | | | 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/+23
|/ | | | | Adds some div wrappers round the non category bit of the form so we can then hide easily.
* [Oxfordshire] Avoid nav menu CSS overlap for staff on mappageZarino Zappia2018-10-01-2/+7
| | | | Fixes mysociety/fixmystreet-commercial#1131
* [Oxfordshire] Update cobrand to match new OCCLSS style guideZarino Zappia2018-10-01-413/+524
| | | | | 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.
* Nicer image replacement for #nav-link mobile menu buttonZarino Zappia2018-10-01-2/+3
| | | | | | | | | | | The large negative text-indent can sometimes cause horizontal scrollbars in Right-to-Left languages, and, in some browsers, can also result in a huge :focus outline being drawn around the button and off to the right of the window. Setting a zero height, padding top, and overflow:hidden is a simpler way to achieve the same thing, and works regardless of text direction, text length, or focus state.
* Reduce specificity of #front_stats CSSZarino Zappia2018-10-01-53/+48
| | | | There is no need for #front_stats to always be nested inside of #front-howto.
* Improve vertical alignment of #main-nav in IE9-11Zarino Zappia2018-10-01-7/+98
|
* Clearer relocation options while you’re reporting a problemZarino Zappia2018-09-19-4/+35
| | | | | | | | | | | | | | | | 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.
* [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.
* 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
|
* [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.
* 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.
* [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-1/+5
|
* Merge remote-tracking branch 'origin/2012-new-report-near-here'Matthew Somerville2018-08-07-1/+56
|\
| * "Report a problem here" button in nav when viewing a locationZarino Zappia2018-08-07-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.