From: Steve Coast Date: Mon, 21 Jan 2008 17:15:33 +0000 (+0000) Subject: Show nearby users map in account view page X-Git-Tag: live~7935 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7dbc27fd672dc8649bf036334521aca4413ff09e Show nearby users map in account view page --- diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index a9b91098f..f279edd80 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -105,9 +105,9 @@ class UserController < ApplicationController def login @title = 'login' if params[:user] - email = params[:user][:email] + email_or_display_name = params[:user][:email] pass = params[:user][:password] - user = User.authenticate(:username => email, :password => pass) + user = User.authenticate(:username => email_or_display_name, :password => pass) if user session[:user] = user.id if params[:referer] @@ -116,7 +116,7 @@ class UserController < ApplicationController redirect_to :controller => 'site', :action => 'index' end return - elsif User.authenticate(:username => email, :password => pass, :invalid => true) + elsif User.authenticate(:username => email_or_display_name, :password => pass, :invalid => true) flash[:notice] = "Sorry, your account is not active yet.
Please click on the link in the account confirmation email to activate your account." else flash[:notice] = "Sorry, couldn't log in with those details." diff --git a/app/views/user/_friend_map.rhtml b/app/views/user/_friend_map.rhtml new file mode 100644 index 000000000..05589ac09 --- /dev/null +++ b/app/views/user/_friend_map.rhtml @@ -0,0 +1,85 @@ +<% nearest_str = "" %> +<% if !@user.home_lat.nil? and !@user.home_lon.nil? %> + <% if !@user.nearby.empty? %> + <% @user.nearby.each do |nearby| %> + <% nearest_str += "nearest.push( { 'display_name' : '#{nearby.display_name}', 'home_lat' : #{nearby.home_lat}, 'home_lon' : #{nearby.home_lon} } );\n" %> + <% end %> + <% end %> +<% end %> + + +<% if @user.home_lat.nil? or @user.home_lon.nil? %> + <% lon = h(params['lon'] || '-0.1') %> + <% lat = h(params['lat'] || '51.5') %> + <% zoom = h(params['zoom'] || '4') %> +<% else %> + <% marker = true %> + <% mlon = @user.home_lon %> + <% mlat = @user.home_lat %> + <% lon = @user.home_lon %> + <% lat = @user.home_lat %> + <% zoom = '12' %> +<% end %> + +<%= javascript_include_tag '/openlayers/OpenLayers.js' %> +<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %> +<%= javascript_include_tag 'map.js' %> + + + + diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml index c5312686a..207043ba3 100644 --- a/app/views/user/account.rhtml +++ b/app/views/user/account.rhtml @@ -20,89 +20,7 @@ <%= submit_tag 'Save Changes' %> <% end %> -<% nearest_str = "" %> -<% if !@user.home_lat.nil? and !@user.home_lon.nil? %> - <% if !@user.nearby.empty? %> - <% @user.nearby.each do |nearby| %> - <% nearest_str += "nearest.push( { 'display_name' : '#{nearby.display_name}', 'home_lat' : #{nearby.home_lat}, 'home_lon' : #{nearby.home_lon} } );\n" %> - <% end %> - <% end %> -<% end %> - - -<% if @user.home_lat.nil? or @user.home_lon.nil? %> - <% lon = h(params['lon'] || '-0.1') %> - <% lat = h(params['lat'] || '51.5') %> - <% zoom = h(params['zoom'] || '4') %> -<% else %> - <% marker = true %> - <% mlon = @user.home_lon %> - <% mlat = @user.home_lat %> - <% lon = @user.home_lon %> - <% lat = @user.home_lat %> - <% zoom = '12' %> -<% end %> - -<%= javascript_include_tag '/openlayers/OpenLayers.js' %> -<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %> -<%= javascript_include_tag 'map.js' %> - - +<%= render :partial => 'friend_map' %>

Public editing

<% if @user.data_public? %> diff --git a/app/views/user/login.rhtml b/app/views/user/login.rhtml index 5c6ec3ec5..ff988f070 100644 --- a/app/views/user/login.rhtml +++ b/app/views/user/login.rhtml @@ -4,7 +4,7 @@ Please login or <%= link_to 'create an account', :controller => 'user', :action <% form_tag :action => 'login' do %> <%= hidden_field_tag('referer', h(params[:referer])) %> - +
Email Address:<%= text_field('user', 'email',{:size => 50, :maxlength => 255}) %>
Email Address or username:<%= text_field('user', 'email',{:size => 50, :maxlength => 255}) %>
Password:<%= password_field('user', 'password',{:size => 50, :maxlength => 255}) %>
diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml index a96fd5b19..f9448da83 100644 --- a/app/views/user/view.rhtml +++ b/app/views/user/view.rhtml @@ -29,7 +29,7 @@ <% else %> <% if @user and @this_user.id == @user.id %> - Your friends:
+

Your friends

<% if @this_user.friends.empty? %> You have not added any friends yet. <% else %> @@ -47,10 +47,14 @@
<%end%> - Nearby users:
+

Nearby users:

<% if @this_user.nearby.empty? %> There are no users who admit to mapping nearby yet. <% else %> + + +
+ <%= render :partial => 'friend_map' %> <% @this_user.nearby.each do |nearby| %>