aboutsummaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeLines
* Merge branch 'version-2.1'Matthew Somerville2017-07-18-9/+6
|\
| * Use CSS class for mobile map not overlapping form.Matthew Somerville2017-07-18-9/+6
| | | | | | | | This fixes an issue with the footer navigation display.
* | [East Herts] Update template design.Matthew Somerville2017-07-18-205/+224
|/
* New version of /reports main page.Matthew Somerville2017-07-14-3/+2
| | | | | | | | | | | This is a much broader summary page, plus a body name autocomplete. This was originally implemented for fixmystreet.com in 8a6a4ccb7. It also adds '(no longer exists)' in the autocomplete next to bodies not covering any areas. You can supply the `--table` argument to `update-all-reports` to generate the old-style data.
* [FixaMinGata] Consolidate with upstream.Jon Kristensen2017-07-07-2/+89
| | | | | Add hook for post-title field content in report form. Update translations.
* [fixmystreet.com] Improve Pro link on non-front.Matthew Somerville2017-07-07-12/+8
| | | | Give it the same sort of look as currently on the front page.
* Merge branch 'issues/forcouncils/195-overloaded-action-scheduled'Matthew Somerville2017-07-07-1/+13
|\
| * [Oxfordshire] Separate defect creation from state.Matthew Somerville2017-07-07-0/+12
| | | | | | | | | | | | | | Revert the behaviour from 36baff2d, so that everyone can use the 'action scheduled' state, and instead if someone with report_instruct permission has the state set to 'action scheduled', add an extra mandatory question asking whether they want to raise a defect or not.
| * Make sure segmented control input not offscreen.Matthew Somerville2017-07-07-1/+1
| | | | | | | | | | The input is used by e.g. Chrome/Safari to position the "required" error message, so needs to be on screen.
* | Merge branch 'issues/commercial/864-update-contact-form'Matthew Somerville2017-07-07-0/+18
|\ \
| * | Add an optional phone field to the contact form.Martin Wright2017-07-07-0/+15
| | |
| * | [fixmystreet.com] Optional phone on council form.Martin Wright2017-07-07-0/+3
| |/
* | [fixmystreet.com] New version of /reports page.Zarino Zappia2017-07-06-0/+590
| | | | | | | | | | | | | | | | | | | | | | This is a much broader summary page, plus a body name autocomplete. This uses a cut down version of chart.js. [1] [1] The full version was 149Kb (41Kb gzipped) plus you needed moment (50Kb/17Kb), for a total of 199Kb/58Kb. By stripping out unused graphs and code and config options, and switching to category axis rather than time, it is now a total of 39Kb/13Kb.
* | Better handling of JS geolocation.Matthew Somerville2017-07-06-5/+5
| | | | | | | | Puts it back on alert page, lost in July 2016.
* | Better clearfix for .form-txt-submit-boxZarino Zappia2017-07-06-1/+1
|/
* Don't preselect inspector template on page load.Matthew Somerville2017-07-06-6/+10
|
* Fix clickable spaces on inspect form/ward page.Matthew Somerville2017-06-30-6/+7
| | | | | Make the relevant labels inline-block so that their click area is not wider than their content; move the body name outside of the heading.
* Merge branch 'issues/forcouncils/193-state-of-the-template'Matthew Somerville2017-06-30-26/+48
|\
| * Update templates when category/state changed.Matthew Somerville2017-06-30-10/+33
| | | | | | | | | | | | When the category or state changes, the list of available templates updates (previously it was frozen at what the category was on page load, and didn't care about the state).
| * Fix bug when switching state to duplicate and backMatthew Somerville2017-06-30-6/+2
| | | | | | | | | | It would match the wrong submit button (because switching to duplicate introduced new submit buttons).
| * Factor out $inspect_form in JavaScript.Matthew Somerville2017-06-30-11/+14
| |
* | Resize photos client-side before uploadingDave Arter2017-06-30-89/+46
|/ | | | | | | | | | | | | | | | The newest version of Dropzone has added support for client-side resizing of images, so this commit upgrades to version 5.1.1 and takes advantage of that in order to reduce the disc space consumed by uploaded images. The target size & JPEG quality is quite aggressive, resulting in files in the region of 200-300KB instead of several MB. I've tried to pick a value which doesn't impact the usefulness of the photos in identifying problems. Handily the new version also correctly rotates images according to the EXIF tag so our patch has be reduced dramatically to deal with the sync nature of the mini EXIF library in use. Related to the disc space part of #1411, though EXIF metadata isn't stripped.
* Move `toggle_shortlist` to `utils`pezholio2017-06-20-14/+13
|
* Return Response Priorities as JSON.pezholio2017-06-20-14/+10
| | | | | This now lets the response priority and defect type handling share the same code.
* Populate defect types dropdown on category changepezholio2017-06-20-1/+29
|
* [Borsetshire] Fix incorrect map page header heightZarino Zappia2017-06-20-4/+6
|
* [Borsetshire] New cobrand for fictional councilZarino Zappia2017-06-15-0/+185
|
* [Oxfordshire] Custom pin images with iconsZarino Zappia2017-06-09-0/+6
| | | | | | | Oxfordshire map pins now have icons on, and some use different colours, to better communicate the status of reports. Fixes mysociety/fixmystreetforcouncils#170
* Double resolution pin icons in coreZarino Zappia2017-06-09-0/+0
|
* Allow cobrands to define pin colour for new reportsZarino Zappia2017-06-09-8/+10
| | | | | | Previously, a green marker would be used for reports as they were being created. Now, cobrands can override `pin_new_report_colour` to show a different pin image when users are creating a new report.
* Merge branch 'csssss'Matthew Somerville2017-06-08-1104/+602
|\
| * [fixmystreet.com] Fix report a problem bg hover.Matthew Somerville2017-06-08-0/+3
| | | | | | | | | | The change to background-colour in 35bf6ddb2e meant the normal hover linear-gradient was overriding.
| * Prevent #map_sidebar shadow from overlapping #site-headerZarino Zappia2017-06-08-1/+1
| |
| * Basic white label cobrand.Dave Arter2017-06-08-0/+48
| | | | | | | | | | | | This removes most of the FMS/mySociety branding, but uses the same logic as the fixmystreet.com cobrand wrt problem restrictions, handling, etc. Suitable for UK council demos.
| * Simplify .container width calculationsZarino Zappia2017-06-08-221/+101
| | | | | | | | | | | | Removing the explicit width lets .container scale down nicely to the "middle" 48-60em screen width range without its contents hitting the sides of the window (as previously happened).
| * Remove background overrides from sass core.Matthew Somerville2017-06-08-62/+23
| | | | | | | | | | | | Most cobrands have the same header at mobile and desktop, so it is easier and simpler for the default to have this and override where necessary.
| * Update all cobrands for new core styles.Zarino Zappia2017-06-08-565/+382
| | | | | | | | Adjustments necessary due to the preceding commits.
| * Tidy up .content width/margin/padding.Matthew Somerville2017-06-08-17/+3
| | | | | | | | | | There was no need for the default .content width to be fixed and require overriding.
| * Add Sass variable for header top border.Matthew Somerville2017-06-08-3/+16
| | | | | | | | | | This makes it easier to change/remove the default top border, with subsequent measurements adjusting accordingly.
| * Simplify navigation HTML/CSS (larger widths).Zarino Zappia2017-06-08-176/+43
| | | | | | | | | | | | | | This commit removes the caption-side handling, which wasn't actually used. It gets rid of .nav-wrapper-2, and uses site-header for header display (e.g. top border). It does not update any cobrands with what needs changing.
| * Reduce complexity of header CSS.Zarino Zappia2017-06-08-131/+54
| | | | | | | | | | | | Rely upon the site logo for the header height, rather than use absolute positioning/height. This commit only alters the base styling, including cobrands; layout styling comes later.
* | Merge branch 'csssss-part-i'Matthew Somerville2017-06-07-118/+62
|\|
| * Default to same-size logo on front page.Matthew Somerville2017-06-07-9/+25
| | | | | | | | | | This means that only cobrands that want a different/bigger logo have to override it.
| * No need for display:inline on floated nav items.Zarino Zappia2017-06-06-5/+2
| |
| * Remove mySociety logo from default header.Zarino Zappia2017-06-06-60/+25
| |
| * [fixmystreet.com] Better .content homepage layout.Matthew Somerville2017-06-06-44/+10
| | | | | | | | Remove unused .tablewrapper footer CSS.
* | [fixmystreet.com] Rework pro marketing pageMartin Wright2017-06-02-14/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | Reorder structure of the page Remove icons from features text Add screenshot of theme examples Remove compatibility information Recolour clients section Pricing table - Move prices to bottom - Ditch 'show more' functionality - Add revised tier names
* | [fixmystreet.com] Show admin back-end in the pro page screenshotsMartin Wright2017-06-02-0/+0
| |
* | [fixmystreet.com] Replace screenshotMartin Wright2017-06-02-0/+0
|/ | | | | | https://github.com/mysociety/FixMyStreet-Commercial/issues/850 The image previously had FMS in a windowed browser on the laptop, this replaces it with one in full screen
* [fixmystreet.com] No need for this to be here.Matthew Somerville2017-05-31-102/+0
| | | | This is mySociety deploy specific.