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

44 commits

Author SHA1 Message Date
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
Tom Hughes
8cdd6b6a1c Improve the user image selection UI 2012-10-18 18:59:39 +01:00
Paweł Paprota
ad43499205 Implemented Gravatar support 2012-10-18 18:59:38 +01:00
John Firebaugh
237d2ad60d Simplify further by using OSM.home 2012-10-05 22:37:21 +01:00
John Firebaugh
d9d515bf18 Remove unused params code 2012-10-05 22:32:50 +01:00
John Firebaugh
dd1ec4eb9b Move user JS to page-specific script file 
In this case it was difficult to eliminate interpolation
in a separate step, so I didn't bother.
 2012-10-05 22:24:41 +01:00
Tom MacWright
221ca3c1fa Improve user page navigation menu 
Add counts to edits, blocks, and traces; don't show blocks if there
are none; and move OAuth to the settings page.
 2012-08-10 08:26:48 +01:00
Tom Hughes
561f2f694a Add preview functionality to rich text controls 2012-03-17 16:36:57 +00:00
Tom Hughes
c6710bba54 Fix incorrect link generation that relied on default routes 2012-03-11 00:12:18 +00:00
Tom Hughes
e70396d70b Replace the file_column plugin with paperclip 2012-02-15 17:48:15 +00:00
Tom Hughes
63ca466f24 Use jQuery syntax instead of Prototype syntax 2012-01-23 21:28:01 +00:00
Tom Hughes
0033fcbf12 Don't escape HTML in the message shown to anonymous users 2011-11-22 22:53:31 +00:00
Tom Hughes
d70fd8ab1a Use HTML5 email and url field types where appropriate 2011-11-14 09:42:57 +00:00
Tom Hughes
b25a468e3c Use <%= instead of <% for block helpers that use concat 2011-11-14 09:42:41 +00:00
Tom Hughes
aca299ecee Move more styling into CSS and make it support RTL layout 2011-07-02 11:22:19 +01:00
Tom Hughes
d075fc4c1f Lots more work on making RTL layout work 2011-07-02 01:00:51 +01:00
Tom Hughes
347c12b5ea Make sure the ID of OpenID URL fields is openid_url 2011-06-15 14:26:58 +01:00
Tom Hughes
832b96b75a Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/terms.html.erb
	test/fixtures/users.yml
 2011-05-21 12:14:56 +01:00
Harry Wood
41589b6ef9 fixes http://trac.openstreetmap.org/ticket/3645 . Can now pass in show_other_users and setting_location to the map partial 2011-04-03 15:43:41 +01:00
Tom Hughes
0ea9f92be5 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-12-05 15:15:55 +00:00
Tom Hughes
9c2de4039c Add an explicit "default editor" option to the user settings 2010-11-29 12:20:23 +00:00
Matt Amos
cd66a5db99 Initial work on support for multiple editors 2010-11-29 12:20:21 +00:00
Tom Hughes
dd7ef37ec0 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/terms.html.erb
	config/locales/en.yml
 2010-09-06 12:49:10 +01:00
Tom Hughes
a99b516962 Allow existing users to voluntarily sign up for the contributor terms 
Based on a patch from Frederik Ramm this change allows users to make a
voluntary decision to sign up for the new contributor terms.
 2010-08-10 18:08:11 +01:00
Tom Hughes
6ba75a3bb0 Mark OpenID "what is this?" prompt as a minor note 2010-05-10 14:21:22 +01:00
Kai Krueger
6159b48b8f Remove a superfluous styling 2010-05-01 17:55:16 +01:00
Kai Krueger
058217bc69 Add the OpenID logo to all openid url entry textfields for clarity 2010-05-01 11:25:47 +01:00
Ævar Arnfjörð Bjarmason
19c5f8aeaa M-x untabify the OpenID branch 2010-04-20 23:47:23 +00:00
Tom Hughes
d36fab2913 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/login.html.erb
	config/locales/en.yml
 2010-04-20 00:41:03 +01:00
Tom Hughes
d6d0a2b1a6 Disable autocompletion for the password fields on the settings page. 2010-03-20 00:01:57 +00:00
Tom Hughes
ed0375ec89 Use the small PanZoom control on the user map instead of the 
full PanZoomBar control.
 2010-03-11 18:29:35 +00:00
Tom Hughes
77a3d8d24e Move image size hint to avoid issues with LTR languages. Closes #2755. 2010-03-01 12:12:02 +00:00
Tom Hughes
6758efb10f Add a note to the user image upload suggesting an appropriate size. 2010-02-28 08:55:01 +00:00
Tom Hughes
acd72861ed Rework the user details screen to be less crap... Highlights include: 
- Map is smaller and placed to the side with lists of friends
    and nearby users (now excluding friends) beside it.

  - Map includes friends as well as nearby users.

  - Friend and nearby user lists include photos and links to
    friend/unfriend as appropriate.

  - OAuth settings link moved up with all the other links in the
    main navigation bar.

The addition of friends to the map also carries through to the user
settings page.
 2010-02-27 18:11:04 +00:00
Kai Krueger
bbf30e76e4 merge 19889:20181 of rails_port into the openID branch 
merge conflicts with the remember_me functionality
 2010-02-27 11:21:15 +00:00
Tom Hughes
696aa8b5a8 Remote the user settings page to make it a bit more readable. 2010-02-27 00:12:16 +00:00
Tom Hughes
c55490d24e Move support for adding and deleting user images to the user settings 
page and reposition the user image ont he user page in the top right
corner of the page.
 2010-02-26 23:44:43 +00:00
Tom Hughes
846699104d Display the current email address and any pending new email address 
separately on the user settings page.
 2010-02-09 11:54:40 +00:00
Kai Krueger
ca558c692e This is the initial implementation of login via OpenID 
This is the patch presented in trac ticket #2500

With this commit, it is possible to assosciate an openID
to an existing OSM account. Once associated, it is possible
to either login via OpenID, or as always via username and password.

Other aspects, such as account creation and the need for a valid email
are unchanged.
 2010-01-10 17:41:32 +00:00
Ævar Arnfjörð Bjarmason
2d7fa37bd2 Make messages relating to public editing translatable 2009-10-30 17:41:22 +00:00
Ævar Arnfjörð Bjarmason
501adefb3b stop referencing a non-existant translation 2009-10-30 17:28:27 +00:00
Matt Amos
655dc6787e Reorganised OAuth clients and tokens details page. Made clients info editable and some more stuff translatable in the OAuth pages. 2009-08-03 17:08:40 +00:00
Matt Amos
b8f6dbd403 Adding initial version of the OAuth token authentication method. This adds basic OAuth support for registering apps, getting and revoking keys, etc... The tokens come with 6 separate permissions bits; read/write user preferences, write diaries, write API and read/write GPS traces. Needs more tests. 2009-06-22 16:54:37 +00:00
Tom Hughes
2e2f212472 Rename views to rails 2 style names. 2009-06-09 20:50:14 +00:00
Renamed from app/views/user/account.rhtml (Browse further)