cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve notes template

Browse source
This commit is contained in:
Aaron Lidman 2013-11-05 13:31:41 -08:00
parent 9f3dace353
commit 684e7db45a
3 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/common.css.scss
View file

@ -1013,7 +1013,7 @@ a.donate {
} }
} }
.paginate ul { .paginate ul, .note-comments ul {
padding-left: 20px; padding-left: 20px;
} }
@ -1077,7 +1077,7 @@ a.donate {
#sidebar_content { #sidebar_content {
.browse-section.header { .browse-section.header {
padding: 20px; padding: 20px;
border-bottom: $keyline; border-bottom: 1px solid #ccc;
h2 { h2 {
padding: 0 0 5px 0; padding: 0 0 5px 0;

25
app/views/browse/note.html.erb
View file

@ -1,5 +1,20 @@
<div class='browse-section header'> <div class='browse-section header'>
<h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2> <h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2>
<span>
<%= t "browse.note.opened" %>:
<abbr><%= note_event(@note.created_at, @note.author) %></abbr> by
<% if @note.author.nil? %>
<%= t "browse.note.anonymous" %>
<% else %>
<%= note_author(@note.author) %>
<% end %>
<% if @note.status == "closed" %>
</span><span>
<%= t "browse.note.closed" %>:
<abbr><%= note_event(@note.closed_at, @note.author) %></abbr> by
<%= @note.comments.last.author %>
<% end %>
</span>
</div> </div>
<% if @note.comments.find { |comment| comment.author.nil? } -%> <% if @note.comments.find { |comment| comment.author.nil? } -%>
@ -9,11 +24,6 @@
<% end -%> <% end -%>
<div class='browse-section common'> <div class='browse-section common'>
<div class='browse-field'>
<h4><%= t "browse.note.opened" %></h4>
<p><%= note_event(@note.created_at, @note.author) %></p>
</div>
<% if @note.status == "closed" %> <% if @note.status == "closed" %>
<div class='browse-field'> <div class='browse-field'>
<h4><%= t "browse.note.closed" %></h4> <h4><%= t "browse.note.closed" %></h4>
@ -28,7 +38,8 @@
<div class='browse-field' id="c<%= @note.comments.first.id %>"> <div class='browse-field' id="c<%= @note.comments.first.id %>">
<h4><%= t "browse.note.description" %></h4> <h4><%= t "browse.note.description" %></h4>
<p><%= h(@note.comments.first.body.to_html) %></p> <%= h(@note.comments.first.body.to_html) %>
<!-- this provides it's own <p> tags -->
</div> </div>
<div class='browse-field'> <div class='browse-field'>
@ -38,7 +49,7 @@
</div> </div>
<% if @note.comments.length > 1 %> <% if @note.comments.length > 1 %>
<div class='browse-section clearfix'> <div class='browse-section clearfix note-comments'>
<h4><%= t "browse.note.comments" %></h4> <h4><%= t "browse.note.comments" %></h4>
<ul> <ul>
<% @note.comments[1..-1].each do |comment| %> <% @note.comments[1..-1].each do |comment| %>

1
config/locales/en.yml
View file

@ -288,6 +288,7 @@ en:
at_by_html: "%{when} ago by %{user}" at_by_html: "%{when} ago by %{user}"
description: "Description" description: "Description"
comments: "Comments" comments: "Comments"
anonymous: "anonymous"
changeset: changeset:
changeset_paging_nav: changeset_paging_nav:
showing_page: "Page %{page}" showing_page: "Page %{page}"