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

549 commits

Author SHA1 Message Date
Tom Hughes
03fb042591 Merge branch 'master' into openid 2010-07-28 21:39:46 +01:00
Tom Hughes
d87ea6863a Fix short links to drop the layers param for the default layer 2010-07-21 14:49:09 +01:00
Tom Hughes
ad116b2431 Don't change the visibility of layers with no code 
When parsing a layer state ignore any layers with no code
attached rather than turning them off - this ensures that
the marker layer remains enabled and any markers can be
displayed.
 2010-07-21 09:07:38 +01:00
Tom Hughes
53b0ace4c0 Remove maplint layer fron the map 
Remove the maplint layer from the map and change the way layers are
encoded in URLs to make links more robust when the available layers
are changed.
 2010-07-20 18:21:54 +01:00
Tom Hughes
f7aeff3dd6 Revert "Add advert for SOTM 2010 to sidebar" 
This reverts commit 3590335221.

Conflicts:

	app/views/layouts/site.html.erb
	config/locales/en.yml
 2010-07-12 22:40:46 +01:00
Dan Karran
dd2ff7e2da Indent relations as well as nodes and ways 2010-07-12 09:08:06 +01:00
Tom Hughes
6a3cadb52d Merge branch 'master' into openid 2010-06-16 21:18:44 +01:00
Tom Hughes
3590335221 Add advert for SOTM 2010 to sidebar 2010-06-08 17:09:21 +01:00
Dan Karran
abd996b802 Re-using service icon for pedestrian roads 2010-06-07 22:43:01 +01:00
Dan Karran
2bb92dfcf5 Using generic place_of_worship icon instead of Christian one 2010-06-07 22:43:01 +01:00
Dan Karran
870e22b1d9 Adding health related icons 2010-06-07 22:43:01 +01:00
Dan Karran
af217ca140 More historic and tourist-related icons 2010-06-07 22:43:01 +01:00
Dan Karran
5a8af1365f A few more icons 2010-06-07 22:43:01 +01:00
Dan Karran
2aae01a590 Add strikethrough style to browser when objects are deleted 2010-06-07 22:43:01 +01:00
Dan Karran
ab0c40107b Adding more shop icons 2010-06-07 22:43:01 +01:00
Dan Karran
b913df606c Add service road and bike parking icons and update the bike rental one 2010-06-07 22:42:25 +01:00
Dan Karran
209cf52ac2 Adding highway _link icons like their main counterparts 2010-06-07 22:37:01 +01:00
Tom Hughes
7b9e852c9d Merge branch 'master' into openid 2010-05-16 14:49:45 +01:00
Tom Hughes
7f1ce59f32 Rename browser-icons to browse everywhere and only load CSS when needed 2010-05-16 12:32:51 +01:00
Dan Karran
10dca1b6df Patch from bug #2787 to add icons to data browser pages 2010-05-16 12:12:59 +01:00
Tom Hughes
64f373dc59 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/new.html.erb
	config/locales/en.yml
	public/stylesheets/common.css
 2010-05-11 21:22:43 +01:00
Tom Hughes
a53c7bf623 Rework the signup page 2010-05-09 17:03:51 +01:00
Tom Hughes
59a6b1973b Rework the login page to make it a bit cleaner 2010-05-09 15:33:35 +01:00
Tom Hughes
ebd109c946 Replace openID.js with funky rails generated javascript 2010-05-09 12:25:50 +01:00
Tom Hughes
f85681c5ce Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-05-07 22:28:07 +01:00
Tom Hughes
303e5d3eb9 Merge branch 'master' into terms 
Conflicts:
	config/application.yml
	lib/osm.rb
	public/stylesheets/common.css
 2010-05-07 22:23:20 +01:00
Tom Hughes
ae8c0b3baf Add a user list view for administrators 2010-05-06 20:55:02 +01:00
Tom Hughes
d75c99b62d Update to OpenLayers 2.9.1 2010-05-06 15:08:47 +01:00
Tom Hughes
ffd7b02b0c Merge branch 'master' into terms 2010-05-05 15:29:48 +01:00
Grant Slater
684aad13df swf update with Surrey imagery support 2010-05-03 16:47:26 +01:00
Grant Slater
6155eabbf8 swf update with Surrey imagery support 2010-05-02 14:32:54 +01: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
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
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
Kai Krueger
65bcddf7a1 Replaced the Google and Yahoo logos with nicer ones 2010-04-27 22:06:10 +01: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
Æ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
Kai Krueger
f28f28f24a Try a different style for the OpenID login page 2010-04-27 20:54:07 +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
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
Tom Hughes
a97ae09d2a Add some extra translations from OpenLayers 2.9 2010-04-23 16:13:39 +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
7a8fe086cd Don't allow robots to fetch user edit lists 2010-04-20 22:40:32 +01:00
Tom Hughes
4b2ac2ea2b Merge branch 'master' into terms 2010-04-19 21:05:54 +01:00