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

[rails.git] / app / views / notes / index.html.erb

diff --git a/app/views/notes/index.html.erb b/app/views/notes/index.html.erb
index dd0cb26082f64a0a64e26731ef391063abede125..d93978480e8bfe2b4d98094d88640a73d58514b0 100644 (file)
--- a/app/views/notes/index.html.erb
+++ b/app/views/notes/index.html.erb
@@ -1,6 +1,9 @@
 <% content_for :heading do %>
   <h1><%= t ".heading", :user => @user.display_name %></h1>
-  <p><%= t ".subheading_html", :user => link_to(@user.display_name, user_path(@user)) %></p>
+  <p><%= t ".subheading_html",
+           :user => link_to(@user.display_name, @user),
+           :submitted => tag.span(t(".subheading_submitted"), :class => "px-2 py-1 bg-primary bg-opacity-25"),
+           :commented => tag.span(t(".subheading_commented"), :class => "px-2 py-1 bg-white") %></p>
 <% end %>
 
 <% if @notes.empty? %>