aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Better way of fixing size of map, and hide URL bar, fixes #266 (not sure ↵Matthew Somerville2012-03-01-1/+14
| | | | we'll keep it though).
* Move popups to come out of the middle of the pin.Matthew Somerville2012-03-01-1/+2
|
* Merge remote branch 'github/supercool' into supercoolMatthew Somerville2012-03-01-0/+3
|\
| * Merge branch 'supercool' of ssh://github.com/mysociety/fixmystreet into ↵Josh Angell2012-03-01-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | supercool Conflicts: web/js/map-OpenLayers.js Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
| * | Initial scroll event for when user clicks ok on mobile map, also altered how ↵Josh Angell2012-03-01-2/+12
| | | | | | | | | | | | | | | | | | the Notes scroll so they use offset instead Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* | | Don't say we're a webapp, as we quite like the back button, fixes #267.Matthew Somerville2012-03-01-2/+0
| |/ |/|
* | Initial scroll event for when user clicks ok on mobile map, also altered how ↵Josh Angell2012-03-01-2/+9
|/ | | | | | the Notes scroll so they use offset instead Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Use offset for skip to nave on mobileJosh Angell2012-03-01-2/+2
| | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Move mobile map banner out of #side and into #map_box so it doesn't disappearJosh Angell2012-03-01-1/+5
| | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Linter fixJosh Angell2012-03-01-1/+1
| | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Merge branch 'supercool' of ssh://github.com/mysociety/fixmystreet into ↵Josh Angell2012-03-01-34/+13
|\ | | | | | | supercool
| * Mobile JS can be same as desktop now.Matthew Somerville2012-03-01-34/+13
| |
* | Some language changes to fix sub_map_links breakingJosh Angell2012-03-01-8/+8
|/ | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Try again link for #258Josh Angell2012-03-01-1/+4
| | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Move disappearing of sub map links and appearing of tryagain/ok to after the ↵Josh Angell2012-03-01-10/+18
| | | | | | click, also remove permalink and add receive updates Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Fix map ui on tablet media queryJosh Angell2012-03-01-0/+4
| | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Merge branch 'supercool' of ssh://github.com/mysociety/fixmystreet into ↵Josh Angell2012-03-01-9/+14
|\ | | | | | | supercool
| * Function return has reversed.Matthew Somerville2012-03-01-1/+2
| |
| * Green pin when creating, for #250.Matthew Somerville2012-03-01-2/+2
| |
| * All pins yellow, for #250.Matthew Somerville2012-03-01-3/+6
| |
| * Bugfix.Matthew Somerville2012-03-01-3/+4
| |
* | Mobile map ui moved. Also helper title text and ok/try again links addedJosh Angell2012-03-01-34/+67
|/ | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Merge branch 'supercool' of ssh://github.com/mysociety/fixmystreet into ↵Josh Angell2012-03-01-23/+27
|\ | | | | | | supercool
| * Fix #261, photos need confirmed time also.Matthew Somerville2012-03-01-23/+27
| |
* | Move sub_map_links to bottom on desktopJosh Angell2012-03-01-1/+1
|/ | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Make map ui 2* bigger (fixes #264)Josh Angell2012-03-01-22/+24
| | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Fix sub_map_links shooting off the page on close for the first viewingJosh Angell2012-03-01-1/+2
| | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Fix media query discrepancy that caused ipad portrait to show mobile versionJosh Angell2012-03-01-1/+1
| | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Merge branch 'supercool' of ssh://github.com/mysociety/fixmystreet into ↵Josh Angell2012-03-01-1/+1
|\ | | | | | | supercool
| * Check fixmystreet object exists, it might not.Matthew Somerville2012-03-01-1/+1
| |
* | Merge branch 'supercool' of ssh://github.com/mysociety/fixmystreet into ↵Josh Angell2012-03-01-7/+8
|\| | | | | | | supercool
| * For #258, immediately go full screen map on mobile around page.Matthew Somerville2012-03-01-7/+8
| |
* | Remove animation from report a problem nots on mobileJosh Angell2012-03-01-2/+2
|/ | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Remove some of #224 due to new #258.Matthew Somerville2012-03-01-78/+35
|
* Animate moving of map when pin clicked somewhere inconvenient.Matthew Somerville2012-03-01-2/+5
|
* Initial pass of pin popups.Matthew Somerville2012-03-01-565/+636
|
* Some documentation in the cssJosh Angell2012-02-29-31/+39
| | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Fix map page if you skipJosh Angell2012-02-29-1/+3
| | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Remove some extraneous stuffJosh Angell2012-02-29-3/+1
| | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Add backgroundJosh Angell2012-02-29-1/+1
| | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Merge branch 'supercool' of ssh://github.com/mysociety/fixmystreet into ↵Josh Angell2012-02-29-2/+4
|\ | | | | | | supercool
| * Reduce JS pin fetching to only exactly the map that is shown.Matthew Somerville2012-02-29-2/+4
| |
* | Finished style and interaction for mobile mapJosh Angell2012-02-29-27/+72
|/ | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Map ui pretty much done for desktopJosh Angell2012-02-29-14/+34
| | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Make permalink_id not globalJosh Angell2012-02-29-0/+2
| | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Change word 'stale' to 'old'Josh Angell2012-02-29-3/+3
| | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Manipulate permalink only if container for it is thereJosh Angell2012-02-29-2/+8
| | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* Explicity function calls.Matthew Somerville2012-02-29-2/+2
|
* Merge remote branch 'github/supercool' into supercoolMatthew Somerville2012-02-29-6/+131
|\ | | | | | | | | | | Conflicts: web/cobrands/fixmystreet/base.scss web/js/map-OpenLayers.js
| * Lots of map tools/controls stylingJosh Angell2012-02-28-65/+131
| | | | | | | | Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>