-<h2><%= t 'browse.changeset.changeset', :id => @changeset.id %>
- <span class="icon close"></span>
+<% set_title(t('browse.changeset.title', :id => @changeset.id)) %>
+
+<h2>
+ <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+ <%= t('browse.changeset.title', :id => @changeset.id) %>
</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
- %>
- <%= t 'browse.changeset_details.closed_at' %>
- <abbr title="<%= t 'browse.changeset_details.created_at' %>: <%= l @changeset.created_at %> <%= 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 %>"><%= 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 %>
- </span>
-</div>
-
-<%=
- render :partial => "tag_details", :object => @changeset.tags.except('comment')
-%>
+ <h4><%= linkify(h(@changeset.tags['comment'].to_s.presence || t('browse.no_comment'))) %></h4>
+ <div class="details"><%= changeset_details(@changeset) %></div>
-<% unless @nodes.empty? %>
- <div class='browse-section paginate'>
- <h4><%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %></h4>
- <ul>
- <% @nodes.each do |node| %>
- <li><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
+ <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %>
+
+ <h4 class="comments-header"><%= t('browse.changeset.discussion') %></h4>
+
+ <div class="buttons clearfix subscribe-buttons">
+ <form action="#" class="hide_unless_logged_in">
+ <% if @user and @changeset.subscribers.exists?(@user.id) %>
+ <input class="action-button" type="submit" name="unsubscribe" value="<%= t('javascripts.changesets.show.unsubscribe') %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
+ <% else %>
+ <input class="action-button" type="submit" name="subscribe" value="<%= t('javascripts.changesets.show.subscribe') %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />
<% end %>
- </ul>
- <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
+ </form>
</div>
-<% end %>
-<% unless @ways.empty? %>
-<<<<<<< HEAD
- <div class='browse-section paginate'>
-=======
- <div class='browse-section clearfix paginate'>
->>>>>>> groundwork for responsive menu
- <h4><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></h4>
+ <div class="clearfix"></div>
+
+ <% if @comments.length > 0 %>
+ <div class='changeset-comments'>
+ <form action="#">
+ <ul>
+ <% @comments.each do |comment| %>
+ <% if comment.visible %>
+ <li id="c<%= comment.id %>">
+ <small class='deemphasize'>
+ <%= t("browse.changeset.commented_by",
+ :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at),
+ :user => link_to(h(comment.author.display_name), {:controller => "user", :action => "view",
+ :display_name => comment.author.display_name})).html_safe %>
+ <% if @user and @user.moderator? %>
+ — <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_hide_url(comment.id) %>"><%= t('javascripts.changesets.show.hide_comment') %></span>
+ <% end %>
+ </small>
+ <%= comment.body.to_html %>
+ </li>
+ <% elsif @user and @user.moderator? %>
+ <li id="c<%= comment.id %>">
+ <small class='deemphasize'>
+ <%= t("browse.changeset.hidden_commented_by",
+ :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at),
+ :user => link_to(h(comment.author.display_name), {:controller => "user", :action => "view",
+ :display_name => comment.author.display_name})).html_safe %>
+ — <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t('javascripts.changesets.show.unhide_comment') %></span>
+ </small>
+ <%= comment.body.to_html %>
+ </li>
+ <% end %>
+ <% end %>
+ </ul>
+ </form>
+ </div>
+ <% end %>
+
+ <div class="notice hide_if_logged_in">
+ <%= link_to(t("browse.changeset.join_discussion"), :controller => 'user', :action => 'login', :referer => request.fullpath) %>
+ </div>
+
+ <% unless @changeset.is_open? %>
+ <form action="#" class="hide_unless_logged_in">
+ <textarea class="comment" name="text" cols="40" rows="5"></textarea>
+ <div class="buttons clearfix">
+ <input type="submit" name="comment" value="<%= t('javascripts.changesets.show.comment') %>" data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1"/>
+ </div>
+ </form>
+ <% end %>
+
+ <% unless @ways.empty? %>
+ <h4>
+ <%= type_and_paginated_count('way', @way_pages) %>
+ <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>
+ </h4>
<ul>
<% @ways.each do |way| %>
- <li><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
+ <li><%= link_to printable_name(way, true), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
<% end %>
</ul>
- <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>
- </div>
-<% end %>
+ <% end %>
-<% unless @relations.empty? %>
- <div class='browse-section paginate'>
- <h4><%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %></h4>
- <ul>
- <% @relations.each do |relation| %>
- <li><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>
- <% end %>
- </ul>
+ <% unless @relations.empty? %>
+ <h4>
+ <%= type_and_paginated_count('relation', @relation_pages) %>
<%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
+ </h4>
+ <ul>
+ <% @relations.each do |relation| %>
+ <li><%= link_to printable_name(relation, true), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>
+ <% end %>
+ </ul>
+ <% end %>
+
+ <% unless @nodes.empty? %>
+ <h4>
+ <%= type_and_paginated_count('node', @node_pages) %>
+ <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
+ </h4>
+ <ul>
+ <% @nodes.each do |node| %>
+ <li><%= link_to printable_name(node, true), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
+ <% end %>
+ </ul>
+ <% end %>
+</div>
+
+<% if @next_by_user || @prev_by_user %>
+ <div class='secondary-actions'>
+ <% if @prev_by_user %>
+ <%= link_to "<< #{@prev_by_user.id}", :id => @prev_by_user.id %>
+ ·
+ <% end %>
+ <%=
+ user = (@prev_by_user || @next_by_user).user.display_name
+ link_to user, :controller => "changeset", :action => "list", :display_name => user
+ %>
+ <% if @next_by_user %>
+ ·
+ <%= link_to "#{@next_by_user.id} >>", :id => @next_by_user.id %>
+ <% end %>
</div>
<% end %>
-<div class='browse-section secondary-actions'>
- <span><%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
+<div class='secondary-actions'>
+ <%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
·
- <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %></span>
+ <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>
</div>
projects / rails.git / blobdiff