Merge branch 'pull/5196'

[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 a627e1c545b03f1ef773912115397a36b2439889..d5efe0d79c79e3308c0f26252b7a403e6b3b3070 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>
 <% 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-body") %></p>

 <% end %>
 
 <% if @notes.empty? %>
 <% end %>
 
 <% if @notes.empty? %>


@@ -21,15 +24,15 @@
       </tr>
     </thead>
   <% @notes.each do |note| -%>
       </tr>
     </thead>
   <% @notes.each do |note| -%>

-    <tr<% if note.author == @user %> class="creator"<% end %>>
+    <tr<% if note.author == @user %> class="table-primary"<% end %>>

       <td>
         <% if note.closed? %>
       <td>
         <% if note.closed? %>

-          <%= image_tag("closed_note_marker.png", :alt => "closed", :size => "25x40") %>
+          <%= image_tag("closed_note_marker.svg", :alt => "closed", :width => 25, :height => 40) %>

         <% else %>
         <% else %>

-          <%= image_tag("open_note_marker.png", :alt => "open", :size => "25x40") %>
+          <%= image_tag("open_note_marker.svg", :alt => "open", :width => 25, :height => 40) %>

         <% end %>
       </td>
         <% end %>
       </td>

-      <td><%= link_to note.id, browse_note_path(note) %></td>
+      <td><%= link_to note.id, note %></td>

       <td><%= note_author(note.author) %></td>
       <td><%= note.comments.first.body.to_html %></td>
       <td><%= friendly_date_ago(note.created_at) %></td>
       <td><%= note_author(note.author) %></td>
       <td><%= note.comments.first.body.to_html %></td>
       <td><%= friendly_date_ago(note.created_at) %></td>