Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

W3C Geolocation added to user account settings page #24

Closed
wants to merge 59 commits into from
Closed

W3C Geolocation added to user account settings page #24

wants to merge 59 commits into from

Conversation

mvexel
Copy link
Contributor

@mvexel mvexel commented Feb 28, 2012

I added W3C Geolocation functionality to the user location map on the account settings page. This attempts to find a coarse location if the user has no home location set, so as to make setting the home location easier. If the location is already set, the map can be manually centered on the approx location by clicking a link on top of the map. When W3C geolocation fails (or is denied by the user), the page falls back to the old behaviour of showing a world map.

The last commit (mine) is the only one I really wanted to include in this request, but I only have a yellow belt in git so why these other commits appear here is beyond me. My apologies.

@tomhughes
Copy link
Member

I think you really need to rebase this without all the extra commits, as it's very hard to see what's going on at the moment.

You should be able to do it with git rebase -i master which will open an editor with the list of commits - delete the ones you don't want and save and exit and it should rebase though you may need to resolve some conflicts.

Then use git push -f to push the branch to github and this pull request will update automatically.

tomhughes and others added 23 commits February 28, 2012 17:24
When infer_extension is not set ActionCachePath does not set the
extension from any explicitly specified format, and hence expiry
produces cache keys which don't have any extension and don't match
the keys generated when the cache entry was created.
The ways_for_node method on the way controller does not guarantee
to return nodes in any particular order so we shouldn't rely on it
doing so in our tests.
This removes the whitespace in the url, and makes the root path a
named route so that it can be nicely referenced.
tomhughes and others added 28 commits February 28, 2012 17:24
This is a mild restyling of OpenStreetMap. Changes include:

  * Remove margin from map, add more margin to text content
  * Rearrange permalink & link buttons and gives them a background
  * Pull OpenStreetMap text below logo along with subtitle
  * Simplify sidebar styling
  * Move towards a baseline, start to consolidate text size and line height

This is tested with LTR, RTL, and the compact mode, and looks good. Looks
more uniform in older browsers because it relies less on round corners.
Adjusting the position of the map can impact the apparent size of
the content area, so make sure we read that before we start making
any changes to the position and size of the map.
Move font sizes and line heights up in the stylesheet structure
to make the left element more uniform. Make the padding of the
menu the same as the other elements.
@mvexel mvexel closed this Feb 29, 2012
danstowell pushed a commit to danstowell/openstreetmap-website that referenced this pull request Jan 24, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants