aboutsummaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeLines
* Merge branch '1383-remove-dead-projects'Matthew Somerville2016-04-22-4257/+1
|\
| * Remove final web/fixmystreet templates.Matthew Somerville2016-04-20-39/+0
| | | | | | | | And associated, e.g. nothing references fixmystreet-old-box.js any more.
| * Remove some unused cobrands.Matthew Somerville2016-04-20-4218/+1
| |
* | Use transparent border in tips/change_location.Matthew Somerville2016-04-22-3/+3
| | | | | | | | | | A white border doesn't work if the content bar isn't white. Fixes 1380.
* | Merge remote-tracking branch 'origin/twitter-login'Matthew Somerville2016-04-22-1/+16
|\ \ | |/ |/|
| * Better sized image.Matthew Somerville2016-04-08-0/+0
| |
| * Add Twitter social login.Matthew Somerville2016-04-08-1/+16
| |
* | Add PNG image support.Matthew Somerville2016-04-08-2/+2
|/ | | | | | | Store image type along with hash in photo column, and use that when outputting images / generating URLs. Make sure all public photo URL generation goes through appropriate functions, and change temp URLs so the filename can be output directly from the list.
* [fixmystreet.com] Move country lookup client side.Matthew Somerville2016-03-31-19/+26
| | | | | There's no need for the IP->country lookup, only used in JavaScript to display a banner, to require a call to the FixMyStreet server.
* [UK] Tweak list pin padding and CSS comments.Matthew Somerville2016-03-31-5/+5
|
* [Angus] Link to Angus on FMS for councils pagesDave Arter2016-03-31-0/+0
|
* [Angus] Load web fonts over HTTPSDave Arter2016-03-31-6/+6
|
* [Zurich] Use protocol relative map tiles.Matthew Somerville2016-03-30-2/+2
|
* [Angus] Remove unused CSS.Matthew Somerville2016-03-30-2/+1
|
* Switch list item heading from h4 to h3.Matthew Somerville2016-03-30-15/+20
| | | | This stops the front page header nesting skipping a level.
* Merge branch 'issues/commercial/754-angus-cobrand'Dave Arter2016-03-29-7/+2622
|\
| * [Angus] Add clickable street light layer to report mapDave Arter2016-03-29-2/+1115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Angus provide a WFS endpoint for their existing streetlight assets and known faults. This commit: - Displays clickable markers when the 'street lighting' category is selected on the report a problem page. - Displays known faults on the map - Includes a custom OpenLayers build for the Angus cobrand that includes WFS support The custom code for adding the layers to the map is within position_map.js, as this seemed to be currently the best place for cobrand-specific map logic.
| * [Angus] Cobrand module, templates & designDave Arter2016-03-29-0/+1495
| | | | | | | | | | This adds a cobrand for Angus Council that fits in with their existing styling on angus.gov.uk
| * Preserve category when clicking elsewhere on mapDave Arter2016-03-29-0/+4
| | | | | | | | | | | | | | Because the list of categories is reloaded when changing the location of an in-progress report, it was possible for the category the user had selected to be un-selected. This improves the situation by re-selecting that category if it appears in the new list.
| * Allow cobrands to control front page number colourDave Arter2016-03-29-7/+10
| | | | | | | | | | | | Several cobrands override the colour of the 'how to report a problem' numbers on the front page, so this commit allows that to be a one-line change in the cobrand's _colours.scss.
* | Allow override of front page statistics' colour.Matthew Somerville2016-03-29-3/+6
|/
* Optimize store logo PNGs.Matthew Somerville2016-03-29-0/+0
|
* [fixmystreet.com] Update tips text.Matthew Somerville2016-03-23-0/+3
| | | | Fixes #1362.
* [fixmystreet.com] Some fixes to A/B edge cases.Matthew Somerville2016-03-18-5/+15
| | | | Better contrast; don't show on /about/council.
* Make sure preview image doesn't hide error.Matthew Somerville2016-03-18-0/+6
|
* Fix ReferenceErrors breaking map on cobrands.Dave Arter2016-03-15-2/+2
|
* [fixmystreet.com] Friendly A/B test setup.Zarino Zappia2016-03-11-0/+175
| | | | | | | | Includes a smiley, bright yellow homepage, and updated nav bar and footer across the entire site; a few content changes; request for gender information from users. Fixes #1341.
* Remove unnecessary duplicate line of code.Matthew Somerville2016-03-11-1/+0
|
* Improve accessibility of pretty radio buttons.Matthew Somerville2016-03-11-1/+2
| | | | | The radio icons are e.g. unselectable in VoiceOver if they are display:none. This also helps with client-side validation.
* Make sure top of reporting form is shown.Matthew Somerville2016-03-09-0/+1
| | | | | | If the list of reports was scrolled and then the map was clicked, the form would be pre-scrolled down. It now makes sure to scroll the form to the top. Fixes #787.
* Remove auto-scrolling of sidebar on pin hover.Matthew Somerville2016-03-09-20/+0
| | | | | This was added along with pin/sidebar highlighting in b71d042e, but has proved distracting/confusing.
* Wrap multiple report/update photos onto one line.Zarino Zappia2016-03-08-6/+22
|
* Smaller image display for reports and updatesZarino Zappia2016-03-08-10/+8
| | | | | | | | Displaying the images smaller makes the lines of text easier to read, and makes display of multiple images much better. People can still click the images to see them full size. Fixes #1325.
* [fixmystreet.com] Make sure front page error seen.Matthew Somerville2016-02-24-0/+6
| | | | Fixes #1336.
* Show remembered uploaded photos when Back used.Matthew Somerville2016-02-10-9/+10
| | | | | | | | | | The uploaded_files solution in cbdfcad6, to show already uploaded files stored in upload_fileid, worked if you submitted the form to the server and had it returned, but did not show remembered photos if you used the browser's Back button to return to the form from another page. Instead, always read the data from upload_fileid, which works whichever way you have come to the page. Fixes #1332.
* Really stop map strategy update firing too often.Matthew Somerville2016-02-09-0/+12
| | | | | | | It turns out the strategy was still firing even with correctly rounded co-ordinates from getMapBounds, as there were still rounding errors introduced by the two differing ways of calculating the map bounds. We override one function to always equal the results of the other method.
* Stop map strategy update firing too often.Matthew Somerville2016-02-09-1/+16
|
* Clearer relationship between map pins/list items.Zarino Zappia2016-02-09-32/+125
| | | | | | | | | | | | | | | | | | | Hovering over map pins highlights the relevant item from the sidebar beside the map. And hovering a sidebar item highlights the relevant map pin. Clicking a map pin takes you directly to the relevant report page, just like clicking an item in the sidebar. This means the OpenLayers popup "balloon" no longer appears on clicking a pin, and has been removed entirely. To make customisation of the list item hover colour easier, it has been abstracted out into a SCSS variable that cobrand authors should override (as the fixmystreet.com cobrand does) or leave at its default light grey colour. Fixes #1094.
* Blacklist Opera Mini on Windows Phone in uploader.Matthew Somerville2016-01-29-2/+2
| | | | | | | | | | | We had a report that our file uploader (dropzone) wasn't working in Opera on a Lumia Windows phone. It looks like this version of Opera is saying it has capability but doesn't. The file uploader already blacklists Opera 12 on a Macintosh, so do the same on Windows Phone (Opera Mini 9 has a version 12 identifier in its user agent string). The full User Agent string was Opera/9.80 (Windows Phone; Opera Mini/9.0.0/37.7751; U; en) Presto/2.12.423 Version/12.16
* Merge branch '1146-social-login'Matthew Somerville2016-01-27-0/+53
|\ | | | | | | | | | | Conflicts: templates/web/base/report/new/fill_in_details_form.html templates/web/base/report/update-form.html
| * Add login by Facebook on generic auth screen.Matthew Somerville2016-01-22-0/+1
| |
| * Add login by Facebook when updating.Matthew Somerville2016-01-22-0/+1
| | | | | | | | Makes the flow more like new reporting.
| * Add login by Facebook when reporting.Matthew Somerville2016-01-22-0/+48
| |
| * Make sure disabled inputs are faded.Matthew Somerville2016-01-22-0/+3
| |
* | Make sure data variable is defined before use.Matthew Somerville2016-01-20-7/+9
| | | | | | | | | | e.g. if you had skipped the map there is no fixmystreet variable on the resulting page, so we need to create it and check it.
* | Pad internal update links so they are in view.Matthew Somerville2016-01-19-0/+8
|/ | | | Fixes #1308.
* [fixmystreet.com] Don't show app step if used app.Matthew Somerville2016-01-06-0/+4
| | | | Fixes #1305.
* Merge branch '1299-banner'Matthew Somerville2016-01-06-11/+39
|\
| * Tidy up CSS of top banner.Matthew Somerville2016-01-05-9/+28
| | | | | | | | Include UK donations CSS used over Christmas 2015 for any future use.
| * Stop top banner overlapping header contents.Matthew Somerville2016-01-05-2/+11
| | | | | | | | | | Warwickshire has position:relative always set on .wrapper, so make sure that's maintained on map apges.