X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/898cc828dd1f1167f85abbf35c8e3f0ed640ac1e..cbf71f04c244440f82d86e12758a2e443f68c0f8:/app/views/user/view.html.erb

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index cf74fc0e0..91f85f305 100644
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -2,9 +2,9 @@
   <div id='userinformation'>
     <%= user_image @this_user %>
     <div class='userinformation-inner'>
-      <h2><%= @this_user.display_name %><%= role_icons(@this_user) %></h2>
+      <h1><%= @this_user.display_name %><%= role_icons(@this_user) %></h1>
       <% if @user and @this_user.id == @user.id %>
-        <!-- Displaying user's own profile page -->
+        <!-- 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 %>
@@ -45,7 +45,7 @@
         </ul>
 
         <% else %>
-
+        <!-- Displaying user profile page to the public -->
         <ul class='secondary-actions clearfix'>
 
           <li>
@@ -75,8 +75,10 @@
           <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 %>
-            <% else %>
+            <% elsif @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) %>
             <% end %>
           </li>
 
@@ -139,14 +141,14 @@
       <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' %>
+          <% unless @this_user.terms_agreed %>
+            |
+            <%= t 'user.view.ct status' %>
+            <% if @this_user.terms_seen? -%>
+              <%= t 'user.view.ct declined' %>
+            <% else -%>
+              <%= t 'user.view.ct undecided' %>
+            <% end -%>
           <% end -%>
         </small>
       </p>