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

Improve changeset template

Browse source
This commit is contained in:
Aaron Lidman 2013-11-05 18:28:11 -08:00
parent 0f6ee7407c
commit d1cc387080
7 changed files with 57 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1026,6 +1026,11 @@ a.donate {
&.selected { background: lighten($green, 35%); }
}
.comment a {
font-weight: bold;
color: #000;
}
}
/* Rules for the data browser */

2
app/views/browse/_common_details.html.erb
View file

@ -29,4 +29,4 @@
</div>
</div>
<%= render :partial => "tag_details", :object => common_details %>
<%= render :partial => "tag_details", :object => common_details.tags %>

4
app/views/browse/_tag_details.html.erb
View file

@ -1,8 +1,8 @@
<% unless tag_details.tags.empty? %>
<% unless tag_details.empty? %>
<div class='browse-section'>
<h4><%= t'browse.tag_details.tags' %></h4>
<ul class='browse-tag-list'>
<%= render :partial => "tag", :collection => tag_details.tags.sort %>
<%= render :partial => "tag", :collection => tag_details.sort %>
</ul>
</div>
<% end %>

40
app/views/browse/changeset.html.erb
View file

@ -1,29 +1,41 @@
<div class='browse-section header'>
<h2><%= t 'browse.changeset.changeset', :id => @changeset.id %>
<h2><%= t 'browse.changeset.changeset', :id => @changeset.id %>
<span class="icon close"></span>
</h2>
</h2>
<div class="browse-section">
<p>
<%=
if @changeset.tags['comment'].to_s != ''
@changeset.tags['comment'].to_s
else
t ('browse.changeset_details.no_comment')
end
%>
</p>
<span>
<%
created_at = distance_of_time_in_words_to_now(@changeset.created_at)
closed_at = distance_of_time_in_words_to_now(@changeset.closed_at)
if created_at == closed_at %>
if created_at == closed_at
%>
<%= t 'browse.changeset_details.closed_at' %>
<abbr title="<%= t 'browse.changeset_details.created_at' %>: <%= @changeset.created_at %> &#10;<%= t 'browse.changeset_details.closed_at' %>: <%= @changeset.closed_at %>">
<%= created_at %> ago</abbr>
<abbr title="<%= t 'browse.changeset_details.created_at' %>: <%= l @changeset.created_at %> &#10;<%= t 'browse.changeset_details.closed_at' %>: <%= l @changeset.closed_at %>">
<%= t('browse.changeset_details.ago', :ago => created_at) %></abbr>
<% else %>
<%= t 'browse.changeset_details.created_at' %> <abbr title="<%= l @changeset.created_at %>"><%= created_at %> ago</abbr>,
<%= t 'browse.changeset_details.closed_at' %> <abbr title="<%= l @changeset.closed_at %>"><%= closed_at %> ago<abbr>
<%= t 'browse.changeset_details.created_at' %> <abbr title="<%= l @changeset.created_at %>"><%= t('browse.changeset_details.ago', :ago => created_at) %></abbr>,
<%= t 'browse.changeset_details.closed_at' %> <abbr title="<%= l @changeset.closed_at %>"><%= t('browse.changeset_details.ago', :ago => closed_at) %><abbr>
<% end %>
<% if @changeset.user.data_public? %>
by <%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %>
<% end %>
</p>
</span>
</div>
<%= render :partial => "tag_details", :object => @changeset %>
<%=
render :partial => "tag_details", :object => @changeset.tags.except('comment')
%>
<% unless @nodes.empty? %>
<div class='browse-section clearfix paginate'>
<div class='browse-section paginate'>
<h4><%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %></h4>
<ul>
<% @nodes.each do |node| %>
@ -35,7 +47,7 @@
<% end %>
<% unless @ways.empty? %>
<div class='browse-section clearfix paginate'>
<div class='browse-section paginate'>
<h4><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></h4>
<ul>
<% @ways.each do |way| %>
@ -47,7 +59,7 @@
<% end %>
<% unless @relations.empty? %>
<div class='browse-section clearfix paginate'>
<div class='browse-section paginate'>
<h4><%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %></h4>
<ul>
<% @relations.each do |relation| %>
@ -58,7 +70,7 @@
</div>
<% end %>
<div class='browse-section secondary-actions clearfix'>
<div class='browse-section secondary-actions'>
<span><%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
&middot;
<%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %></span>

1
app/views/browse/way_history.html.erb
View file

@ -15,5 +15,6 @@
<div class='secondary-actions clearfix'>
<span><%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %>
&middot;
<%= link_to(t('browse.way_history.view_details'), :action => "way") %></span>
</div>

20
app/views/changeset/_changeset.html.erb
View file

@ -13,7 +13,15 @@
%>
<%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
#<%= link_to(changeset.id, changeset_path(changeset.id), :class => :changeset_id) %>
<p class="comment">
<a class="changeset_id" href="<%= changeset_path(changeset.id) %>">
<% if changeset.tags['comment'].to_s != '' %>
<%= linkify(h(changeset.tags['comment'])) %>
<% else %>
<%= t 'changeset.changeset.no_comment' %>
<% end %>
</a>
</p>
<span class='date'>
<% if changeset.closed_at > DateTime.now %>
@ -25,7 +33,7 @@
</span>
<% unless params.key?(:display_name) %>
<span class="user">
<span class="user"> by
<% if changeset.user.data_public? %>
<%= link_to changeset.user.display_name, user_path(changeset.user.display_name) %>
<% else %>
@ -33,12 +41,4 @@
<% end %>
</span>
<% end %>
<p class="comment deemphasize">
<% if changeset.tags['comment'].to_s != '' %>
<%= linkify(h(changeset.tags['comment'])) %>
<% else %>
<%= t 'changeset.changeset.no_comment' %>
<% end %>
</p>
<% end %>

4
config/locales/en.yml
View file

@ -133,6 +133,8 @@ en:
has_nodes: "Nodes (%{count})"
has_ways: "Ways (%{count})"
has_relations: "Relations (%{count})"
no_comment: "(no comment)"
ago: "%{ago} ago"
common_details:
edited: "Edited"
deleted: "Deleted"
@ -297,7 +299,7 @@ en:
changeset:
still_editing: "(still editing)"
anonymous: "Anonymous"
no_comment: "(none)"
no_comment: "(no comment)"
no_edits: "(no edits)"
show_area_box: "show area box"
big_area: "(big)"