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

112 commits

Author SHA1 Message Date
Tom Hughes
b9c9d6c1aa Merge branch 'master' into openstreetbugs 2010-06-16 21:19:12 +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
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
Tom Hughes
959442d087 Merge branch 'master' into openstreetbugs 2010-05-11 19:53:57 +01:00
Tom Hughes
160429e62d Merge branch 'master' into openstreetbugs 
Conflicts:
	lib/osm.rb
 2010-05-07 22:29:09 +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
Kai Krueger
5898b494df Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs 2010-05-02 11:42:58 +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
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
576e6e6d67 More improvements to styling of terms. 2010-03-23 00:33:16 +00:00
Tom Hughes
917ed5a7fd Improve styling of contributor terms. 2010-03-23 00:17:14 +00:00
Kai Krueger
03f733c4f4 Merge -r 20198:20540 from trunc into openstreetbugs branch 2010-03-18 12:42:23 +00:00
Tom Hughes
ea458b1821 Make disabled tabs more obvious. Based on patch from Adrian Cochrane. 2010-03-14 15:48:42 +00:00
Tom Hughes
ed0375ec89 Use the small PanZoom control on the user map instead of the 
full PanZoomBar control.
 2010-03-11 18:29:35 +00:00
Tom Hughes
dcbc807526 Improve user popups on friend/nearby mapper maps. 2010-03-11 18:23:22 +00:00
Tom Hughes
910937ae4b Use CSS to style the disabled tabs. 2010-03-11 08:58:48 +00:00
Tom Hughes
318c7a9854 Tidy up the stylesheets, removing lots of ancient, unused junk and 
trying to group everything else together in more logical fashion.
 2010-03-03 15:46:16 +00: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
6758efb10f Add a note to the user image upload suggesting an appropriate size. 2010-02-28 08:55:01 +00:00
Tom Hughes
6ee7bc57f1 Clamp the maximum width and height of user images. This ensures they can't 
get too big but means we don't get any upscaling.
 2010-02-28 08:41:10 +00:00
Tom Hughes
44fdad8478 Add a border to user images. 2010-02-28 00:11:17 +00:00
Tom Hughes
c7217f38aa Only specify the width for the user image for now. 2010-02-27 18:38:46 +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
Tom Hughes
0b913efd05 Use Nominatim to reverse geocode diary location information and display 
a friendly human readable location instead of some coordinates.
 2010-02-27 12:41:56 +00:00
Tom Hughes
e23744bd8d Add :warning and :error flash messages which can be styled separately to 
the existing :notice messages.

Also reviewd all existing flash messages and changed them to be errors or
warnings when appropriate and checked that those which are not followed by
a redirect are done as flash.now[] instead of flash[].
 2009-11-01 13:07:46 +00:00
Tom Hughes
78d4944caa Use a PanZoom control on small screens instead of a PanZoomBar control. 2009-10-23 23:31:19 +00:00
Tom Hughes
fc4e72dc35 Improve handling of signup and login forms on small displays. 2009-10-20 23:57:39 +00:00
Matt Amos
42cdcce858 Another version of the media-queries CSS stuff. Works better for more pages now. 2009-10-13 14:23:20 +00:00
Matt Amos
498832eb37 Re-committing experimental CSS media queries stuff for mobile and other small-screen browsers. 2009-08-19 09:42:33 +00:00
Matt Amos
1eb58bc607 Reverting experimental stuff in r17121. 2009-08-18 16:33:18 +00:00
Matt Amos
6674873478 Experimental CSS media queries to support iPhone and other small-screen devices. 2009-08-18 16:06:26 +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
Matt Amos
1d8e66016c Adding 'shortlink' functions which will allow URLs like http://osm.org/go/XXXX suitable for use in twitter, etc... 2009-06-25 23:31:53 +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
Ævar Arnfjörð Bjarmason
7a9b2de42b Made a lot of things translatable and added title="" tooltips 
* "OpenStreetMap" project name in <title> and <h1>
 * Tooltips for the greeting bar for anonymous and logged in users
 * Alternate text for the OSM logo
 * Now using a CSS class for bolding inbox(N) instead of hard-coding font-weight: bold
 * Separate tooltips for inbox(n) depending on whether it's 0, 1 or > 1
 2009-06-07 19:58:34 +00:00