X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/41d6f19a6bed3b1a53f2fba12ca86ffbac1f8f5a..HEAD:/app/views/notes/index.html.erb diff --git a/app/views/notes/index.html.erb b/app/views/notes/index.html.erb index 50059625d..8622bbf29 100644 --- a/app/views/notes/index.html.erb +++ b/app/views/notes/index.html.erb @@ -1,37 +1,46 @@ <% content_for :heading do %> -

<%= t ".heading", :user => @user.display_name %>

-

<%= t ".subheading_html", :user => link_to(@user.display_name, user_path(@user)) %>

+

<%= t ".heading", :user => @user.display_name %>

+

<%= 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") %>

<% end %> -<%= render :partial => "notes_paging_nav" %> +<% if @notes.empty? %> +

<%= t ".no_notes" %>

- - - - - - - - - +<% else %> + <%= render :partial => "notes_paging_nav" %> + +
<%= t ".id" %><%= t ".creator" %><%= t ".description" %><%= t ".created_at" %><%= t ".last_changed" %>
+ + + + + + + + + + + <% @notes.each do |note| -%> + class="table-primary"<% end %>> + + + + + + - -<% @notes.each do |note| -%> - class="creator"<% end %>> - - - - - - - -<% end -%> -
<%= t ".id" %><%= t ".creator" %><%= t ".description" %><%= t ".created_at" %><%= t ".last_changed" %>
+ <% if note.closed? %> + <%= image_tag("closed_note_marker.png", :alt => "closed", :size => "25x40") %> + <% else %> + <%= image_tag("open_note_marker.png", :alt => "open", :size => "25x40") %> + <% end %> + <%= link_to note.id, note %><%= note_author(note.author) %><%= note.comments.first.body.to_html %><%= friendly_date_ago(note.created_at) %><%= friendly_date_ago(note.updated_at) %>
- <% if note.closed? %> - <%= image_tag("closed_note_marker.png", :alt => "closed", :size => "25x40") %> - <% else %> - <%= image_tag("open_note_marker.png", :alt => "open", :size => "25x40") %> - <% end %> - <%= link_to note.id, browse_note_path(note) %><%= note_author(note.author) %><%= note.comments.first.body.to_html %><%= friendly_date_ago(note.created_at) %><%= friendly_date_ago(note.updated_at) %>
+ <% end -%> + -<%= render :partial => "notes_paging_nav" %> + <%= render :partial => "notes_paging_nav" %> + +<% end -%>