X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a36f3558dd43dd5a598e36dd21fd5f7d2b4a94f5..206e1309a95b498a220d8de6cf4ed5970ebd6778:/app/views/user/view.html.erb

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index de2e93f94..c85ca5fd9 100644
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -2,14 +2,17 @@
   <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 %>
             <span class='count-number'><%= number_with_delimiter(@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' %>
             <span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>
@@ -42,13 +45,16 @@
         </ul>
 
         <% else %>
-
+        <!-- Displaying user profile page to the public -->
         <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>
           </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>
@@ -69,11 +75,12 @@
           <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>
-
           <% if @this_user.blocks.exists? %>
             <li>
               <%= link_to t('user.view.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @this_user.display_name %>
@@ -146,7 +153,15 @@
       </p>
     </div>
 
-    <div class='user-description'><%= @this_user.description.to_html %></div>
+    <% if @user and @this_user.id != @user.id %>
+      <div class="report-button">
+         <%= link_to new_issue_url(reportable_id: @this_user.id, reportable_type: @this_user.class.name, reported_user_id: @this_user.id), :title => t('user.view.report') do%>
+            <%= image_tag('notice.png', size: '10x10') %>
+         <% end %>
+      </div>
+    <% end %>
+
+    <div class="user-description richtext"><%= @this_user.description.to_html %></div>
 
   </div>