Merge remote-tracking branch 'openstreetmap/pull/1349'

[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 274afa81f714b2084b7fd8bb38a35c35c952781b..f39bafec7392b0f952ca3c5c47f7e304b95c0378 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -2,12 +2,12 @@
   <div id='userinformation'>
     <%= user_image @this_user %>
     <div class='userinformation-inner'>
   <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 %>
       <% 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>
         <ul class='secondary-actions clearfix'>
           <li>

-            <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name, :anchor => "map=1/0/0" %>
+            <%= 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>
           </li>
           <li>
             <span class='count-number'><%= number_with_delimiter(@user.changesets.size) %></span>
           </li>
           <li>


@@ -45,11 +45,11 @@
         </ul>
 
         <% else %>
         </ul>
 
         <% else %>

-
+        <!-- Displaying user profile page to the public -->

         <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, :anchor => "map=1/0/0" %>
+            <%= 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>
           </li>
           <li>
             <span class='count-number'><%= number_with_delimiter(@this_user.changesets.size) %></span>
           </li>
           <li>