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

113 commits

Author SHA1 Message Date
Tom Hughes
dc2a2c8ebd Standardise on double quoted strings 2015-02-20 19:47:26 +00:00
Tom Hughes
5cbd4038ed Fix rubocop style issues 2015-02-20 08:56:16 +00:00
Tom Hughes
ef7f3d800c Fix most auto-correctable rubocop issues 2015-02-20 08:56:16 +00:00
Tom Hughes
96e1665c01 Update to rails 4.1.6 2014-10-02 19:54:21 +01:00
Tom Hughes
c9e9ef1a89 Rewrite layer parameters in shortlinks correctly 
Fixes #762
 2014-06-17 21:15:36 +01:00
Tom Hughes
5a830b2845 Don't force a login to use a remote editor 
Fixes #754
 2014-06-15 11:00:49 +01:00
Tom Hughes
47841829d8 Improve redirection of shortlinks 
If a shortlink includes an object reference then redirect to a new
style browse URL for that object.

Fixes #702
 2014-02-15 12:42:52 +00:00
Tom Hughes
04ad0f6251 Do basic testing of all site controller methods 2013-12-07 17:21:17 +00:00
Tom Hughes
a51b4c869e Use the map layout when rendering index for a remote edit 2013-12-05 10:40:07 +00:00
Tom Hughes
50fafa14f8 Improve zoom level selection when invoking Potlatch on an object 
When invoking Potlatch on a node/way/relation object we should
normally have valid location information in the map parameters, so
use any zoom which is there if possible, otherwise fall back to an
object type specific default value.

Fixes #605.
 2013-12-03 15:06:34 +00:00
Tom Hughes
315d1dab54 Redirect /?query= to /search?query= 2013-11-30 12:38:44 +00:00
John Firebaugh
2b4f8e92c9 Merge branch 'master' into redesign 
Conflicts:
	app/controllers/browse_controller.rb
	app/views/layouts/_head.html.erb
	config/environments/production.rb
	config/routes.rb
 2013-11-15 16:47:49 -08:00
Tom Hughes
559a822f59 Setup OAuth when rendering site#index from site#edit 2013-10-31 20:52:43 +00:00
John Firebaugh
3d4a137959 Don't rely on body classes so much 
Doesn't work well with pushState-based navigation.
 2013-10-13 14:46:08 -07:00
John Firebaugh
a56d1036d5 pushState based navigation between map-based layouts 2013-10-13 14:46:08 -07:00
John Firebaugh
4557654ba6 Simplify layouting 2013-10-13 14:46:07 -07:00
John Firebaugh
2f076d8f34 Fix "Edit" button when browsing features 2013-10-13 14:46:07 -07:00
John Firebaugh
3ebad9ec2f Add about page 2013-10-13 14:46:05 -07:00
John Firebaugh
e838dddf12 Redirect ?node=n and similar to browse pages 2013-10-13 14:45:58 -07:00
John Firebaugh
33a6b79bd7 Add help page 2013-10-13 14:45:57 -07:00
Tom Hughes
6494747882 Centre editors correctly when note=N is specified 2013-09-09 15:44:53 +01:00
Tom Hughes
ae0177fbe6 Merge remote-tracking branch 'osmlab/id-default' 2013-08-23 17:41:09 +01:00
John Firebaugh
8dc16bd8db Make iD default editor 
Make iD the default editor for all users that have not specified
a preferred editor, except fall back to P2 on IE.
 2013-08-15 16:36:18 -07:00
John Firebaugh
3ca642271a Redirect /edit and /export with old-style edit params 2013-08-12 13:34:46 -07:00
John Firebaugh
24422a3baf Move pre-sign up content to sign up page 2013-08-12 13:34:42 -07:00
John Firebaugh
e3aaa6dd4b Add welcome page based on http://osmlab.github.io/welcome-osm/ 2013-08-12 13:34:40 -07:00
John Firebaugh
452eabc941 Use full page width when editing with iD 2013-08-10 00:38:46 +01:00
Tom Hughes
99c48285df Redirect short links properly 2013-08-06 10:58:54 +01:00
John Firebaugh
6618cb9019 Include layers in hash 2013-07-30 15:41:41 -07:00
John Firebaugh
c8d4e4eee3 Redirect lat/lon/zoom query params to hash 2013-07-30 15:41:41 -07:00
Tom Hughes
6659fb9b33 Rename the ugly "id_iframe" to just plain "id" 2013-05-07 14:50:31 +01:00
Tom MacWright
7a98913d0c Add iD editor 
iD sources live in vendor/assets/iD, and are managed with
vendorer, using the "rewrite" functionality to replace relative
paths in the CSS with <%= asset_path(…) %> directives.

To avoid needing to namespace all of its CSS classes, iD
is embedded via an iframe.

To setup, edit application.yml to include an `id_key` key.
(It can use the same consumer key as P2 if you like.)
 2013-05-03 10:52:41 -07:00
Tom Hughes
e8d32637c1 Add javascript OAuth support 2013-03-28 00:34:09 +00:00
John Firebaugh
02bdc8f1ad Don't expose lat/lon of private traces 2012-09-21 15:29:02 -07:00
John Firebaugh
20e5f756be Support the same edit params for Potlatch 1 and 2 
Trac ticket 4587
 2012-09-21 15:16:56 -07:00
John Firebaugh
0509fc8d12 Move param-based map configuration to client 
This prepares us for hash-based permalinks (#81) and removes
the duplication between index.html.erb and SiteController#edit.
 2012-09-18 08:56:45 +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
561f2f694a Add preview functionality to rich text controls 2012-03-17 16:36:57 +00:00
Tom Hughes
ac48c6a16f Explicitly disable the layout for actions which don't want it 2012-02-15 17:48:17 +00:00
Tom Hughes
2b326acc32 Allow the copyright page to be requested in any locale 2012-02-14 11:54:22 +00:00
Peter Gray
95d899786a Refactor bounding box code 
Moved duplicated code into the BoundingBox class, and pass around
BoundingBox objects instead of lists of bounds.
 2011-11-14 09:42:57 +00:00
Tom Hughes
f242c9de94 Add edit links to data browser pages 2011-07-19 22:48:29 +01:00
Tom Hughes
42e72d5591 Make the edit action default to z17 
If an attempt is made to invoke an editor without specifying a zoom
level (as with the GPX edit links) then default to z17 instead of z14
to avoid trying to load too much data. Fixes #3728.
 2011-05-07 00:05:49 +01:00
Tom Hughes
aa4a8fdc81 Replace JOSM editing option with generic Remote Control option 2010-12-01 09:25:27 +00:00
Tom Hughes
409576eea0 Make launching of Potlatch 2 from the GPS trace list work 2010-11-30 17:11:49 +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
6c3b5aa9d4 Only Potlatch 1 needs a token to be created 2010-11-29 12:20:22 +00:00
Tom Hughes
c3453cf57d Make JOSM remote control based editing work 2010-11-29 12:20:22 +00:00
Matt Amos
cd66a5db99 Initial work on support for multiple editors 2010-11-29 12:20:21 +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