<%= raw t("oauth.oauthorize.request_access", :app_name => link_to(@token.client_application.name, @token.client_application.url), :user => link_to(@user.display_name, :controller => :user, :action => :view, :display_name => @user.display_name)) %>

<%= raw t("oauth.oauthorize.request_access", :app_name => link_to(@token.client_application.name, @token.client_application.url), :user => link_to(current_user.display_name, :controller => :user, :action => :view, :display_name => current_user.display_name)) %>

+<% if current_user and current_user.moderator? %> +

<%= button_to t('redaction.show.edit'), edit_redaction_path(@redaction), :method => :get %> <%= button_to t('redaction.show.destroy'), @redaction, :method => "delete", :remote => true, :data => { :confirm => t('redaction.show.confirm') } %>

diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb index b0d20a9ae..5b59f5f24 100644 --- a/app/views/site/_potlatch.html.erb +++ b/app/views/site/_potlatch.html.erb @@ -1,7 +1,7 @@ <%= javascript_include_tag "edit/potlatch" %>

- <% session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) -%> + <% session[:token] = current_user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) -%> <% data = { :token => session[:token] } -%> <% data[:lat] = @lat if @lat -%> <% data[:lon] = @lon if @lon -%> diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb index 2cc4ab2d5..9e01eef30 100644 --- a/app/views/site/_potlatch2.html.erb +++ b/app/views/site/_potlatch2.html.erb @@ -1,13 +1,13 @@ <%= javascript_include_tag "edit/potlatch2" %>

- <% session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) -%> + <% session[:token] = current_user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) -%> <% data = { :token => session[:token] } -%> <% data[:lat] = @lat if @lat -%> <% data[:lon] = @lon if @lon -%> <% data[:zoom] = @zoom if @zoom -%> <% if defined? POTLATCH2_KEY %> - <% token = @user.access_token(POTLATCH2_KEY) %> + <% token = current_user.access_token(POTLATCH2_KEY) %> <% data[:token] = token.token -%> <% data[:token_secret] = token.secret -%> <% data[:consumer_key] = token.client_application.key -%> diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb index ae313e1f2..81095140e 100644 --- a/app/views/site/edit.html.erb +++ b/app/views/site/edit.html.erb @@ -3,9 +3,9 @@

<%= t 'layouts.osm_offline' %>

<% elsif STATUS == :database_readonly or STATUS == :api_readonly %>

<%= t 'layouts.osm_read_only' %>

- <% elsif !@user.data_public? %> + <% elsif !current_user.data_public? %>

<%= t 'site.edit.not_public' %>

<%= raw t 'site.edit.not_public_description', :user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}) %>

<%= raw t 'site.edit.not_public_description', :user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => current_user.display_name, :anchor => 'public'}) %>

<%= raw t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %>

<% else %> <%= render :partial => preferred_editor %> diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb index 5097dd340..dff2108ca 100644 --- a/app/views/site/help.html.erb +++ b/app/views/site/help.html.erb @@ -5,7 +5,7 @@

<%= t "help_page.introduction" %>

<% ['welcome', 'beginners_guide', 'help', 'mailing_lists', 'forums', 'irc', 'switch2osm', 'wiki'].each do |site| %> - <% unless site == 'welcome' && !@user %> + <% unless site == 'welcome' && !current_user %>

diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb index a38a81534..c115ea59f 100644 --- a/app/views/site/id.html.erb +++ b/app/views/site/id.html.erb @@ -10,7 +10,7 @@ <% data = {} -%> <% if defined? ID_KEY %> -<% token = @user.access_token(ID_KEY) %> +<% token = current_user.access_token(ID_KEY) %> <% data[:token] = token.token -%> <% data[:token_secret] = token.secret -%> <% data[:consumer_key] = token.client_application.key -%> diff --git a/app/views/user/_contact.html.erb b/app/views/user/_contact.html.erb index 4811389f1..08b982cd7 100644 --- a/app/views/user/_contact.html.erb +++ b/app/views/user/_contact.html.erb @@ -37,7 +37,7 @@

<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => contact.display_name %>

- <% if @user.is_friends_with?(contact) %> + <% if current_user.is_friends_with?(contact) %> <%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> <% else %> <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index 47a84e99b..ab74e3780 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -5,7 +5,7 @@ <% content_for :heading do %>
<%= t 'user.account.my settings' %>

-
<%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => @user.display_name %>
+
<%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => current_user.display_name %>

<%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %>

<% end %> @@ -22,7 +22,7 @@

<%= t 'user.account.current email address' %> - + <%= t 'user.account.email never displayed publicly' %>
@@ -58,7 +58,7 @@
<%= t 'user.account.public editing.heading' %> - <% if @user.data_public? %> + <% if current_user.data_public? %> <%= t 'user.account.public editing.enabled' %> (<%= t 'user.account.public editing.enabled link text' %>) <% else %> @@ -71,10 +71,10 @@
<%= t 'user.account.contributor terms.heading' %> - <% if @user.terms_agreed? %> + <% if current_user.terms_agreed? %> <%= t 'user.account.contributor terms.agreed' %> (<%= t 'user.account.contributor terms.link text' %>) - <% if @user.consider_pd? %> + <% if current_user.consider_pd? %> <%= t 'user.account.contributor terms.agreed_with_pd' %> <% end %> <% else %> @@ -102,21 +102,21 @@
<%= t 'user.account.image' %> - <%= user_image @user %> + <%= user_image current_user %>
- <% if @user.image.file? %> + <% if current_user.image.file? %>
- <%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %> + <%= radio_button_tag "image_action", "keep", !current_user.image_use_gravatar %> <%= t 'user.account.keep image' %>
<% end %> - <% if @user.image.file? || @user.image_use_gravatar? %> + <% if current_user.image.file? || current_user.image_use_gravatar? %>
<%= radio_button_tag "image_action", "delete" %> <%= t 'user.account.delete image' %>
<% end %> - <% if @user.image.file? %> + <% if current_user.image.file? %>
<%= radio_button_tag "image_action", "new" %> @@ -136,7 +136,7 @@
<% end %>
- <%= radio_button_tag "image_action", "gravatar", @user.image_use_gravatar %> + <%= radio_button_tag "image_action", "gravatar", current_user.image_use_gravatar %> <%= t 'user.account.gravatar.gravatar' %> (<%= t 'user.account.gravatar.link text' %>) @@ -149,7 +149,7 @@

<%= t 'user.account.home location' %> -
class="nohome"<%end%> > +
class="nohome"<%end%> >
<%= t 'user.account.no home location' %>

<%= t 'user.account.latitude' %> @@ -163,7 +163,7 @@

- checked="checked" <% end %> id="updatehome" /> + checked="checked" <% end %> id="updatehome" /> <%= t 'user.account.update home location on click' %>
<%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %> @@ -172,7 +172,7 @@ <%= submit_tag t('user.account.save changes button') %> <% end %> -<% unless @user.data_public? %> +<% unless current_user.data_public? %>
<%= t 'user.account.public editing note.heading' %>
<%= raw t 'user.account.public editing note.text' %> diff --git a/app/views/user/api_read.builder b/app/views/user/api_read.builder index 7136b9f58..0e8bfa5ef 100644 --- a/app/views/user/api_read.builder +++ b/app/views/user/api_read.builder @@ -4,7 +4,7 @@ xml.osm("version" => API_VERSION, "generator" => GENERATOR) do :display_name => @this_user.display_name, :account_created => @this_user.creation_time.xmlschema do xml.tag! "description", @this_user.description if @this_user.description - if @user && @user == @this_user + if current_user && current_user == @this_user xml.tag! "contributor-terms", :agreed => @this_user.terms_agreed.present?, :pd => @this_user.consider_pd else @@ -28,7 +28,7 @@ xml.osm("version" => API_VERSION, "generator" => GENERATOR) do :active => @this_user.blocks_created.active.size end end - if @user && @user == @this_user + if current_user && current_user == @this_user if @this_user.home_lat && @this_user.home_lon xml.tag! "home", :lat => @this_user.home_lat, :lon => @this_user.home_lon, diff --git a/app/views/user/reset_password.html.erb b/app/views/user/reset_password.html.erb index d1718a5e4..4cb94374a 100644 --- a/app/views/user/reset_password.html.erb +++ b/app/views/user/reset_password.html.erb @@ -1,5 +1,5 @@ <% content_for :heading do %> -
<%= t 'user.reset_password.heading', :user => @user.display_name %>
+
<%= t 'user.reset_password.heading', :user => current_user.display_name %>
<% end %> <%= error_messages_for :user %> diff --git a/app/views/user/save.html.erb b/app/views/user/save.html.erb index f8a80b26c..7134a167f 100644 --- a/app/views/user/save.html.erb +++ b/app/views/user/save.html.erb @@ -1 +1 @@ -<%= @user.email %> +<%= current_user.email %> diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 91f85f305..137a390ba 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -3,42 +3,42 @@ <%= user_image @this_user %>

<%= @this_user.display_name %><%= role_icons(@this_user) %>
- <% if @user and @this_user.id == @user.id %> + <% if current_user and @this_user.id == current_user.id %>

- <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %> - <%= number_with_delimiter(@user.changesets.size) %> + <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => current_user.display_name %> + <%= number_with_delimiter(current_user.changesets.size) %>

<%= link_to t('user.view.my notes'), :controller => 'notes', :action=> 'mine' %>

<%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %> - <%= number_with_delimiter(@user.traces.size) %> + <%= number_with_delimiter(current_user.traces.size) %>

- <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> - <%= number_with_delimiter(@user.diary_entries.size) %> + <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => current_user.display_name %> + <%= number_with_delimiter(current_user.diary_entries.size) %>

- <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => @user.display_name %> + <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => current_user.display_name %>

- <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %> + <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => current_user.display_name %>
- <% if @user.blocks.exists? %> + <% if current_user.blocks.exists? %>
- <%= link_to t('user.view.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %> - <%= number_with_delimiter(@user.blocks.active.size) %> + <%= link_to t('user.view.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => current_user.display_name %> + <%= number_with_delimiter(current_user.blocks.active.size) %>
<% end %> - <% if @user and @user.moderator? and @user.blocks_created.exists? %> + <% if current_user and current_user.moderator? and current_user.blocks_created.exists? %>
- <%= link_to t('user.view.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %> - <%= number_with_delimiter(@user.blocks_created.active.size) %> + <%= link_to t('user.view.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => current_user.display_name %> + <%= number_with_delimiter(current_user.blocks_created.active.size) %>
<% end %> @@ -73,9 +73,9 @@ <%= link_to t('user.view.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %>
- <% if @user and @user.is_friends_with?(@this_user) %> + <% if current_user and current_user.is_friends_with?(@this_user) %> <%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => @this_user.display_name), :method => :post %> - <% elsif @user %> + <% elsif current_user %> <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => @this_user.display_name), :method => :post %> <% else %> <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => @this_user.display_name) %> @@ -96,7 +96,7 @@
<% end %> - <% if @user and @user.moderator? %> + <% if current_user and current_user.moderator? %>
<%= link_to t('user.view.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @this_user.display_name %>
@@ -106,7 +106,7 @@ <% end %> - <% if @user and @user.administrator? %> + <% if current_user and current_user.administrator? %>
<% if ["active", "confirmed"].include? @this_user.status %> @@ -158,7 +158,7 @@
- <% if @user and @user.administrator? -%> + <% if current_user and current_user.administrator? -%>
<%= t 'user.view.email address' %> <%= @this_user.email %> <% unless @this_user.creation_ip.nil? -%> @@ -171,10 +171,10 @@ <% end %> - <% if @user and @this_user.id == @user.id %> + <% if current_user and @this_user.id == current_user.id %> <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
-
<%= raw(t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => @user.display_name)) %>
+
<%= raw(t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => current_user.display_name)) %>

<% else %> <% content_for :head do %> @@ -182,10 +182,10 @@ <% end %> <% user_data = { - :lon => @user.home_lon, - :lat => @user.home_lat, + :lon => current_user.home_lon, + :lat => current_user.home_lat, :icon => image_path("marker-red.png"), - :description => render(:partial => "popup", :object => @user, :locals => {:type => "your location"}) + :description => render(:partial => "popup", :object => current_user, :locals => {:type => "your location"}) } %> <%= content_tag "div", "", :id => "map", :class => "content_map", :data => {:user => user_data} %> diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb index 362cfd107..501ae92d0 100644 --- a/app/views/user_blocks/_block.html.erb +++ b/app/views/user_blocks/_block.html.erb @@ -17,7 +17,7 @@ <% end %> <%= link_to t('user_block.partial.show'), block %> - <% if @user and @user.id == block.creator_id and block.active? %><%= link_to t('user_block.partial.edit'), edit_user_block_path(block) %><% end %> + <% if current_user and current_user.id == block.creator_id and block.active? %><%= link_to t('user_block.partial.edit'), edit_user_block_path(block) %><% end %> <% if show_revoke_link %> <% if block.active? %><%= link_to t('user_block.partial.revoke'), :controller => 'user_blocks', :action => 'revoke', :id => block.id %><% end %> <% end %> diff --git a/app/views/user_blocks/blocks_by.html.erb b/app/views/user_blocks/blocks_by.html.erb index a8d761288..d2f888e7d 100644 --- a/app/views/user_blocks/blocks_by.html.erb +++ b/app/views/user_blocks/blocks_by.html.erb @@ -4,7 +4,7 @@ <% end %> <% unless @user_blocks.empty? %> -<%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => true, :show_creator_name => false } %> +<%= render :partial => 'blocks', :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => true, :show_creator_name => false } %> <% else %>
<%= t "user_block.blocks_by.empty", :name => h(@this_user.display_name) %>
<% end %> diff --git a/app/views/user_blocks/blocks_on.html.erb b/app/views/user_blocks/blocks_on.html.erb index 8e91935ed..397335531 100644 --- a/app/views/user_blocks/blocks_on.html.erb +++ b/app/views/user_blocks/blocks_on.html.erb @@ -3,7 +3,7 @@
<%= raw(t('user_block.blocks_on.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name}))) %>
<% end %> <% unless @user_blocks.empty? %> -<%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => false, :show_creator_name => true } %> +<%= render :partial => 'blocks', :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => false, :show_creator_name => true } %> <% else %>
<%= t "user_block.blocks_on.empty", :name => h(@this_user.display_name) %>
<% end %> diff --git a/app/views/user_blocks/index.html.erb b/app/views/user_blocks/index.html.erb index 8cf7e81b7..ce7f12b91 100644 --- a/app/views/user_blocks/index.html.erb +++ b/app/views/user_blocks/index.html.erb @@ -4,7 +4,7 @@ <% end %> <% unless @user_blocks.empty? %> -<%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => true, :show_creator_name => true } %> +<%= render :partial => 'blocks', :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => true, :show_creator_name => true } %> <% else %>
<%= t "user_block.index.empty" %>
<% end %> diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb index ccd6df06f..cc0caa6f3 100644 --- a/app/views/user_blocks/show.html.erb +++ b/app/views/user_blocks/show.html.erb @@ -12,10 +12,10 @@ {:controller => 'user', :action => 'view', :display_name => @user_block.creator.display_name})) %>

<%= link_to t('user_block.show.edit'), edit_user_block_path(@user_block) %>
<%= link_to(t('user_block.show.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %>

<%= t 'user.account.my settings' %>

<%= t 'user.account.public editing note.heading' %>

<%= t 'user.reset_password.heading', :user => @user.display_name %>

<%= t 'user.reset_password.heading', :user => current_user.display_name %>

<%= @this_user.display_name %><%= role_icons(@this_user) %>

<%= raw(t('user_block.blocks_on.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name}))) %>

<%= t('browse.changeset.discussion') %>

<%= t "oauth.oauthorize.title" %>

<%= t('browse.changeset.discussion') %>

<%= t 'layouts.intro_header' %>

<%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(@user.display_name) %>

<%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(current_user.display_name) %>

<%= render :partial => "message_count" %>

<%= raw(t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), inbox_path(@user.display_name))) %>/<%= t'message.outbox.outbox' %>

<%= raw(t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), inbox_path(current_user.display_name))) %>/<%= t'message.outbox.outbox' %>

<%= t'message.outbox.messages', :count => @user.sent_messages.size %>

<%= t'message.outbox.messages', :count => current_user.sent_messages.size %>