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

353 commits

Author SHA1 Message Date
Tom Hughes
250bb47cc2 Merge remote-tracking branch 'systemed/routing' 2015-02-16 08:30:29 +00:00
Tom Hughes
27179c8706 Wrap flash messages in a div instead of a paragraph 
This allows more complex HTML in the message, closing #896.
 2015-02-11 21:32:56 +00:00
Tom Hughes
44a0835487 Move routing "Go" button up alongside the dropdown 2015-02-01 12:58:08 +00:00
Matt Amos
7a44ae6cdc Use CSS rather than HTML attributes for styling. 2015-01-26 18:02:00 +00:00
Matt Amos
5afe47e3f6 Use larger 'spinner' when waiting for route request. Replace HTML in content to avoid resize. 2015-01-26 17:18:32 +00:00
Matt Amos
321218f9b1 Make close button on route dialogue return to index. 2015-01-26 15:02:55 +00:00
Dan Stowell
c99841536b Use 'close-box' appearance (less confusing) for exit-from-directions 2015-01-24 13:27:17 +00:00
Matt Amos
4734b9ce5d Added some vertical space in the routing text input boxes. 2014-11-10 19:36:43 +00:00
Matt Amos
3a9db4cf30 Use buttons for switching to/from directions. 
Previously, used a small text link which wasn't very usable. Now
it uses larger buttons which are (hopefully) more usable. Also
this sorts out the weird right-hanging text boxes for the to/from
in the directions sidebar - now they look like proper text input
boxes.

However, the "back to search" button and the directions submit
buttons are weirdly large and I don't quite understand why.
Hopefully an easy fix for someone who knows the arcana of CSS
better than I.
 2014-11-10 19:17:21 +00:00
Matt Amos
0cb475cc1a Merge remote-tracking branch 'upstream/master' into routing-merge 
Conflicts:
	app/assets/javascripts/index.js
	config/locales/en.yml
 2014-11-10 16:14:06 +00:00
Tom Hughes
f0ecc6312b Revert "Add SOTM advert" 
This reverts commit 15a7276a9f.
 2014-11-09 23:03:04 +00:00
Tom Hughes
08a0fc90e3 Track users in piwik 2014-11-09 22:41:01 +00:00
Matt Amos
a3eb48385b Merge remote-tracking branch 'upstream/master' into routing 
Conflicts:
	app/assets/javascripts/index.js
	app/assets/javascripts/leaflet.map.js.erb
	config/environments/production.rb
	config/locales/de.yml
 2014-11-03 11:08:13 +00:00
Tom Hughes
15a7276a9f Add SOTM advert 2014-09-04 15:25:56 +01:00
Tom Hughes
ace4da4f82 Move ICO favion into an IE conditional comment 2014-08-19 10:55:01 +01:00
John Firebaugh
f2bf38606e Permalinks for directions 2014-05-14 15:52:25 -07:00
John Firebaugh
18c7c4f5d7 Use unobtrusive JS for routing related events 2014-05-12 12:49:54 -07:00
John Firebaugh
be79156f43 OSM.Routing -> OSM.Directions 
Too close of a name collision to OSM.Router.
 2014-05-12 12:46:09 -07:00
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
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
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
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
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
57b05b22e3 Revert "Remove unused file" 
This reverts commit db41978f09.
 2013-12-07 16:34:23 +00:00
Tom Hughes
db41978f09 Remove unused file 2013-12-07 14:34:13 +00:00
Tom Hughes
70be43201a Make title of "More" menu translatable 2013-12-07 11:24:44 +00:00
Richard Fairhurst
640ff57465 Add 'x' to close welcome box; remember preference 2013-12-01 21:36:25 +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
John Firebaugh
6b236ec95b Fix feed link for pushState loaded history page 2013-11-25 15:47:42 -08:00
John Firebaugh
ca64b39e0d Make main page flash messages visible 2013-11-25 13:20:59 -08:00
John Firebaugh
b5825b2f64 Sign Up -> Start Mapping 2013-11-19 15:02:31 -08:00
John Firebaugh
bd21a1f7ff Eliminate loading flash for welcome overlay 2013-11-19 11:18:11 -08:00
John Firebaugh
e91956d0f7 Fix test failures 2013-11-19 10:30:18 -08:00
John Firebaugh
44629832dd Merge branch 'master' into redesign 
Conflicts:
	vendor/assets/leaflet/leaflet.hash.js
	vendor/assets/leaflet/leaflet.js
 2013-11-19 09:42:47 -08:00
Tom Hughes
214ff28cd9 Update to Leaflet 0.7 2013-11-18 17:43:46 +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
Aaron Lidman
74be05018b Don't render the user menu for users without ids, closed #68 2013-11-15 15:48:43 -08:00
John Firebaugh
b92cb5b772 Use html5shiv for IE8 compatibility 2013-11-15 10:46:56 -08:00
John Firebaugh
d920d94f69 Revert "Eliminate HTML5 elements" 
This led to a huge mess of conflicting CSS rule priorities.

This reverts commit 9fc8bc9368.
 2013-11-15 10:37:10 -08:00
John Firebaugh
e9c6e57bcc Eliminate HTML5 elements 
IE8, *sigh*
 2013-11-14 15:39:44 -08:00