From: John McKerrell Date: Sat, 5 May 2007 15:02:54 +0000 (+0000) Subject: Changed the account page to have the editing functionality built in. X-Git-Tag: live~9028 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/7c55604f272cdbcbec36ce3831ee9118e006eb2c Changed the account page to have the editing functionality built in. Ability to specify home location by clicking on a map. Ability to see nearby mappers on the map. New colourful markers. --- diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml index 77930d0b0..0f77aa29d 100644 --- a/app/views/user/account.rhtml +++ b/app/views/user/account.rhtml @@ -1,45 +1,182 @@

User details

+<%= error_messages_for 'user' %> +<%= start_form_tag :controller => 'user', :action => 'edit', :display_name => @user.display_name %> - - - - - - + + + + class="nohome" <%end%> > +
id<%= @user.id %>
email<%= @user.email %>
display name<%= @user.display_name %> (<%= link_to 'change...', :controller => 'user', :action => 'edit' %>)
account created<%= @user.creation_time %> (<%= time_ago_in_words(@user.creation_time) %> ago)
user homeLatitude: <%=@user.home_lat%> Longitude <%=@user.home_lon%> (<%= link_to 'change...', :controller => 'user', :action => 'edit' %>)
description<%= simple_format(@user.description) %> (<%= link_to 'change...', :controller => 'user', :action => 'edit' %>)
Email<%= @user.email %>
Mapper since<%= @user.creation_time %> (<%= time_ago_in_words(@user.creation_time) %> ago)
Display Name<%= text_field :user, :display_name, :value => @user.display_name %>
Your homeYou have not entered your home location.Latitude: <%= text_field :user, :home_lat, :value => @user.home_lat, :size => 20, :id => "home_lat" %> Longitude <%= text_field :user, :home_lon, :value => @user.home_lon, :size => 20, :id => "home_lon" %>
Description<%= text_area :user, :description, :value => @user.description, :class => "editDescription" %>
+<%= submit_tag 'Save Changes' %> +<%= end_form_tag %> -

Users in your area

+<% nearest_str = "" %> +<% if @user.home_lat and @user.home_lon %> +

Users in your area

-<% if @user.nearby.empty? %> -There are no users mapping in your area. Better go out and spread the word about OSM! + <% if @user.nearby.empty? %> + There are no users who admit to mapping in your area. Better go out and spread the word about OSM! + <% else %> + +

These users are mapping in your area:

+ + + + + + + <% @user.nearby(1,1).each do |nearby| %> + <% nearest_str = "nearest.push( { 'display_name' : '#{nearby.display_name}', 'home_lat' : #{nearby.home_lat}, 'home_lon' : #{nearby.home_lon} } )" %> + + + + + + + <%end%> +
EmailNameContact
<%= nearby.email %><%= nearby.display_name %><%= link_to 'send message', :controller => 'message', :action => 'new', :display_name => nearby.display_name %>
+ + <%end%> +
+<% end %> + + + + +
+

Click on the map to (re)set your location

+
+ +<% if @user.home_lat and @user.home_lon %> + <% marker = true %> + <% mlon = @user.home_lon %> + <% mlat = @user.home_lat %> + <% lon = @user.home_lon %> + <% lat = @user.home_lat %> + <% zoom = '14' %> + <% else %> + <% lon = params['lon'] || '-0.1' %> + <% lat = params['lat'] || '51.5' %> + <% zoom = params['zoom'] || '4' %> +<% end %> -

These users are mapping in your area:

- - - - - - -<% @user.nearby(1,1).each do |nearby| %> - - - - - - -<%end%> -
EmailNameContact
<%= nearby.email %><%= nearby.display_name %>FIXME: send user an email
-<%end%> -
-FIXME: OL Map showing the users on + + + + +

Privacy

<% if @user.data_public? %> All your edits are public. <% else %> - Currently your edits are ananymous and people can't find out where you are located. To show what you edited and allow people to contact you through the website, click the button below. This action cannot be reversed. + Currently your edits are anonymous and people can't find out where you are located. To show what you edited and allow people to contact you through the website, click the button below. This action cannot be reversed.

<%= start_form_tag :controller => 'user', :action => 'go_public'%> <%= submit_tag 'Make all my edits public, forever' %> diff --git a/public/javascripts/img/marker-blue.png b/public/javascripts/img/marker-blue.png new file mode 100644 index 000000000..0bac8c049 Binary files /dev/null and b/public/javascripts/img/marker-blue.png differ diff --git a/public/javascripts/img/marker-green.png b/public/javascripts/img/marker-green.png new file mode 100644 index 000000000..c91ccbe4a Binary files /dev/null and b/public/javascripts/img/marker-green.png differ diff --git a/public/javascripts/img/marker-yellow.png b/public/javascripts/img/marker-yellow.png new file mode 100644 index 000000000..724e2c030 Binary files /dev/null and b/public/javascripts/img/marker-yellow.png differ diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css index d1834fbce..061887c86 100644 --- a/public/stylesheets/site.css +++ b/public/stylesheets/site.css @@ -432,3 +432,31 @@ hides rule from IE5-Mac \*/ input { border: 1px solid black; } + +.nohome .location { + display: none; +} + +#homerow .message { + display: none; +} + +.nohome .message { + display: inline !important; +} + +.editDescription { + height : 10ex; + width : 30em; +} + +#map h3 { + position : absolute; + z-index : 10000; + background : white; + border : 1px solid black; + left : 50px; + top : 5px; + margin : 0px; + padding : 2px; +}