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

Fixed changeset time inconsistencies

Browse source
This commit is contained in:
Aaron Lidman 2013-11-07 12:18:52 -08:00
parent b3bd81fd4b
commit 4b2bd4835d
4 changed files with 28 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -644,7 +644,7 @@ nav.secondary {
padding: $lineheight $lineheight $lineheight/2;
}
h4, span.user, span.date {
h4 {
font-weight: normal;
color: #666;
font-size: 12px;
@ -1053,6 +1053,10 @@ a.donate {
&.selected { background: #FFFFE6; }
/* color is derived from changeset bbox fillColor in history.js */
h4 {
padding: 0;
}
}
.comment a {

33
app/helpers/changeset_helper.rb
View file

@ -1,23 +1,32 @@
module ChangesetHelper
def changeset_time_ago(changeset)
def changeset_details(changeset)
out = ''
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
out << t('browse.changeset_details.closed_at') + ' '
date = ''
if changeset.closed_at > DateTime.now
date << t('browse.changeset_details.created_at') + ' '
date << content_tag(:abbr, t('browse.changeset_details.ago', :ago => created_at), title: l(changeset.created_at))
else
date << t('browse.changeset_details.closed_at') + ' '
both_times = t('browse.changeset_details.created_at') + ': ' + l(changeset.created_at)
both_times << '&#10;'
both_times << t('browse.changeset_details.closed_at') + ': ' + l(changeset.closed_at)
out << content_tag(:abbr, t('browse.changeset_details.ago', :ago => created_at), title: both_times.html_safe)
else
out << t('browse.changeset_details.created_at') + ' '
out << content_tag(:abbr, t('browse.changeset_details.ago', :ago => created_at), title: l(changeset.created_at))
out << t('browse.changeset_details.closed_at') + ' '
out << content_tag(:abbr, t('browse.changeset_details.ago', :ago => closed_at), title: l(changeset.closed_at))
date << content_tag(:abbr, t('browse.changeset_details.ago', :ago => created_at), title: both_times.html_safe)
end
if changeset.user.data_public?
out << ' ' + t('browse.changeset_details.by') + ' '
out << link_to(h(changeset.user.display_name), :controller => "user", :action => "view", :display_name => changeset.user.display_name)
out << content_tag(:span, date.html_safe, class: 'date')
unless params.key?(:display_name)
userspan = ''
if changeset.user.data_public?
userspan << ' ' + t('browse.changeset_details.by') + ' '
if changeset.user.data_public?
user = link_to changeset.user.display_name, user_path(changeset.user.display_name)
else
user = t('changeset.changeset.anonymous')
end
userspan << content_tag(:span, user, class: 'user')
end
out << content_tag(:span, userspan.html_safe, class: 'user')
end
return out.html_safe
end

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

@ -5,7 +5,7 @@
<div class="browse-section">
<p><%= @changeset.tags['comment'].to_s.presence || t('browse.changeset_details.no_comment') %></p>
<h4><%= changeset_time_ago(@changeset) %></h4>
<h4><%= changeset_details(@changeset) %></h4>
</div>
<%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %>

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

@ -22,23 +22,5 @@
<% end %>
</a>
</p>
<span class='date'>
<% if changeset.closed_at > DateTime.now %>
<%= t 'changeset.changeset.still_editing' %>
<% else %>
<% closed_at = l changeset.closed_at, :format => :long %>
<abbr title='<%= closed_at %>'><%= distance_of_time_in_words_to_now(closed_at) %></abbr>
<% end %>
</span>
<% unless params.key?(:display_name) %>
<span class="user"> by
<% if changeset.user.data_public? %>
<%= link_to changeset.user.display_name, user_path(changeset.user.display_name) %>
<% else %>
<i><%= t 'changeset.changeset.anonymous' %></i>
<% end %>
</span>
<% end %>
<h4><%= changeset_details(changeset) %></h4>
<% end %>