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

Simplified common details

Browse source
This commit is contained in:
Aaron Lidman 2013-11-04 17:38:41 -08:00
parent 1cded7d151
commit fc5998d493
3 changed files with 23 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1000,7 +1000,7 @@ a.donate {
width: 50%; width: 50%;
height: 30px; height: 30px;
float: left; float: left;
padding: 9px 10px; padding: 6px 10px;
} }
.browse-tag-k { .browse-tag-k {

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

@ -1,39 +1,32 @@
<div class='browse-section common'> <div class='browse-section common'>
<div class='browse-field'> <div>
<% if common_details.visible? %> <% if common_details.visible? %>
<h4><%= t 'browse.common_details.edited_at' %></h4> <%= t 'browse.common_details.edited' %>
<% else %> <% else %>
<h4><%= t 'browse.common_details.deleted_at' %></h4> <%= t 'browse.common_details.deleted' %>
<% end %>
<abbr><%= distance_of_time_in_words_to_now(common_details.timestamp) %> ago</abbr>
<% if common_details.changeset.user.data_public? %>
<%= t 'browse.common_details.by' %>
<%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %>
<% end %> <% end %>
<p><%= l common_details.timestamp %></p>
</div> </div>
<% if common_details.changeset.user.data_public? %> <div>
<div class='browse-field'> <%= t 'browse.common_details.version' %>
<% if common_details.visible? %> #<%= h(common_details.version) %>
<h4><%= t 'browse.common_details.edited_by' %></h4> &middot;
<% else %> <%= t 'browse.common_details.in_changeset' %>
<h4><%= t 'browse.common_details.deleted_by' %></h4> #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
<% end %>
<p><%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %></p>
</div>
<% end %>
<div class='browse-field'>
<h4><%= t 'browse.common_details.version' %></h4>
<p><%= h(common_details.version) %></p>
</div>
<div class='browse-field'>
<h4><%= t 'browse.common_details.in_changeset' %></h4>
<p><%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %></p>
</div> </div>
<% if common_details.changeset.tags['comment'].present? %> <% if common_details.changeset.tags['comment'].present? %>
<div class='browse-field'> <div>
<h4><%= t 'browse.common_details.changeset_comment' %></h4> <%= t 'browse.common_details.changeset_comment' %>:
<p><%= linkify(h(common_details.changeset.tags['comment'])) %></p> <%= linkify(h(common_details.changeset.tags['comment'])) %>
</div> </div>
<% end %> <% end %>
</div> </div>
<%= render :partial => "tag_details", :object => common_details %> <%= render :partial => "tag_details", :object => common_details %>

7
config/locales/en.yml
View file

@ -134,10 +134,9 @@ en:
has_ways: "Ways (%{count})" has_ways: "Ways (%{count})"
has_relations: "Relations (%{count})" has_relations: "Relations (%{count})"
common_details: common_details:
edited_at: "Edited At" edited: "Edited"
edited_by: "Edited By" deleted: "Deleted"
deleted_at: "Deleted At" by: "by"
deleted_by: "Deleted By"
version: "Version" version: "Version"
in_changeset: "Changeset" in_changeset: "Changeset"
changeset_comment: "Comment" changeset_comment: "Comment"