aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | | Merge branch 'warks-email-archive'Matthew Somerville2018-03-14-20/+66
|\ \ \ | |/ / |/| |
| * | [Warwickshire] Add archive script data.Matthew Somerville2018-03-14-20/+66
| | | | | | | | | | | | Add an update with each report closure.
* | | Show default start date on dashboard.Matthew Somerville2018-03-13-24/+12
|/ / | | | | | | This makes it clearer what is being shown.
* | Revert using a Devel::Cover::Report::Codecov fork.Matthew Somerville2018-03-12-1/+1
| | | | | | | | | | Our fork was merged upstream. This reverts commit 77d4d709.
* | Autofocus on 2FA input field.Matthew Somerville2018-03-12-1/+1
| |
* | Monitor whole conf directory in dev serverMatthew Somerville2018-03-07-1/+1
|/ | | | | When running on a Mac, the dev server only watches changes to directories, not files.
* Merge branch 'issues/commercial/974-closed-report-incorrectly-reopened'Matthew Somerville2018-03-02-4/+8
|\
| * [Zurich] Do not reopen closed reports by mistake.Matthew Somerville2018-03-02-4/+6
| | | | | | | | | | The code for moving a report to the intermediary state was running even if the report was in a closed state and had not been changed.
* | Merge branch 'issues/commercial/1007-zurich-planned-hidden-reports'Matthew Somerville2018-03-02-59/+47
|\ \
| * | [Zurich] Fix admin nav display on map pages.Matthew Somerville2018-03-02-21/+1
| | | | | | | | | | | | Plus remove some now-unneeded CSS.
| * | Fix post-edit issues on admin report edit page.Matthew Somerville2018-03-02-34/+37
| | | | | | | | | | | | | | | If you rotated a photo, updates and the category list weren't loaded. If you changed a report's state, the map pin colour was derived from the old state.
| * | [Zurich] Remove unneeded 'deleted' body indicator.Matthew Somerville2018-03-02-0/+4
| | |
| * | [Zurich] Show to-be-hidden reports until confirmedMatthew Somerville2018-03-02-4/+5
| |/
* / Edge-to-edge email content on narrow screensZarino Zappia2018-03-01-31/+46
|/ | | | | | | | | | | | | | | | | | | | The 5px cellpadding on the wrapper table was resulting in 15px of white space either side of emails when viewed on narrow screens. Which, on a window that could be as narrow as 320px, is a lot of wasted space! We only wanted the 15px of horizontal padding to be removed from the sides of the "main" content, leaving the top and bottom "hints" with some padding so that their text doesn’t crash up against the edge of the window on narrow screens. The easiest way to achieve this was to split the top and bottom "hints" out into their own slightly wider tables, with built-in cell padding. To make things simpler, the min- and max-widths are now stored in variables, and the changes also meant we could simplify the media queries controlling mobile breakpoints in modern email clients. Fixes #1928.
* Update translations from Transifex.Matthew Somerville2018-03-01-1275/+931
| | | | Looks like sq was missed due to incorrect last-modified date.
* Merge branch 'email-previewing'Matthew Somerville2018-03-01-113/+299
|\
| * Add development email previewer.Matthew Somerville2018-03-01-11/+201
| |
| * Use `report` more in email templates.Matthew Somerville2018-02-27-102/+98
| |
* | [UK] Properly align Dashboard bar chart value labelsZarino Zappia2018-03-01-2/+4
| |
* | [UK] Linebreak long Y-axis labels on Dashboard bar chartZarino Zappia2018-03-01-5/+24
| | | | | | | | | | | | | | | | | | Y-axis labels in the Dashboard ranking tables now break onto multiple lines if they are more than 4 words long. /web/vendor/chart.min.js showing as modified because we updated it to include a recent fix to label alignment on vertical scales: https://github.com/mysociety/Chart.js/commit/4130c31
* | Increase size of sub map linksZarino Zappia2018-03-01-10/+11
|/ | | | | | | | The tiny buttons could prove hard to trigger, especially on touchscreen devices, and with large screens now more commonplace, there’s no reason not to give them a few more pixels. One of a number of enhancements suggested in #1462.
* [UK] Improve Open311 update Bromley-only check.Matthew Somerville2018-02-23-2/+3
| | | | | The addition of e.g. questionnaire_id to an update's extra field means this check has to be more nuanced.
* [fixmystreet.com] Remove unused flex class.Matthew Somerville2018-02-23-15/+0
|
* Preserve category selection when using group UIDave Arter2018-02-22-3/+6
| | | | | | | | | | | | | When using grouped categories on the new report form, the selected category was being lost when dragging the pin or clicking elsewhere on the map. This was causing the asset layers to be hidden as well as the report extra input to be lost. I'd assumed that cloning an <option> element that was selected and adding it to the parent <select> would set the value of that <select> correctly, but that doesn't seem to be the case. Instead, this commit explicitly sets the <select>'s value after appending a selected <option> element.
* Allow invalid MapServer6 GML to be parsedDave Arter2018-02-22-0/+21
|
* Show hidden report extra fields on inspector formDave Arter2018-02-22-3/+3
|
* Preserve hidden fields’ values when saving inspector formDave Arter2018-02-22-1/+2
|
* Populate `usrn` field with USRN of clicked asset, if availableDave Arter2018-02-22-16/+105
| | | | | | | | | | | | | | | | | | | | | | | | Some cobrands require reports to include the USRN of the clicked road. This commit allows an asset layer to be added and designated as a 'USRN provider' by setting its `usrn_field` property when calling fixmystreet.assets.add. Initially this feature used OpenLayers' getFeatureFromEvent method, however that doesn't work if the layer isn't topmost. This is because it uses the clicked element in the DOM to determine which feature was clicked. This doesn't work if the layer you're trying to get the feature from wasn't actually the DOM element that was clicked. Instead, we add a new method, OpenLayers.Layer.Vector.getFeatureAtPoint method which takes a Point object and iterates through the features' geometries to find the matching point. To make things a little more user-friendly, if an asset isn't clicked directly we find the closest to the clicked point and use that for the USRN. To accomplish this, this commit factors out the ‘select nearest asset’ code into a new method OpenLayers.Layer.Vector.getNearestFeature, which takes a Point and a distance threshold and finds the nearest feature.
* Set asset layers’ z-indexes appropriately so they don’t cover the marker ↵Dave Arter2018-02-22-12/+19
| | | | layer
* [UK] Track clicks on ".big-green-button"Zarino Zappia2018-02-21-0/+6
| | | | | | | | | We’re interested in seeing whether people are mistakenly clicking the (inert) "Click map to report a problem" banner on the `/around` page. This will record a Google Analytics event if and when they do. Fixes mysociety/fixmystreet-commercial#963.
* Fix duplicate report selectionDave Arter2018-02-20-3/+5
| | | | | | | | The underlying DOM structure returned from /report/xx/nearby.json had changed, meaning the "Which report is it a duplicate of?" list on the inspector form wasn't displaying any reports. This commit introduces a template specifically for the nearby URL instead of overloading the on_map_list_items template.
* [Bristol] Always include an email address for Open311 reportsDave Arter2018-02-19-0/+13
|
* Merge branch '1939-questionnaire-links'Matthew Somerville2018-02-19-59/+205
|\
| * Store questionnaire data as soon as opened.Matthew Somerville2018-02-16-22/+58
| | | | | | | | | | | | This means the questionnaire is considered 'answered' as soon as a (HTML) link is clicked, which I think is okay. Then filling in the questionnaire form will update the same questionnaire.
| * Show any ‘steady-state’ questionnaire response.Matthew Somerville2018-02-16-5/+16
| |
| * Link update made during questionnaire to it.Matthew Somerville2018-02-16-7/+36
| | | | | | | | | | This means we don't show separate 'Still open' messages when an update was also left at the same time.
| * Move report under first question, number questions.Matthew Somerville2018-02-16-22/+21
| |
| * Prefill first question from questionnaire email.Matthew Somerville2018-02-16-12/+14
| |
| * Add Don’t know button to questionnaire email.Matthew Somerville2018-02-16-0/+11
| |
| * Add some /photo and questionnaire update tests.Matthew Somerville2018-02-16-3/+61
| |
* | [UK Councils] Improve prefilled report text.Matthew Somerville2018-02-15-2/+2
| |
* | [Oxfordshire] Remove response days, add home page message.Matthew Somerville2018-02-15-52/+15
| |
* | [Bristol] Switch back to own map tiles/assetsDave Arter2018-02-13-1/+33
| | | | | | | | This reverts commit 549d1cc66e591cf2da6b5243fbd28c7f40e75f14.
* | Refactor asset loading code to be more idiomaticDave Arter2018-02-13-81/+87
| | | | | | | | | | | | | | This simplifies the asset layer loading code to allow multiple layers to be created and added to the map at the correct time. This also means always_visible layers are, in fact, always visible, and not hidden when the map is clicked or a category-specific asset layer is shown.
* | WFS asset layers can set their name attributeDave Arter2018-02-13-4/+6
| |
* | Improvements to asset layer user interactionDave Arter2018-02-13-33/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit allows asset layers to be added to the map that have more complex behaviours than simply 'click a marker'. - Layers can be non-interactive and/or always visible Previously an asset layer would only be shown when its associated category was chosen from the dropdown. You can now add layers which are always visible, as well as ignoring user input. Useful for, e.g. showing an LLPG overlay on the map. - Stylemaps can be provided for individual layers This means you can, for example, have custom rules for styling features based on their attributes or other complex rules. - Functions can be used for the feature/report field mapping Instead of a one-to-one mapping between feature attributes and fields on the new report form, you can provide a callback function which can provide a calculated value to the report form.
* | Make asset layer WFS configuration more customisableDave Arter2018-02-13-14/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit makes it easier to customise the way asset layers are loaded over WFS, including: - Adds support for WFS layers via GET method The standard HTTP method for WFS GetFeature requests is POST, but some WFS services only support GET. OpenLayers.Protocol.WFS is hardcoded to use POST, but we can use OpenLayers.Protocol.HTTP instead to use GET. The options passed to fixmystreet.add_assets should include a 'http_options' object which configures the HTTP protocol. - Allows HTTP asset layers to provide their own format This makes it simpler to use GeoJSON, for example, instead of the default of GML. - Asset layers can provide their own loading strategy The default strategy can be overridden if, for example, you want to use a BBOX strategy with a smaller ratio in order to load fewer features at a time.
* | Fix OpenLayers.Projection.OS transformsDave Arter2018-02-13-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | It seems that the projectInverse/projectForward methods in OpenLayers.Layer.SphericalMercator have been renamed which was causing problems. Additionally this gem was buried in the OpenLayers.Projection.transform docs: Returns point - [...] The original point is modified. The previous code didn't seem to modify the original point which was confusing OpenLayers.
* | Merge branch 'issues/forcouncils/276-staff-only-reports'Matthew Somerville2018-02-13-37/+132
|\ \ | |/ |/|
| * Show non_public reports to staff on list pages.Matthew Somerville2018-02-13-16/+51
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-25 11:58:48 +0000