From 7c55604f272cdbcbec36ce3831ee9118e006eb2c Mon Sep 17 00:00:00 2001 From: John McKerrell Date: Sat, 5 May 2007 15:02:54 +0000 Subject: [PATCH] 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. --- app/views/user/account.rhtml | 195 +++++++++++++++++++---- public/javascripts/img/marker-blue.png | Bin 0 -> 845 bytes public/javascripts/img/marker-green.png | Bin 0 -> 870 bytes public/javascripts/img/marker-yellow.png | Bin 0 -> 745 bytes public/stylesheets/site.css | 28 ++++ 5 files changed, 194 insertions(+), 29 deletions(-) create mode 100644 public/javascripts/img/marker-blue.png create mode 100644 public/javascripts/img/marker-green.png create mode 100644 public/javascripts/img/marker-yellow.png 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 0000000000000000000000000000000000000000..0bac8c049d53146505f1ab4ca9ecf98be5f6abba GIT binary patch literal 845 zcmV-T1G4;yP)X1^@s6-qmI800004XF*Lt007q5 z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!-$_J4RCwB~ zmD@{HQ543%bI#~Aqv;50Xb9qi5@}|jq?TQL3?T@5EK>-)yp#mlK+%Iz{RKsZFZrZK z7(Vo35us!#M3U){qLnEl-sa{^bI$IYi!$RJn^F5qt?Bg0ph8DI}; zq%0t}*@GHy2)NlQ=LOQMT~N|SX_u!rUkXElk|@Z=c1T7mj=V4?}#k2!uL-+55hj2^r^r6GK2jCwK?|Ls~3!=B|%B>?dbI?$k>ggWuO+DZy zV5gdz#T0X*Vj{Yp7CqNk&Ax2@<*u(27MokJoN;aetCt0VJU%Gf^BqMcK}r3Il7SF3 zr_sayv;ALuzy%odoG2R-bjNDo?%FprXr!clKvFhKl~n&X1^@s6-qmI800004XF*Lt007q5 z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!_(?=TRCwB~ zm0L*DQ5?s=|831}=8ejz=;nh`LDoYMQc)T75P}hfy`))0US7@b%R4?_=LsxuB z3e*s5f?c#klx~v(uD^y-@!A-emZ!j4_z9wv)5o7c=;B}}yqxRmP~+{qv!ONt!5>sH0#!`~ZfO z3@A$YfYvMUw3Nf?u_K#|$BIz$5~E^KyDS;ovg)ujW(~q>=ne2F6Lz-^)ov^D$a2g< z2~4M-s?&-Qy|)xvNsWj_7oa{Dj?ax4aZe(Hyl#p9GA_}>m{kw``aQ}UM>>J8uYk?R zfS6UvHXW4^4Fz!dJSb9m-LM!|!nba>vaz`txR(aJxCGoxo<5n9wx5KQxCOE=SE%@N z*Y+LekChNg#=W(G$H`%*uV`&*AFwj0GVFX9M?-1+J?UyO0o_EQRVO zBV562KwS=lX1^@s6-qmI800004XF*Lt007q5 z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!dr3q=RCwB~ zl}l(7Q51&%Oq*y@W2?47#DZYajgJaie4&dj#f@DHVnw88rL_3!MrgsEpbN!EEm(rm zf<(I!EL6n@J`hwQN(s_h(uYx-nMuajx&AY8APJc~rXDy9GdbtWx&OKMTnHgh%4wUb ztI@~jva;e!1rT=J=Y!I^2fz88A$YfAD6P)#$ME_lBtF09r#Qs@5JasXD&al+y{aN8 zZF`Lmv5s~mwO9sd`Q#^vT`f?S`tgQwjU}Np*CG$jFhL22a$(s%KMT=w4rx}LV9o(s zC@nzPlda82Onk5hX8VhW5Gw;vDAO(Gdvl<)R{m?eyA#@<>GFV<|N08iwjb(}8brz2 zVDda3oHfKBePEyXZWQ8TZ$?kMn46cOd%Z}y-8g1cd30S9WZfosBn-h-n9gd<%Iv_D zP9?NkBJ^5p3emm+m^$R!P#8$2096GfMvpv3K^tV;moa=xr_pO^+EP~wWp3PAr84vC zS3n_WM^5+I!Mi7e(41&`q5~TH5-PN%R#9kW>}_S;|M=Wo#T@hNEtX_y!k0;X9v6aL zP*H&$4nm=hrM#GHeGJab= zL&{$cKMu`&N91Zh^kU0CeIA;wW03K$PykY>+RfYz>W`@X3H#Tax9FmbMH>b7BEgZj9E+I7RPrK%}p65 zhVNvc?FW(M`}GB1e6)Ryt06z*K&Bi&jk{~XP{X<8r-25fTrM2?FITj+#i;K