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

770 commits

Author SHA1 Message Date
Tom Hughes
918dd5679f Use prototype to capture events so the menus work on IE 2010-11-29 12:20:24 +00:00
Tom Hughes
02f7b87515 Update Potlatch 2 styles 2010-11-29 12:20:23 +00:00
Tom Hughes
18a3cc94f1 Update Potlatch 2 to r24252 build 2010-11-29 12:20:23 +00:00
Tom Hughes
04a6c41be9 Show a popup listing available editors when hovering over the edit tab 2010-11-29 12:20:22 +00:00
Tom Hughes
b90219f1d3 Add Potlatch 2 as an editor option 2010-11-29 12:20:21 +00:00
Tom Hughes
12b2458e60 Hide the scale bar when printing 2010-11-09 14:29:05 +00:00
Andy Allan
624453948e Add a scale bar that changes with latitude (from OpenLayers 2.10) 2010-11-09 14:18:16 +00:00
Tom Hughes
e09b187cae Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-10-17 10:59:29 +01:00
Tom Hughes
1a80a11c4c Make permalinks draggable 
Move the div containing the permalinks outside the map div so that
they aren't affected by the OpenLayers event handlers and hence get
the normal drag handling for links. Closes #3251.
 2010-10-11 08:39:05 +01:00
Tom Hughes
f70feedc65 Merge branch 'master' into openid 2010-09-24 09:35:36 +01:00
Richard Fairhurst
d68466ecf8 Remove NearMap from Potlatch options 2010-09-15 10:32:13 +01:00
Tom Hughes
d28457b005 Update to OpenLayers 2.10 2010-09-09 16:27:50 +01:00
Tom Hughes
945d60ea5a Merge branch 'master' into openid 2010-09-09 09:07:13 +01:00
Tom Hughes
d8006be822 Use the keyid to identify the layer to using when exporting to an 
embeddable map. Fixes #3221.
 2010-09-08 17:13:54 +01:00
Tom Hughes
dd7ef37ec0 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/terms.html.erb
	config/locales/en.yml
 2010-09-06 12:49:10 +01:00
Tom Hughes
232337c08b Update cyclemap layer to use new tile server 2010-08-15 17:35:08 +01:00
Tom Hughes
2def7c187e Don't process overlay layers in old-style layer configurations 
There are no overlay layers that we actually want to be persistent, and
the removal of the maplint layer means that old configurations generally
open the wrong overlays now anyway.
 2010-08-13 15:13:30 +01:00
Tom Hughes
b3d92954d3 Use normal notice system to display login banner 2010-08-13 15:13:30 +01:00
Matt Amos
047027c95d Added login banner letting users more aware of the license change 2010-08-13 15:13:30 +01:00
Grant Slater
051be3013f Fix OpenLayers 404 image URL to not redirect 2010-08-11 15:23:34 +01:00
Grant Slater
49ffd3cd08 Set zero Openlayers Buffer to test influence on server. 2010-08-11 15:23:14 +01:00
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