cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3995 commits 4 branches 1 tag 499 MiB
Commit graph

2078 commits

Author SHA1 Message Date
Tom Hughes
7014cdb32c Only add bbox data to the search form while we submit it 
Having the bbox attributes on the search form all the time means
that Firefox will incude them in the arguments if you bookmark the
search using "Add a keyword for this search" on the context menu.
 2011-05-22 11:10:28 +01:00
Tom Hughes
2a635ab28f Start ROTS for user login tests as well as creation tests 2011-05-21 13:35:15 +01:00
Tom Hughes
832b96b75a Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/terms.html.erb
	test/fixtures/users.yml
 2011-05-21 12:14:56 +01:00
Mikel Maron
11b5fc0e95 Moved up search box to make it more visible 2011-05-21 11:00:53 +01:00
Tom Hughes
e120e59fc0 Handle large bounding box changesets better 
If the bounding box of a changeset is much larger than the map then
there seem to be problems with OL not rendering the feature correctly
so reduce the highlight to just be the extent of the map plus a small
margin in that case.
 2011-05-13 17:27:12 +01:00
Tom Hughes
db9420ba57 Make "all traces" and "your traces" links more consistent 
Make sure we always show the "all traces" and "your traces" links
in the same place and that they don't accidentally inherit parameter
values that we don't really want.

Based on work by Andrzej Zaborowski <balrog@zabor.org>.
 2011-05-13 10:06:16 +01:00
Tom Hughes
6d5c551a7c Simplify URL scheme name matching in OAuth callback URLs a little 2011-05-11 22:24:38 +01:00
Mendhak
9375b397fa Allow any valid (per RFC 3986) scheme name in OAuth callback URLs 
Changed the callback_url regex so that you can have custom schemes such
as myapp: or my-lovely-app: instead of just http and https. This should
help with mobile development where users can authorize with OSM in their
browser and are automatically redirected to the registered app.
 2011-05-11 22:23:06 +01:00
Tom Hughes
42e72d5591 Make the edit action default to z17 
If an attempt is made to invoke an editor without specifying a zoom
level (as with the GPX edit links) then default to z17 instead of z14
to avoid trying to load too much data. Fixes #3728.
 2011-05-07 00:05:49 +01:00
Tom Hughes
d4c8c3ad18 Use "Deleted at/by" instead of "Edited at/by" for deletes 2011-05-05 20:25:58 +01:00
Tom Hughes
a9ff3bfc4b Remove tags from deleted nodes 
When ways or relations are deleted we remove their tags and there
is no reason why nodes should be different.
 2011-05-05 20:25:58 +01:00
Tom Hughes
79ad65895b Don't show the "Nodes" heading for a way with no nodes 2011-05-05 20:25:58 +01:00
Tom Hughes
4ad5d23282 Don't allow headings in the data browser to be split 2011-05-05 20:25:57 +01:00
Tom Hughes
bdee581d44 Improve highlighting of changesets in the changeset list 2011-05-05 20:25:57 +01:00
Tom Hughes
e098d52424 Rearrange changeset list page to put the map beside the list 2011-05-05 20:25:53 +01:00
Tom Hughes
1635c16560 Tidy up code for adding a map to the changeset list page 2011-05-02 15:30:10 +01:00
Mikel Maron
48929e8781 Add a map to the changeset list page 
Add a map to the changeset list page, with a bounding box for each
changeset and highighting when the mouse is placed over either a box
on the map or a row of the table.
 2011-05-01 22:55:28 +01:00
Tom Hughes
02e186ee5b Allow user details to be fetched without agreeing terms 2011-04-20 21:17:59 +01:00
Tom Hughes
37b6418f72 Revert "Allow user details to be fetched without agreeing terms" 
This reverts commit ddd12b03e1.
 2011-04-18 23:04:42 +01:00
Tom Hughes
ddd12b03e1 Allow user details to be fetched without agreeing terms 2011-04-18 22:23:48 +01:00
Tom Hughes
6f7eb8f0e8 Don't require terms to be agreed when logging out 2011-04-18 09:04:57 +01:00
Matt Amos
c21aa5933a Added flash notice for CTs decline 
Also ensured that CTs are either accepted or declined and cannot
be inadvertently bypassed.
 2011-04-18 00:29:15 +01:00
Tom Hughes
2ba5067fcf Use report_error so Potlatch can see the errors 2011-04-17 21:45:04 +01:00
Tom Hughes
8024a38be4 Make sure "please read the terms" error is issued in the right language 2011-04-17 20:33:49 +01:00
Matt Amos
696fbb4e16 Renumbered sections to be more consistent with subsection numbering style 2011-04-13 13:17:21 +01:00
Matt Amos
2491328270 Reformatting contributor terms box based on suggestions by Tom 2011-04-13 13:17:17 +01:00
Matt Amos
55cc2e0fcf Updated French and UK terms to 1.2.4 2011-04-13 13:17:13 +01:00
Tom Hughes
9f0cc74832 Make Potlatch 2 default to the en locale if there is nothing better 2011-04-06 21:42:03 +01:00
Tom Hughes
5f7855fa4d Tell Potlatch 2 which locale to use 2011-04-06 21:22:47 +01:00
Tom Hughes
b77c6fe8ae Improve recognition of OAuth referers for triggering of slim mode 2011-04-06 13:24:08 +01:00
Tom Hughes
685a35524a Try and patch up poor browser language selections 
The HTTP RFC says that a language range specified by a browser only
matches a resource whose language tag is the same, or longer. This
means that a browser language range of de-DE will not match a resource
with a language tag of de.

Because of this browsers should always send the generic range, such
as de, as a secondary choice after a more specific range like de-DE.

Some browers don't this however, so if we don't get a language match
we try and patch up the list of language ranges by inserting the
more generic ranges.
 2011-04-04 22:44:43 +01:00
Tom Hughes
8f101a3759 Trigger mobile mode at 640px instead of 480px for iPhone 4 support 2011-04-03 18:02:27 +01:00
Tom Hughes
89bd91e7d8 Link from a diary entry to the relevant user's diary 
Fix #2956 by making the title on a diary entry a link back to the
diary list page for the author.
 2011-04-03 16:11:20 +01:00
Tom Hughes
9e6e6c2e23 Fixup the user map code to match existing code style 2011-04-03 16:00:06 +01:00
Harry Wood
41589b6ef9 fixes http://trac.openstreetmap.org/ticket/3645 . Can now pass in show_other_users and setting_location to the map partial 2011-04-03 15:43:41 +01:00
Tom Hughes
cb6d6c2463 Report a friendly(ish) error if no OAauth key is set for Potlatch 2 2011-04-03 15:40:05 +01:00
Dan Karran
d62da73ad7 Add a smaller version of the site logo and title for small screens 2011-04-03 15:16:35 +01:00
Tom Hughes
5777c5e925 Tidy up the data browser javascript 2011-04-03 14:59:43 +01:00
Frederik Ramm
59dcc8b253 Add 'hide areas' button to data view 2011-04-03 14:54:32 +01:00
Harry Wood
940995c816 Make home location setting map default to the whole world 
Defaulting to western europe doesn't seem very reasonable these
days as we have users all over the world now.
 2011-04-03 13:46:18 +01:00
Tom Hughes
4b20afd51e Preserve the referer at the end of account creation 2011-04-03 13:46:18 +01:00
Tom Hughes
097fb390b8 Only show login/signup in slim mode when used from oauth 2011-04-03 13:46:18 +01:00
Tom Hughes
bb83f28a5e Factor out comment code from layouts into partials 2011-04-03 13:46:17 +01:00
Andy Allan
6edbcc12df Use slim layout for OAuth pages too 2011-04-03 13:46:17 +01:00
Andy Allan
7d7416894a New version of slim layout with grey background and centered, auto-adjusting page 2011-04-03 13:46:17 +01:00
Andy Allan
7b57119146 Another approach, but this time without scattering stuff all over the methods 2011-04-03 13:46:17 +01:00
Andy Allan
0531a7dfa1 Ah, that doesn't work due to 'bugs' in the way layouts work - only the last command has any effect 2011-04-03 13:46:17 +01:00
Andy Allan
5531c0bf34 Use the slim layout on the login page 2011-04-03 13:46:16 +01:00
Andy Allan
873fe81f71 Try a different approach - grab the layout and stylesheet from slim1, and ditch the rest 2011-04-03 13:46:16 +01:00
Tom Hughes
aa8fef0f94 Don't display deleted marker for nodes 2011-04-03 13:46:16 +01:00