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

4795 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
686ce8f3e5 Fix interpolation issues in attribution text 2012-09-13 09:56:26 +01:00
Tom Hughes
9e9c927658 Update Potlatch 2 to 2.3-455-g0b5f2c0 build 2012-09-12 16:26:45 +01:00
Grant Slater
6c8845d62f Use the HTML5 doctype and specify the character set explicitly 2012-09-12 16:26:39 +01:00
Tom Hughes
f954dd9e86 Fix incorrect heading in copyright page 2012-09-12 14:02:39 +01:00
Tom Hughes
fa2e6320a7 Update attribution on embedded maps 2012-09-12 10:02:01 +01:00
Tom Hughes
9d61bd797f Improve attribution/license details on printouts 2012-09-12 09:25:07 +01:00
Tom Hughes
03a8467a82 Remove some unused i18n resources 2012-09-12 09:15:01 +01:00
Tom Hughes
04ea0d4db9 Update some license references to refer to ODbL 2012-09-12 09:14:29 +01:00
Grant Slater
5d39a58b8b Switch from CC BY-SA 2.0 to ODbL 1.0 
Change of OSM license for after 12 September 2012 07:00 UTC.
 2012-09-12 08:52:10 +01:00
Richard Fairhurst
a302ddeb8a New /copyright page for ODbL 2012-09-12 08:37:09 +01:00
Grant Slater
2805118a60 Add CC BY-SA 2.0 copyright/attribution/license attributes to <osm> 2012-09-11 18:46:37 +01:00
Tom Hughes
94a54affcb Potlatch 2 imagery update 2012-09-09 19:07:30 +01:00
Tom Hughes
1b5455d0c0 Potlatch 2 localisation updates 2012-09-09 19:07:10 +01:00
Tom Hughes
7f95920380 Fix incorrect interpolation variables 2012-09-08 15:19:38 +01:00
Tom Hughes
3787918d68 Remove SOTM advert 2012-09-08 14:32:27 +01:00
Siebrand Mazeland
55f0402471 Localisation updates from http://translatewiki.net. 2012-09-08 11:56:40 +00:00
John Firebaugh
e338d11408 Move resize JS to application bundle 2012-09-07 13:05:25 -07:00
John Firebaugh
21273d4164 Eliminate interpolation in resize JS 2012-09-07 13:05:02 -07:00
John Firebaugh
7ff77d9d3d Trigger map.updateSize() via a custom event 2012-09-07 13:04:48 -07:00
Tom Hughes
b507f6c887 Make active highlighting work properly again 2012-09-07 09:40:05 +01:00
John Firebaugh
8ec415b060 Use a param to trigger export rather than a separate action 
In site/_resize.html.erb and site/_search.html.erb, a
params[:action] conditional is used to include code that
should only run on the index action -- but it should be run
on the export action too. Cleanest fix is to eliminate that
action entirely.
 2012-09-07 09:27:59 +01:00
Tom Hughes
6358f8190d Float the user image right in the global diary list 2012-09-06 22:03:15 +01:00
Tom Hughes
ec4ef1ad2b Remove controller_action class from the content div 
It's duplicated by the new controller-action class on the body
element, so just use that instead.
 2012-09-06 22:01:49 +01:00
Tom Hughes
800dbbf41b Use named routes in the layout 2012-09-06 21:49:02 +01:00
Tom Hughes
d76aa13ddd Use the jQuery data() function to access HTML 5 data attributes 2012-09-06 21:29:16 +01:00
Tom Hughes
7af04f8691 Move rich text support code into a separate file 2012-09-06 20:44:24 +01:00
Tom MacWright
02de53eb45 Refactor view and css code around homepage links 
This adds a new class to the body which we can use to do more styling
in CSS rather than erb-embedded Ruby. The only visual change is that
there's now a subtle transition for homepage links becoming active.
 2012-09-06 20:28:23 +01:00
Tom Hughes
7c0055b5d7 Move piwik code to a static JS asset 2012-09-06 09:02:51 +01:00
Tom Hughes
24453e7230 Issue piwik goal tracking calls correctly 2012-09-05 21:10:23 +01:00
Tom Hughes
adcf9edc54 Clear the openid URL when an account is deleted 2012-09-05 15:33:01 +01:00
Tom Hughes
b5e61565b9 Potlatch 2 localisation updates 2012-09-03 09:02:29 +01:00
Tom Hughes
3478c5b71f Update Potlatch 2 to 2.3-446-gf5ffc13 build 2012-09-03 09:01:38 +01:00
Tom Hughes
2fac41bf93 Fix incorrect interpolation variables 2012-09-03 08:54:23 +01:00
Tom Hughes
1eab17f82e Test that replying to a message marks it as read 2012-09-03 08:47:51 +01:00
Tom Hughes
021a17b79a Mark a message as read when a user replies via the web 2012-09-03 08:40:17 +01:00
Siebrand Mazeland
960ae1773c Localisation updates from http://translatewiki.net. 2012-09-01 11:28:06 +00:00
Tom Hughes
81336c4a87 Monkey patch I18n::JS to ensure translations are in a fixed order 
Without this the result of converting the hash to JSON can vary
which causes different hashes for the result JS asset.

This is only an issue with ruby 1.8 as ruby 1.9 hashes behave like
the ActiveSupport::OrderedHash and enumerate in insertion order.
 2012-08-31 11:51:58 +01:00
Tom Hughes
815c98c977 Select which key entries to show on the client 
Rather than requesting a new key every time the zoom or layer
changes, serve up all the entries initially with appropriate
annotations to allow the client to decide which ones to show.
 2012-08-31 10:29:32 +01:00
Tom Hughes
51f5984c1c Use CSS to centre the images in the key 2012-08-31 10:27:45 +01:00
Tom Hughes
721aaae777 Remove unused osmarender key data 2012-08-31 10:03:31 +01:00
Tom Hughes
a5f5dcce5d Remove unused osmarender key data 2012-08-31 09:30:44 +01:00
John Firebaugh
519c7dc2dd Move key JS to application bundle 2012-08-30 15:34:26 -07:00
John Firebaugh
e83fba2b47 Eliminate interpolation in key JS 2012-08-30 15:33:48 -07:00
Tom Hughes
d7da1562c3 Get rid of the sidebar's onclose global state 2012-08-30 23:02:54 +01:00
Tom MacWright
93c392cf5f Basic javascript cleanup 
Unifies some logic, cleans up style.
 2012-08-30 21:27:57 +01:00
John Firebaugh
d6a8aaa369 Move sidebar JS to application bundle 
It's required on the main page so will nearly always be loaded anyway.

Enclosed in an anonymous function to avoid leaking the onclose global.
 2012-08-30 20:30:11 +01:00
Tom Hughes
434e603cd6 Use custom events to resize the map on sidebar open/close 2012-08-30 20:27:11 +01:00
Tom Hughes
1e169bca25 Remove copy of Array.forEach that was committed accidentally 2012-08-30 19:17:11 +01:00
Tom Hughes
420ebbbb87 Fix maximisation of Potlatch 2012-08-29 15:37:26 +01:00
Tom Hughes
18238dd31e Prevent scrollbars showing up on the edit view 2012-08-29 15:36:51 +01:00