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

5497 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
ec416f0609 Remove messages which have been copied from english 2013-01-16 18:48:48 +00:00
Tom Hughes
3cb0613db1 Fixup test failure 2013-01-16 18:39:26 +00:00
Tom Hughes
354cadfbe7 Make user markers display correctly 
Instead of putting the data on a bogus <td> element that will be deleted
by the browser, put it on the <div> wrapper instead.
 2013-01-16 18:27:56 +00:00
Tom Hughes
4b9efb63b8 Avoid wrapping an <li> in a <span> 2013-01-16 18:13:52 +00:00
Tom Hughes
111329b31f Display trace descriptions properly 2013-01-16 09:53:39 +00:00
Tom Hughes
76559d3de2 Fix notes page in data browser to match new site style 2013-01-15 22:25:22 +00:00
Tom Hughes
8cd6168b48 Set width of comment entry area in note popups 2013-01-15 21:42:43 +00:00
Tom Hughes
3d7eb387a7 Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
 2013-01-15 21:11:35 +00:00
Tom Hughes
f111e6c1cf Update data schema 2013-01-15 20:56:43 +00:00
Tom Hughes
ed699548e6 Update tests for layout changes 2013-01-14 22:30:54 +00:00
Tom Hughes
4c9a3d4803 Disable caching of pages with dynamic layout 
Pages now feed back into the layout to set the content of the heading
block so we can't cache any page which has a layout as that would mean
the heading wouldn't appear when the cached page was used.
 2013-01-14 22:30:03 +00:00
Saman Bemel-Benrud
a36f3558dd Site cleanup 
I set out to do a quick and dirty typography overhaul to make things
more consistent and a bit cleaner, but I kept running into things I
didn't like, so this lead me down something of a rabbit hole of design
tweaks to the OSM site.

Goals here are to have better content hierarchy, better vertical
rhythm, more consistent UI, cleaner markup with less tables, all while
keeping the basics pretty much intact. There are a lot of things I
didn't touch even though they need to be updated (lots of tables where
stuff shouldn't be tables, mostly).

Basic overview of changes:

I added a new persistent header that helps segment pages. It's now
a lot easier to know what you're looking at. The header has a page
title, a description, plus a submenu of actions.

There is now a pattern of 20px/10px margins and padding for more
rhythm and breathing room throughout the site.

I know there are other problems here or things I've missed - would
love another set of eyes to look over this! I am still getting comfortable
working on the site - it's my first time ever digging into a ruby or rails
so I'm not familiar with the templating language yet.
 2013-01-14 21:27:08 +00:00
Siebrand Mazeland
91139ae014 Localisation updates from http://translatewiki.net. 2013-01-13 15:03:06 +00:00
Tom Hughes
355d62bcf8 Update to rails 3.2.11 2013-01-08 20:37:03 +00:00
Tom Hughes
316f1718cf Remove messages which have been copied from english 2013-01-08 20:37:03 +00:00
Siebrand Mazeland
6eb37afc4b Localisation updates from http://translatewiki.net. 2013-01-07 10:20:48 +00:00
Tom Hughes
6bd16d543a Stick with therubyracer 0.10.x for now 
The 0.11.x release is a complete mess, as amply documented in the github
issue tracker (https://github.com/cowboyd/therubyracer/issues/215).
 2013-01-03 11:10:32 +00:00
Tom Hughes
71255ea666 Update rails to 2.3.10 2013-01-03 10:40:32 +00:00
Siebrand Mazeland
9a6b42ffeb Localisation updates from http://translatewiki.net. 2012-12-30 10:33:23 +00:00
Siebrand Mazeland
13587a34af Localisation updates from http://translatewiki.net. 2012-12-21 18:48:00 +00:00
Tom Hughes
03ead3a59d Enable "destructive edit" warnings in Potlatch 2 2012-12-21 08:51:34 +00:00
Tom Hughes
1eda38f77b Update Potlatch 2 to 2.3-554-ge648197 build 2012-12-21 08:50:28 +00:00
Tom Hughes
8ca9f5a0d5 Potlatch 2 localisation updates 2012-12-21 08:49:39 +00:00
Siebrand Mazeland
b9d719cf6f Localisation updates from http://translatewiki.net. 2012-12-16 19:21:59 +00:00
Paweł Paprota
bdc536d126 Autofocus the search field on the index page 2012-12-13 19:16:41 +00:00
Tom Hughes
00548468ac Remove unused permalink styles 2012-12-13 19:12:07 +00:00
Siebrand Mazeland
780bf71fe5 Localisation updates from http://translatewiki.net. 2012-12-08 18:48:40 +00:00
Tom Hughes
ee530d8111 Don't try and add a note when the control is disabled 2012-12-04 14:31:08 +00:00
Tom Hughes
0d11ad7415 Style disabled permalinks appropriately 2012-12-04 14:29:42 +00:00
Tom Hughes
37bf8e2f6e Update Potlatch 2 to 2.3-547-g4a8c109 build 2012-12-03 14:58:44 +00:00
Tom Hughes
b4abc4ca17 Potlatch 2 localisation updates 2012-12-03 14:58:43 +00:00
Tom Hughes
31a031be26 Convert author_ip to a proper INET field 2012-12-03 14:50:55 +00:00
Tom Hughes
c533fb4b74 Display formatted notes in the web UI 2012-12-03 14:50:55 +00:00
Tom Hughes
2ddd667910 Return note comments as formatted HTML as well as text 2012-12-03 14:50:55 +00:00
Tom Hughes
c3cb1de73e Format note comments correctly in the data browser 2012-12-03 14:50:55 +00:00
Tom Hughes
dbc523bf34 Link user names to their pages 2012-12-03 14:50:54 +00:00
Tom Hughes
9477d7a65e Include a user URL in JSON and XML responses 2012-12-03 14:50:54 +00:00
Tom Hughes
ba5107ebb5 Remove the author_name field from notes 2012-12-03 14:50:54 +00:00
Tom Hughes
7ec003dd01 Abort any existing load before starting a new one 2012-12-02 15:04:19 +00:00
Tom Hughes
7f89545b2c Police the MAX_NOTE_REQUEST_AREA limit on the client 2012-12-02 14:55:56 +00:00
Tom Hughes
146e9877e5 Make sure popups don't overlay controls or the top bar 2012-12-02 14:14:17 +00:00
Tom Hughes
98475075c7 Add a scrollbar when a note gets too big 2012-12-02 14:14:16 +00:00
Tom Hughes
de78176e04 Rework notes UI using leaflet 2012-12-02 14:13:54 +00:00
Siebrand Mazeland
cd05e1892b Localisation updates from http://translatewiki.net. 2012-12-01 19:43:57 +00:00
Tom Hughes
78f608b114 Merge branch 'master' into notes 
Conflicts:
	app/assets/javascripts/browse.js
	app/assets/javascripts/map.js.erb
	app/assets/stylesheets/common.css.scss
	app/views/site/index.html.erb
 2012-12-01 18:22:30 +00:00
Tom Hughes
5fe5777a58 Move caching of reverse geocodes to describe_location 2012-12-01 18:18:10 +00:00
Kai Krueger
0a3aba7f89 Remove nearby_place from the note model 
Instead of storing the auto-generated meta information nearby_place
in the database, just look up the information on the fly when needed
and cache it for performance.
 2012-12-01 18:18:09 +00:00
Tom Hughes
9dfb2729ab Revert "Use Redcarpet::Render::XHTML instead of our custom renderer" 
This reverts commit 4bb95b3773.
 2012-11-29 22:22:22 +00:00
Tom Hughes
d3b2a12266 Don't try and compile the (non-existent) openlayers theme 2012-11-29 21:29:40 +00:00
Tom Hughes
4bb95b3773 Use Redcarpet::Render::XHTML instead of our custom renderer 
Now that my :link_attributes patch has been merged we don't need
the custom renderer to add the rel=nofollow attributes.
 2012-11-29 18:59:43 +00:00