Commit graph

3844 commits

Author SHA1 Message Date
Ævar Arnfjörð Bjarmason
f699368335 Merge branch 'master' into openID 2010-04-27 20:03:03 +00:00
Kai Krueger
f28f28f24a Try a different style for the OpenID login page 2010-04-27 20:54:07 +01:00
Ævar Arnfjörð Bjarmason
5f1fc761fb Fix link broken in feb9582 due to routes.rb changes 2010-04-27 15:18:24 +00:00
Tom Hughes
feb9582b07 Tweak the copyright page translation 2010-04-27 16:00:10 +01:00
Tom Hughes
6729272444 Merge branch 'master' into terms 2010-04-27 11:22:25 +01:00
Tom Hughes
9241ecc8ee Improve layout of buttons on contributor terms page 2010-04-27 11:04:41 +01:00
Tom Hughes
276c29cb31 Make the decline button a real button
Make the decline button on the terms page a real form submit button
and have the server redirect to the wiki as it's the only way to get
something that will actually look the same as a button on all the
different browsers.
2010-04-27 10:45:49 +01:00
Tom Hughes
d033a0f35d Pressing agree creates the account now rather than activating it 2010-04-27 10:06:40 +01:00
Tom Hughes
adb0883d17 Ajaxify the country selection on the terms page 2010-04-27 10:01:40 +01:00
Matt Amos
972278a223 Some styling changes. Changed drop-down into radio buttons. Tried, and failed, to get the 'decline' link to look like a button. 2010-04-27 00:36:44 +01:00
Siebrand Mazeland
5dcd2ad70c Localisation updates from translatewiki.net (2010-04-26)
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-04-26 22:04:27 +02:00
Ævar Arnfjörð Bjarmason
59bf6e0a04 Change misleading wording on copyright page
Previously it said that you may distribute derived works "under the
same or similar license", now it just says "under the same".

The former form is derived from the cc-by-sa summary:

    http://creativecommons.org/licenses/by-sa/2.0/

But the legal code itself says:

    You may distribute, publicly display, publicly perform, or publicly
    digitally perform a Derivative Work only under the terms of this
    License, a later version of this License with the same License
    Elements as this License, or a Creative Commons iCommons license that
    contains the same License Elements as this
    License (e.g. Attribution-ShareAlike 2.0 Japan)

The intent is obviously to refer to other creative commons
licenses. This makes sense in the context of the creative commons
website. but on our site the reader could infer that he's able to
distribute the map data under similar licenses, such as the GPL, GFDL,
Apache 2 and others.
2010-04-26 18:05:51 +00:00
Ævar Arnfjörð Bjarmason
ca1283d031 Translate "Copyright & license" into Icelandic 2010-04-26 18:01:27 +00:00
Ævar Arnfjörð Bjarmason
7561eacbf4 Enable localization of the copyright page
The copyright page introduced in ecbd526 wasn't localize-able. Rectify
that with a page that:

   * Displays a header in non-English languages indicating that the
     version you're looking at isn't canonical.

   * Links back to the local version from the English one in a
     non-English locale.

Additionally I fixed a regression with the cc_button.png. It now has a
meaningful alt="" text again.
2010-04-26 18:00:02 +00:00
Ævar Arnfjörð Bjarmason
479b682d38 Correctly indent this if/else clause
Some of the content of the else was at the same indent level as the
else itself.
2010-04-24 12:37:51 +00:00
Ævar Arnfjörð Bjarmason
735493837b Merge branch 'master' into openID 2010-04-24 12:33:29 +00:00
Kai Krueger
e4cb614e59 Correct merge issues in the last merge from master 2010-04-24 12:33:12 +00:00
Tom Hughes
a97ae09d2a Add some extra translations from OpenLayers 2.9 2010-04-23 16:13:39 +01:00
Tom Hughes
4763272982 Fix data browser navigation tooltips 2010-04-22 23:38:07 +01:00
Tom Hughes
54bed8e9c0 Improve layout of data browser pages
Use float to position the navigation controls and map on the right
rather than a table so that we get more consistent positioning and
avoid forcing the map of the right hand side of the viewport.
2010-04-22 23:05:20 +01:00
Tom Hughes
4ef8776490 Update to OpenLayers 2.9 2010-04-22 18:58:51 +01:00
Tom Hughes
8197ab3f82 Merge branch 'copyright' 2010-04-22 11:13:14 +01:00
Tom Hughes
886c859784 Link to API usage policy 2010-04-22 10:49:50 +01:00
Tom Hughes
d2585ea044 Tweak wikipedia links stuff 2010-04-22 10:41:53 +01:00
Tom Hughes
c9a3091ca8 Merge remote branch 'avar/avar/browse-pages-link-to-wikipedia' 2010-04-22 09:09:36 +01:00
Tom Hughes
3008963a4b Case #2908: Escape user name in user not found error 2010-04-22 00:43:31 +01:00
Ævar Arnfjörð Bjarmason
9bfa6059be Link to wikipedia articles on wikipedia=* tags
The semantics are as documented on
http://wiki.openstreetmap.org/wiki/Key:wikipedia, i.e.:

    # English Wikipedia article Foobar
    wikipedia=Foobar
    # German Wikipedia article Foobar
    wikipedia:de=Foobar
    wikipedia=de:Foobar

If someone gives a http:// link we just pass it through.
2010-04-21 01:46:50 +00:00
Ævar Arnfjörð Bjarmason
0191549033 This script requires perl 5.10 2010-04-21 00:17:05 +00:00
Ævar Arnfjörð Bjarmason
0193b18edb Mention how to run this script with prove(1) 2010-04-21 00:16:09 +00:00
Ævar Arnfjörð Bjarmason
c377932312 Don't re-declare lexical variable 2010-04-21 00:07:54 +00:00
Ævar Arnfjörð Bjarmason
0f9c9190ee This script no longer screen-scrapes and supports >500 key/values 2010-04-21 00:04:24 +00:00
Ævar Arnfjörð Bjarmason
19c5f8aeaa M-x untabify the OpenID branch 2010-04-20 23:47:23 +00:00
Ævar Arnfjörð Bjarmason
9448eab143 Merge branch 'master' into openID 2010-04-20 23:41:14 +00:00
Tom Hughes
7a8fe086cd Don't allow robots to fetch user edit lists 2010-04-20 22:40:32 +01:00
Tom Hughes
9816c7dd0a Merge branch 'wikilinks' 2010-04-20 21:47:57 +01:00
Tom Hughes
e3fc033c1e Ignore some more generated files 2010-04-20 21:41:57 +01:00
Tom Hughes
546250f60b Load wiki link data at startup and shorten some file names 2010-04-20 21:05:22 +01:00
Tom Hughes
d6755356e0 Improve the browse helper code use to generate wiki links 2010-04-20 19:04:12 +01:00
Tom Hughes
da74fbb769 Fix wiki scraper to find tag pages as well as key pages 2010-04-20 18:48:59 +01:00
Tom Hughes
88aa34f61b Update wiki link style to use the current default format 2010-04-20 14:21:23 +01:00
Ævar Arnfjörð Bjarmason
8eead8a870 Ticket #2245: Link from /browse/* pages to the wiki key/value pages 2010-04-20 12:55:14 +00:00
Tom Hughes
2e202460e6 Check that the token is valid before using it. 2010-04-20 11:05:55 +01:00
Tom Hughes
d36fab2913 Merge branch 'master' into openid
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/login.html.erb
	config/locales/en.yml
2010-04-20 00:41:03 +01:00
Tom Hughes
7a5ac0394d Merge branch 'master' into copyright 2010-04-19 21:57:13 +01:00
Tom Hughes
4b2ac2ea2b Merge branch 'master' into terms 2010-04-19 21:05:54 +01:00
Tom Hughes
16030e0381 Ignore yet more files. 2010-04-19 20:06:50 +01:00
Tom Hughes
8c95ba7838 Ignore some more files. 2010-04-19 16:48:10 +01:00
Tom Hughes
ec24889541 Ignore some files which aren't committed. 2010-04-19 15:20:13 +01:00
Tom Hughes
a36185b22f Normalise line endings. 2010-04-19 15:17:18 +01:00
Tom Hughes
3e67d08c13 Removed old copy of OpenLayers that was hanging around. 2010-04-19 15:14:47 +01:00