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

52 commits

Author SHA1 Message Date
Shaun McDonald
741c624e67 Update the rss feed logo, to use the new logo. 2011-05-18 00:36:00 +01:00
Kai Krueger
43e12e7d02 Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs2 2011-04-29 20:52:59 -06:00
Tom Hughes
17c603d345 Rename SVG version of logo to match PNG logo name 2011-04-29 21:28:48 +01:00
Steve Coast
cf8eb6ebe3 Update to softer logo 2011-04-29 21:26:04 +01:00
Kai Krueger
890fbcaae6 Forgott to copy over an image from openstreetbugs.schokokeks.org 2011-04-22 10:06:33 -06:00
Kai Krueger
001ff5764b Merge branch 'master' into openstreetbugs2 2011-04-19 22:00:30 -06:00
Matt Amos
5df75e9321 Changed button text to match http://stateofthemap.org banner heading. 2011-04-05 00:46:48 +01:00
Matt Amos
82db7eccc8 Added SOTM 2011 banner to the side bar 2011-04-03 13:46:15 +01:00
Patrick Kilian
8c4419412f Improve the Osmarender key 2011-01-17 10:16:52 +00:00
Tom Hughes
52395b3cdf Merge branch 'master' into openstreetbugs 2010-07-28 21:30:55 +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
Tom Hughes
b9c9d6c1aa Merge branch 'master' into openstreetbugs 2010-06-16 21:19:12 +01:00
Tom Hughes
3590335221 Add advert for SOTM 2010 to sidebar 2010-06-08 17:09:21 +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
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
Tom Hughes
4b17b92da0 Merge branch 'master' into openstreetbugs 2010-05-16 14:50:06 +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
Kai Krueger
42822a8b89 An initial (incomplete) "proof of concept" integration of an OpenStreetBugs interface into the rails port 
This is a (start of a) reimplementation of the api at http://github.com/emka/openstreetbugs/tree/master/api/0.1/
into rails

The client side code is taken from http://wiki.openstreetmap.org/wiki/OpenStreetBugs/New_Client

This is ment as a mockup to perhaps use as a basis to further discuss how best to integrate a map bug reporting system

It currently uses (more or less) the openstreetbugs api specification. But this api feels rather inconsistent with the
rest of the rails_port api, so depending on discussions might still need some significant changes.
 2010-02-28 09:30:40 +00:00
Tom Hughes
87e7d500ce Remove border from anonymous user images as we add it with CSS now. 2010-02-28 00:31:44 +00:00
Tom Hughes
acd72861ed Rework the user details screen to be less crap... Highlights include: 
- Map is smaller and placed to the side with lists of friends
    and nearby users (now excluding friends) beside it.

  - Map includes friends as well as nearby users.

  - Friend and nearby user lists include photos and links to
    friend/unfriend as appropriate.

  - OAuth settings link moved up with all the other links in the
    main navigation bar.

The addition of friends to the map also carries through to the user
settings page.
 2010-02-27 18:11:04 +00:00
Matt Amos
17f05fdb13 Merging 17905:17944 from trunk. 2009-10-02 15:36:46 +00:00
Ævar Arnfjörð Bjarmason
8c1d3fdd6b Amend [17942]: 
* Center-align donation text
 * Add title="" to the donate link
 * Use an official cc_button.png from http://1.1.1.1/bmi/i.creativecommons.org/l/by-sa/2.0/88x31.png that doesn't include English text
 * Add rel=license to license link as suggested by CC
 * Add width/height to CC button
 2009-10-02 13:04:47 +00:00
Tom Hughes
968e6c417f Replace the donate button with a text version that can be translated. 2009-10-02 12:29:44 +00:00
Matt Amos
daa2496024 First version of blocking feature. Allows both time-based (for map protection) and notice-based (for education) blocks on users. Also introduces user roles and a simple UI for displaying and administering these. 2009-09-28 16:01:00 +00:00
Tom Hughes
b5a6493aff Remove SOTM advert from site. 2009-07-13 08:11:11 +00:00
Tom Hughes
06b2d278ea Make the search box load each set of results separately so that one 
service being slow doesn't delay the response from others.
 2009-07-02 16:12:38 +00:00
Sebastian Spaeth
19f6e67aeb add osmarender key stub, which will need to be completed 2009-06-26 13:07:02 +00:00
Tom Hughes
817434a2e6 Rework the translatable map key to be driven by a YAML file listing the 
entries to show for each layer and zoom level.
 2009-06-24 23:30:41 +00:00
Ævar Arnfjörð Bjarmason
079b9fed84 Change the map key from a static PNG image to a generated HTML table that can be translated. Solves ticket:1916 2009-06-23 12:04:06 +00:00
Tom Hughes
20992870ab Use SOTM logo to link to the SOTM site. 2009-05-26 13:16:10 +00:00
Tom Hughes
1f2ed3372f Add missing image. 2009-04-21 08:51:23 +00:00
Steve Chilton
e1e6971a13 Revised keys 6,7,8,9,12,13, new 15 2009-03-21 21:11:11 +00:00
Tom Hughes
fd19a1f3ba Replace the PayPal button on the home page with a donate button that 
links to the OSM donation site.
 2009-02-13 17:38:40 +00:00
Steve Chilton
0be6b94513 Correct versions of z12/13 keys 2008-07-30 14:37:55 +00:00
Steve Chilton
6595fe96a7 new versions of map keys to z12 and z13 2008-07-30 14:19:15 +00:00
Steve Chilton
f2dcc8f19a new versions of keys to mapnik z8-z13 2008-03-23 16:15:48 +00:00
Steve Chilton
994b9391cb new key for z13. revised keys to z8, z10, z11, z12 2007-11-30 13:00:31 +00:00
Steve Chilton
3ee2d2d3b7 revised keymapnik11/12, new versions of keymapnik6-10 2007-10-21 19:03:32 +00:00
Richard Fairhurst
822e48850d experimental pop-out map key 2007-10-08 22:10:26 +00:00
Tom Hughes
d45db3acc4 Fix image referred to in RSS feeds so that it actually exists. 2007-08-15 18:12:37 +00:00
Tom Hughes
5ffb6950cc Use David Earl's arrow icon to show the position of a search result. 2007-08-08 16:57:09 +00:00
Dan Moore
d07277efba API 0.4 Updates - work on traces pages + pagination, edit tab, some API testing 
* traces - added some routes, replicated data access / pagination, but presentation and pending file control not complete
* edit - setup so that applet can be loaded + token authorisation enabled
* API - tests out ok against applet, but had to change segment-node associations
* misc - gems version required upgraded to 1.2.3 (latest stable rails version), changed some find_first to find(:first... calls
 2007-03-23 23:13:19 +00:00
Steve Coast
222d31e435 way stuff 2006-08-26 20:49:16 +00:00
Steve Coast
a42dc9f482 slippy map alpha 2006-08-26 16:55:17 +00:00
Steve Coast
88297a682c bits 2006-08-01 14:53:49 +00:00