Commit graph

3259 commits

Author SHA1 Message Date
Ævar Arnfjörð Bjarmason
7fe2f07e47 Make "Your OpenID is not associated with a OpenStreetMap account yet" message valid HTML
It was introduced in ebcc988376 by Kai Krueger
2010-05-02 11:02:25 +00:00
Ævar Arnfjörð Bjarmason
acf518e5c3 M-x untabify Kai Krueger's ebcc988376 2010-05-02 10:48:06 +00:00
Ævar Arnfjörð Bjarmason
6a6814e41d Only apply openid_url class to <input> boxes
This was already implicitly the case since it was only used on
<input>. Just narrow down the CSS rule.
2010-05-02 10:46:31 +00:00
Ævar Arnfjörð Bjarmason
e219011760 Merge remote branch 'apmon/openID' into openID 2010-05-02 10:24:06 +00:00
Kai Krueger
9fbd888e04 Merge branch 'master' of git://git.openstreetmap.org/rails into openID 2010-05-02 11:15:13 +01:00
Kai Krueger
92af0eccd5 Add test for OpenID login and signup
The tests need the ROTS (Ruby OpenID Test Server) running.
ROTS can be found at http://github.com/roman/rots
If ROTS is not running, there will be 4 failed test cases, but otherwise
things should work
2010-05-02 11:04:51 +01:00
Kai Krueger
9faf30fb45 Add an extra null pointer check that can trigger in tests 2010-05-02 11:03:45 +01:00
Ævar Arnfjörð Bjarmason
441b92c3c3 Merge branch 'master' into openID 2010-05-02 08:57:50 +00:00
Kai Krueger
900fdde664 Make a missing string translatable. Add a note about not needing a password with OpenID 2010-05-02 01:06:30 +01:00
Tom Hughes
c079c1f574 Improve hiding of openid field on signup screen 2010-05-01 19:18:06 +01:00
Kai Krueger
2b21b7f841 Forgott to commit a javascript file 2010-05-01 19:03:31 +01:00
Kai Krueger
799bbc3d9f Hide OpenID url on signup page to make it less confusing 2010-05-01 18:48:20 +01:00
Kai Krueger
6159b48b8f Remove a superfluous styling 2010-05-01 17:55:16 +01:00
Grant Slater
4d1fa7adfb Add tag for Surrey Air Survey 2010-05-01 16:01:45 +01:00
Kai Krueger
ebcc988376 Make it a bit clear when you try and login with openID and your openID isn't associated with a OSM account yet 2010-05-01 13:49:51 +01:00
Andy Allan
cd89a3c662 Move email configuration out of the model and into the config file 2010-05-01 12:36:22 +01:00
Kai Krueger
31d497fb0a Fine tweek the size of the OpenID logos 2010-05-01 11:29:23 +01:00
Kai Krueger
058217bc69 Add the OpenID logo to all openid url entry textfields for clarity 2010-05-01 11:25:47 +01:00
Siebrand Mazeland
4ef2cb9a71 Localisation updates from translatewiki.net (2010-04-30)
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-04-30 13:57:31 +02:00
Tom Hughes
b2c3c8e710 Updated rails translations from http://github.com/svenfuchs/rails-i18n 2010-04-30 09:18:35 +01:00
Siebrand Mazeland
2b46a0b0e4 Fix YAML syntax error introduced in d67b9d7302. Thanks to avar for helping out. 2010-04-29 23:25:51 +02:00
Siebrand Mazeland
d67b9d7302 * updates in newline usage on the license_page messages
* remove trailing whitespace
2010-04-29 23:12:24 +02:00
Siebrand Mazeland
1ae014afa1 Merge branch 'master' of git://git.openstreetmap.org/rails 2010-04-29 22:58:18 +02:00
Ævar Arnfjörð Bjarmason
f8119bf169 Update config/wiki_pages.yml with script/misc/update-wiki-pages
16 new values. Mainly French and Russian.
2010-04-29 13:21:40 +00:00
Tom Hughes
90d2ed759f Fix mangling of wikipedia links
Bail out straight away if the tag value is a URL rather than waiting
until we have parsed the key as we may change the value in the process
of parsing the key.
2010-04-28 18:48:56 +01:00
Kai Krueger
65bcddf7a1 Replaced the Google and Yahoo logos with nicer ones 2010-04-27 22:06:10 +01:00
Ævar Arnfjörð Bjarmason
433464ecc2 Merge remote branch 'remotes/apmon/openID' into openID 2010-04-27 20:50:01 +00:00
Ævar Arnfjörð Bjarmason
2d0d6339a5 Don't display an image border for images in the OpenID login box 2010-04-27 20:48:08 +00:00
Kai Krueger
8df391f41f Merge branch 'openID' of git://github.com/avar/osm-website into openID 2010-04-27 21:37:40 +01:00
Kai Krueger
5027a70fec It was not possible to remove an OpenID from your user profile 2010-04-27 21:34:41 +01:00
Ævar Arnfjörð Bjarmason
79e140641c Tweak the OpenID login page
* Replace 'foo' alt text with a real alt text and add title="" text
    too

  * Don't display an "Or" between the two, it's obvious from context
    that it's either-or

  * Display a small OpenID logo next to the login form (from
    http://openid.net/foundation/news/logos/)

  * Fix some indenting / HTML errors in the login table

  * Don't add border: 1px style to the OpenID provider logos. Prettier
    this way and doesn't include inline CSS
2010-04-27 20:32:43 +00:00
Æ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
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