Merge branch 'master' into notes

[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 a8fce11cadffdfb9bf23b7888fa0d430f90e6df8..04fc4cb3b09346184981d3f27aca73108949fcaf 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -11,6 +11,8 @@
     <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %>
     <span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>
     |
     <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %>
     <span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>
     |

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

     <%= 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 => @user.display_name %>
     <span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
     |


@@ -34,6 +36,8 @@
     <%= 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 => @this_user.display_name %>
     <span class='count-number'><%= number_with_delimiter(@this_user.traces.size) %></span>
     |

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

     <!-- Displaying another user's profile page -->
     <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %>
     |
     <!-- Displaying another user's profile page -->
     <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %>
     |