Merge remote-tracking branch 'upstream/pull/1837'

[rails.git] / app / views / user / view.html.erb

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index f39bafec7392b0f952ca3c5c47f7e304b95c0378..fedbad80e154e94bd17ad7786e8023342c22296d 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -1,44 +1,44 @@
 <% content_for :heading do %>
   <div id='userinformation'>
 <% content_for :heading do %>
   <div id='userinformation'>

-    <%= user_image @this_user %>
+    <%= user_image @user %>

     <div class='userinformation-inner'>
     <div class='userinformation-inner'>

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

         <!-- Displaying user's own profile page to themself -->
         <ul class='secondary-actions clearfix'>
           <li>
         <!-- Displaying user's own profile page to themself -->
         <ul class='secondary-actions clearfix'>
           <li>

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

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

-            <span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>
+            <span class='count-number'><%= number_with_delimiter(current_user.traces.size) %></span>

           </li>
           <li>
           </li>
           <li>

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

           </li>
           <li>
           </li>
           <li>

-            <%= 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 %>

           </li>
           <li>
           </li>
           <li>

-            <%= 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 %>

           </li>
 
           </li>
 

-          <% if @user.blocks.exists? %>
+          <% if current_user.blocks.exists? %>

             <li>
             <li>

-              <%= link_to t('user.view.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %>
-              <span class='count-number'><%= number_with_delimiter(@user.blocks.active.size) %></span>
+              <%= link_to t('user.view.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => current_user.display_name %>
+              <span class='count-number'><%= number_with_delimiter(current_user.blocks.active.size) %></span>

             </li>
           <% end %>
 
             </li>
           <% end %>
 

-          <% if @user and @user.moderator? and @user.blocks_created.exists? %>
+          <% if current_user and current_user.moderator? and current_user.blocks_created.exists? %>

             <li>
             <li>

-              <%= link_to t('user.view.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %>
-              <span class='count-number'><%= number_with_delimiter(@user.blocks_created.active.size) %></span>
+              <%= link_to t('user.view.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => current_user.display_name %>
+              <span class='count-number'><%= number_with_delimiter(current_user.blocks_created.active.size) %></span>

             </li>
           <% end %>
 
             </li>
           <% end %>
 


@@ -49,56 +49,56 @@
         <ul class='secondary-actions clearfix'>
 
           <li>
         <ul class='secondary-actions clearfix'>
 
           <li>

-            <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %>
-            <span class='count-number'><%= number_with_delimiter(@this_user.changesets.size) %></span>
+            <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %>
+            <span class='count-number'><%= number_with_delimiter(@user.changesets.size) %></span>

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

-            <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'list', :display_name => @this_user.display_name %>
-            <span class='count-number'><%= number_with_delimiter(@this_user.traces.size) %></span>
+            <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'list', :display_name => @user.display_name %>
+            <span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>

           </li>
 
           <!-- Displaying another user's profile page -->
 
           <li>
           </li>
 
           <!-- Displaying another user's profile page -->
 
           <li>

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

           </li>
           <li>
           </li>
           <li>

-            <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>
-            <span class='count-number'><%= number_with_delimiter(@this_user.diary_entries.size) %></span>
+            <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
+            <span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>

           </li>
           <li>
           </li>
           <li>

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

           </li>
           <li>
           </li>
           <li>

-            <% if @user and @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 %>
-              <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => @this_user.display_name), :method => :post %>
+            <% if current_user and current_user.is_friends_with?(@user) %>
+              <%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => @user.display_name), :method => :post %>
+            <% elsif current_user %>
+              <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => @user.display_name), :method => :post %>

             <% else %>
             <% else %>

-              <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => @this_user.display_name) %>
+              <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => @user.display_name) %>

             <% end %>
           </li>
 
             <% end %>
           </li>
 

-          <% if @this_user.blocks.exists? %>
+          <% if @user.blocks.exists? %>

             <li>
             <li>

-              <%= link_to t('user.view.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @this_user.display_name %>
-              <span class='count-number'><%= number_with_delimiter(@this_user.blocks.active.size) %></span>
+              <%= link_to t('user.view.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %>
+              <span class='count-number'><%= number_with_delimiter(@user.blocks.active.size) %></span>

             </li>
           <% end %>
 
             </li>
           <% end %>
 

-          <% if @this_user.moderator? and @this_user.blocks_created.exists? %>
+          <% if @user.moderator? and @user.blocks_created.exists? %>

             <li>
             <li>

-              <%= link_to t('user.view.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @this_user.display_name %>
-              <span class='count-number'><%= number_with_delimiter(@this_user.blocks_created.active.size) %></span>
+              <%= link_to t('user.view.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %>
+              <span class='count-number'><%= number_with_delimiter(@user.blocks_created.active.size) %></span>

             </li>
           <% end %>
 
             </li>
           <% end %>
 

-          <% if @user and @user.moderator? %>
+          <% if current_user and current_user.moderator? %>

             <li>
             <li>

-            <%= link_to t('user.view.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @this_user.display_name %>
+            <%= link_to t('user.view.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @user.display_name %>

             </li>
           <% end %>
 
             </li>
           <% end %>
 


@@ -106,33 +106,33 @@
 
       <% end %>
 
 
       <% end %>
 

-      <% if @user and @user.administrator? %>
+      <% if current_user and current_user.administrator? %>

 
         <ul class='secondary-actions clearfix'>
 
         <ul class='secondary-actions clearfix'>

-          <% if ["active", "confirmed"].include? @this_user.status %>
+          <% if ["active", "confirmed"].include? @user.status %>

             <li>
             <li>

-              <%= link_to t('user.view.deactivate_user'), set_status_user_path(:status => 'pending', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %>
+              <%= link_to t('user.view.deactivate_user'), set_status_user_path(:status => 'pending', :display_name => @user.display_name), :data => { :confirm => t('user.view.confirm') } %>

             </li>
             </li>

-          <% elsif ["pending"].include? @this_user.status %>
+          <% elsif ["pending"].include? @user.status %>

             <li>
             <li>

-              <%= link_to t('user.view.activate_user'), set_status_user_path(:status => 'active', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %>
+              <%= link_to t('user.view.activate_user'), set_status_user_path(:status => 'active', :display_name => @user.display_name), :data => { :confirm => t('user.view.confirm') } %>

             </li>
           <% end %>
 
             </li>
           <% end %>
 

-          <% if ["active", "suspended"].include? @this_user.status %>
+          <% if ["active", "suspended"].include? @user.status %>

             <li>
             <li>

-              <%= link_to t('user.view.confirm_user'), set_status_user_path(:status => 'confirmed', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %>
+              <%= link_to t('user.view.confirm_user'), set_status_user_path(:status => 'confirmed', :display_name => @user.display_name), :data => { :confirm => t('user.view.confirm') } %>

             </li>
           <% end %>
             <li>
             </li>
           <% end %>
             <li>

-              <% if ["pending", "active", "confirmed", "suspended"].include? @this_user.status %>
-                <%= link_to t('user.view.hide_user'), set_status_user_path(:status => 'deleted', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %>
+              <% if ["pending", "active", "confirmed", "suspended"].include? @user.status %>
+                <%= link_to t('user.view.hide_user'), set_status_user_path(:status => 'deleted', :display_name => @user.display_name), :data => { :confirm => t('user.view.confirm') } %>

             <% else %>
             <% else %>

-              <%= link_to t('user.view.unhide_user'), set_status_user_path(:status => 'active', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %>
+              <%= link_to t('user.view.unhide_user'), set_status_user_path(:status => 'active', :display_name => @user.display_name), :data => { :confirm => t('user.view.confirm') } %>

             </li>
           <% end %>
           <li>
             </li>
           <% end %>
           <li>

-            <%= link_to t('user.view.delete_user'), delete_user_path(:display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %>
+            <%= link_to t('user.view.delete_user'), delete_user_path(:display_name => @user.display_name), :data => { :confirm => t('user.view.confirm') } %>

           </li>
         </ul>
 
           </li>
         </ul>
 


@@ -140,41 +140,41 @@
 
       <p class='deemphasize'>
         <small>
 
       <p class='deemphasize'>
         <small>

-          <%= t 'user.view.mapper since' %> <%= l @this_user.creation_time.to_date, :format => :long %>
-          |
-          <%= t 'user.view.ct status' %>
-          <% if not @this_user.terms_agreed.nil? -%>
-          <%= t 'user.view.ct accepted', :ago =>time_ago_in_words(@this_user.terms_agreed)  %>
-          <% elsif not @this_user.terms_seen? -%>
-          <%= t 'user.view.ct undecided' %>
-          <% else -%>
-          <%= t 'user.view.ct declined' %>
+          <%= t 'user.view.mapper since' %> <%= l @user.creation_time.to_date, :format => :long %>
+          <% unless @user.terms_agreed %>
+            |
+            <%= t 'user.view.ct status' %>
+            <% if @user.terms_seen? -%>
+              <%= t 'user.view.ct declined' %>
+            <% else -%>
+              <%= t 'user.view.ct undecided' %>
+            <% end -%>

           <% end -%>
         </small>
       </p>
     </div>
 
           <% end -%>
         </small>
       </p>
     </div>
 

-    <div class="user-description richtext"><%= @this_user.description.to_html %></div>
+    <div class="user-description richtext"><%= @user.description.to_html %></div>

 
   </div>
 
 
   </div>
 

-  <% if @user and @user.administrator? -%>
+  <% if current_user and current_user.administrator? -%>

     <div class='admin-user-info deemphasize'>
     <div class='admin-user-info deemphasize'>

-      <small><b><%= t 'user.view.email address' %></b> <%= @this_user.email %></small>
-      <% unless @this_user.creation_ip.nil? -%>
-        <small><b><%= t 'user.view.created from' %></b> <%= @this_user.creation_ip %></small>
+      <small><b><%= t 'user.view.email address' %></b> <%= @user.email %></small>
+      <% unless @user.creation_ip.nil? -%>
+        <small><b><%= t 'user.view.created from' %></b> <%= @user.creation_ip %></small>

       <% end -%>
       <% end -%>

-      <small><b><%= t 'user.view.status' %></b> <%= @this_user.status.capitalize %></small>
-      <small><b><%= t 'user.view.spam score' %></b> <%= @this_user.spam_score %></small>
+      <small><b><%= t 'user.view.status' %></b> <%= @user.status.capitalize %></small>
+      <small><b><%= t 'user.view.spam score' %></b> <%= @user.spam_score %></small>

     </div>
   <% end -%>
 
 <% end %>
 
     </div>
   <% end -%>
 
 <% end %>
 

-  <% if @user and @this_user.id == @user.id %>
-    <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
+  <% if current_user and @user.id == current_user.id %>
+    <% if @user.home_lat.nil? or @user.home_lon.nil? %>

       <div id="map" class="content_map">
       <div id="map" class="content_map">

-        <p id="no_home_location"><%= 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)) %></p>
+        <p id="no_home_location"><%= 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)) %></p>

       </div>
     <% else %>
       <% content_for :head do %>
       </div>
     <% else %>
       <% content_for :head do %>


@@ -182,20 +182,20 @@
       <% end %>
       <%
         user_data = {
       <% 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"),
           :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} %>
     <% end %>
 
         }
       %>
       <%= content_tag "div", "", :id => "map", :class => "content_map", :data => {:user => user_data} %>
     <% end %>
 

-    <% friends = @this_user.friends.collect { |f| f.befriendee } %>
-    <% nearby = @this_user.nearby - friends %>
+    <% friends = @user.friends.collect { |f| f.befriendee } %>
+    <% nearby = @user.nearby - friends %>

 
   <div class="activity-block column-1">
 
   <div class="activity-block column-1">

-    <h3><%= t 'user.view.your friends' %></h3>
+    <h3><%= t 'user.view.my friends' %></h3>

 
     <% if friends.empty? %>
       <%= t 'user.view.no friends' %>
 
     <% if friends.empty? %>
       <%= t 'user.view.no friends' %>