Commit graph

1859 commits

Author SHA1 Message Date
Tom Hughes
b095b59d5e Merge remote-tracking branch 'origin/master' into routing
Conflicts:
	app/views/layouts/_search.html.erb
2014-03-08 17:44:22 +00:00
Richard Fairhurst
902f1b0887 Add spinner while awaiting route 2014-03-08 11:14:48 +00:00
Tom Hughes
8c82be0537 Make the search form a GET form with no extra fields
We only accept GET requests for the search, and although the form is
never normally submitted directly some browsers offer an option to
create a bookmark from a form, so make that work.
2014-03-07 19:18:24 +00:00
Tom Hughes
d1313a89d6 Uniqify lists of containing ways/relations
Fixes #707
2014-02-23 00:08:51 +00:00
Tom Hughes
c02fa94d5e Fixed missing translation 2014-02-17 20:10:29 +00:00
Tom Hughes
f9ae6d252f Drop the slim layout
The slim layout is not really needed since the redesign as the
pages it was used for in the OAuth flow now have less chrome and
work fine on small screens with the normal layout.

Fixes #689
2014-02-16 16:03:00 +00:00
Tom Hughes
25b93471c1 Preserve message details over validation errors
If a validation error occurs while saving a message then make
sure the values are preserved in the new form.
2014-02-04 22:31:44 +00:00
Kai Krueger
3eaf58c151 Make more of the javascript routing functions internationalizable 2014-02-01 21:10:54 -07:00
Richard Fairhurst
edd6235b45 More work on draggable markers 2014-01-23 10:26:04 +00:00
Richard Fairhurst
08837b2f8b Start work on drag-and-drop start/end markers 2014-01-23 00:49:00 +00:00
Richard Fairhurst
40ad8c7def Start work on second engine 2014-01-21 23:47:50 +00:00
Richard Fairhurst
ad01a61b6d Query options presentation 2014-01-21 20:57:55 +00:00
Richard Fairhurst
2198b6ebbf Beginning of JavaScript-only routing UI 2014-01-21 13:29:05 +00:00
Simon Poole
a24f52dec7 Add a landing page for "fix the map / report a problem" links 2014-01-19 13:48:27 +00:00
Tom Hughes
41d02225d2 Add details for Finland to copyright page 2013-12-19 17:30:15 +00:00
Tom Hughes
dd12e1de63 Restore the duplicate search form in the header
It turns out the duplicate form is used, for the the mobile view.
2013-12-16 09:39:54 +00:00
Tom Hughes
6ff6b2f527 Change "My Inbox" to "My Messages" in user menu
Fixes #661
2013-12-15 22:41:57 +00:00
Martin Raifer
ea5183cd18 Fix typo in diary form html 2013-12-12 09:59:15 +00:00
Tom Hughes
92d7a9f3fd Make rich text edit controls use as much space as possible
Use CSS3 calculations to set the width of a rich text edit control
to the maximum possible while still allowing space for the help.

Also set the subject/title fields to the same width.

Fixes #657
2013-12-12 09:04:46 +00:00
Tom Hughes
9cc9a00988 Restore autofocusing of the search field
Use the HTML5 autofocus attribute, and focus on load for browsers
which don't support it.

Also change the removal of the "Where am I?" prompt to happen on
input rather than when the field is focused, so that it is properly
removed and restored when the field has been autofocused.

Fixes https://trac.openstreetmap.org/ticket/5065
2013-12-10 19:45:28 +00:00
Tom Hughes
c2c817ad1f Remove duplicate (hidden) search box from header 2013-12-10 18:52:49 +00:00
Tom Hughes
5c53bb78ab Don't linkify comments in the changeset list
It's confusing to make links in comments active in the changeset list
as the rest of the comment is an active link to the changeset.

We do want to make them active in the changeset view however, so add
linkification to the comment there.

Fixes https://trac.openstreetmap.org/ticket/5061
2013-12-08 13:11:48 +00:00
Tom Hughes
5d6a47929c Don't show lat/lon for a deleted node, in case it is redacted
Fixes #642
2013-12-08 11:27:29 +00:00
Tom Hughes
4395ed6117 Fix untranslatable string 2013-12-08 11:02:43 +00:00
Tom Hughes
57b05b22e3 Revert "Remove unused file"
This reverts commit db41978f09.
2013-12-07 16:34:23 +00:00
Tom Hughes
4755096a72 Add link to per-user RSS feed on diary view page 2013-12-07 15:07:25 +00:00
Roland Olbricht
83b3db9974 Improve display of alternative download sources
Makes the list of alternative sources displayed all the time
rather than just when the bounding box is too large, and adds
the Overpass API to the list of sources.

Fixes #606
Fixed #635
2013-12-07 14:56:47 +00:00
Tom Hughes
db41978f09 Remove unused file 2013-12-07 14:34:13 +00:00
Tom Hughes
ab3c8a2d04 Put all feed discovery tags in the auto_discovery_link_tag section 2013-12-07 14:33:52 +00:00
Tom Hughes
512c02b364 Diary and trace feeds are RSS not Atom
Fixes #638
2013-12-07 14:31:59 +00:00
Tom Hughes
70be43201a Make title of "More" menu translatable 2013-12-07 11:24:44 +00:00
John Firebaugh
e05adbb917 Obey the location hash for edit URLs with objects
For a link like http://osm.org/edit?node=n#map=19/37.77683/-122.41459,
select the feature but also respect the map location.

This is the fix for iD. It appears P2 requires internal code
modifications.

Refs #620
2013-12-06 00:21:50 +00:00
Tom Hughes
7a35004389 Always use controller computed zoom when starting Potlatch
The value of mapParams.zoom may have come from the cookie and be
unrelated to the actual view the user came from with this click, so
just use the default zoom set by the controller.

Fixes #621.
2013-12-05 09:48:53 +00:00
Tom Hughes
7318ee4b93 The value of mapParams.object is always a node/way/relation now 2013-12-05 09:47:22 +00:00
John Firebaugh
a6fb1ead5b Use a table for tags
Fixes #595
2013-12-03 22:33:07 +00:00
Tom Hughes
5642cf696e Fix UCL link 2013-12-03 18:16:22 +00:00
Tom Hughes
ecf3bdf2af Remove unused code for handling search results in Potlatch 2013-12-03 15:14:59 +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
16a72d93de Don't show "Load More" if we found less than 20 changesets 2013-12-02 19:39:56 +00:00
Tom Hughes
d5a765588f Fix URL updating in Potlatch 1
Potlatch 1 has hard coded calls to updatelinks, so rename the
updatelinks function to updateLinks and add an updatelinks function
using the old style argument list for Potlatch 1 to call.
2013-12-01 22:37:04 +00:00
Richard Fairhurst
640ff57465 Add 'x' to close welcome box; remember preference 2013-12-01 21:36:25 +00:00
RM87
61fc15aee1 Remove spurious < character as reported in #508 2013-11-30 16:09:47 +00:00
Tom Hughes
a9f4549327 Tidy up the OAuth authorization screens
Make sure all messages are translatable, separate errors from
user initiated denial of authorization.
2013-11-30 12:25:22 +00:00
Tom Hughes
bfd11bf79a Change "Copyright & License" to "Copyright" and move it left 2013-11-30 10:51:43 +00:00
Paul Norman
a768e7111c Restore Copyright & License link
The copyright and license is an important part of OpenStreetMap.
This restores the copyright & license link to the menu, placing
it in the top-right with the other pages which do not display a map.

Fixes #548

Fixes comments in https://github.com/openstreetmap/openstreetmap-website/pull/498#issuecomment-26741518
2013-11-30 10:36:14 +00:00
Tom Hughes
68a3df4d53 Merge branch 'redesign'
Conflicts:
	app/assets/stylesheets/common.css.scss
2013-11-28 17:30:53 +00:00
John Firebaugh
6b236ec95b Fix feed link for pushState loaded history page 2013-11-25 15:47:42 -08:00
Tom Hughes
51ade94113 Drop max_id from the changeset feed URL 2013-11-25 22:28:02 +00:00
John Firebaugh
ca64b39e0d Make main page flash messages visible 2013-11-25 13:20:59 -08:00
Tom Hughes
43f52daeaa Remove unused partials 2013-11-25 00:51:53 +00:00