X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ba5107ebb543a396fc78069c75c431e4d3887ee1..357060d96faad761a677b1027fa42c25805bac01:/app/views/notes/mine.html.erb diff --git a/app/views/notes/mine.html.erb b/app/views/notes/mine.html.erb index e385e942b..c7015578b 100644 --- a/app/views/notes/mine.html.erb +++ b/app/views/notes/mine.html.erb @@ -1,37 +1,35 @@ -

<%= @heading %>

-

<%= raw @description %>

+<% content_for :heading do %> +

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

+

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

+<% end %> -<%= render :partial => 'notes_paging_nav' %> +<%= render :partial => "notes_paging_nav" %> - +
- - - - - + + + + + <% @notes.each do |note| -%> - bgcolor="#EEEEEE"<% end %>> + class="creator"<% end %>> - - <% if note.author.nil? %> - - <% else %> - - <% end %> - - - + + + + + <% end -%>
<%= t'note.mine.id' %><%= t'changeset.changesets.user' %><%= t'changeset.changesets.comment' %><%= t'changeset.changesets.saved_at' %><%= t'note.mine.last_changed' %><%= t ".id" %><%= t ".creator" %><%= t ".description" %><%= t ".created_at" %><%= t ".last_changed" %>
- <% if note.status == "closed" %> - <%= image_tag("closed_note_marker.png", :alt => 'closed') %> + <% if note.closed? %> + <%= image_tag("closed_note_marker.png", :alt => "closed", :size => "25x40") %> <% else %> - <%= image_tag("open_note_marker.png", :alt => 'open') %> + <%= image_tag("open_note_marker.png", :alt => "open", :size => "25x40") %> <% end %> <%= link_to note.id.to_s, :controller => "browse", :action => "note", :id => note.id %><%= link_to h(note.author.display_name), user_url(:display_name => note.author.display_name) %> <%= note.comments.first.body.to_html %> <%= l note.created_at %><%= l note.updated_at %><%= 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) %>
-<%= render :partial => 'notes_paging_nav' %> +<%= render :partial => "notes_paging_nav" %>