X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ba9456066f74814fe4e8929a4467caa2c5c6ba9f..764f808d5a5faebc835ed0f588bae4a306ad687d:/app/views/browse/changeset.html.erb?ds=inline

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 1227c0dd6..079915fcf 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,65 +1,144 @@
-<div class='browse-section header'>
-  <h2><%= t 'browse.changeset.changeset', :id => @changeset.id %>
-    <span class="icon close"></span>
-  </h2>
-    <p>
-      <% 
-      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' %>: <%= @changeset.created_at %> &#10;<%= t 'browse.changeset_details.closed_at' %>: <%= @changeset.closed_at %>">
-        <%= created_at %> ago</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> 
-      <% end %>
-      <% if @changeset.user.data_public? %>
-        by <%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %>
+<% set_title(t(".title", :id => @changeset.id)) %>
+
+<%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %>
+
+<div class="browse-section">
+  <p class="font-italic">
+    <%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>
+  </p>
+  <div class="details"><%= changeset_details(@changeset) %></div>
+
+  <%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %>
+
+  <h4 class="comments-header"><%= t(".discussion") %></h4>
+
+  <% if current_user %>
+    <div class="buttons clearfix subscribe-buttons">
+      <form action="#">
+        <% if @changeset.subscribers.exists?(current_user.id) %>
+          <input class="action-button btn btn-sm btn-primary" type="submit" name="unsubscribe" value="<%= t("javascripts.changesets.show.unsubscribe") %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
+        <% else %>
+          <input class="action-button btn btn-sm btn-primary" type="submit" name="subscribe" value="<%= t("javascripts.changesets.show.subscribe") %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />
+        <% end %>
+      </form>
+    </div>
+  <% end %>
+
+  <div class="clearfix"></div>
+
+  <% if @comments.length > 0 %>
+    <div class='changeset-comments'>
+      <form action="#">
+        <ul class="list-unstyled">
+          <% @comments.each do |comment| %>
+            <% if comment.visible %>
+              <li id="c<%= comment.id %>">
+                <small class='text-muted'>
+                  <%= t(".commented_by_html",
+                        :when => friendly_date_ago(comment.created_at),
+                        :exact_time => l(comment.created_at),
+                        :user => link_to(comment.author.display_name, user_path(comment.author))) %>
+                  <% if current_user and current_user.moderator? %>
+                    — <span class="action-button" 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 current_user and current_user.moderator? %>
+              <li id="c<%= comment.id %>">
+                <small class='text-muted'>
+                  <%= t(".hidden_commented_by_html",
+                        :when => friendly_date_ago(comment.created_at),
+                        :exact_time => l(comment.created_at),
+                        :user => link_to(comment.author.display_name, user_path(comment.author))) %>
+                  — <span class="action-button text-muted" 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 %>
+
+  <% unless current_user %>
+    <div class="notice">
+      <%= link_to(t(".join_discussion"), login_path(:referer => request.fullpath)) %>
+    </div>
+  <% end %>
+
+  <% if current_user %>
+    <% unless @changeset.is_open? %>
+      <form action="#">
+        <div class="form-group">
+          <textarea class="form-control" name="text" cols="40" rows="5"></textarea>
+        </div>
+        <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" class="btn btn-sm btn-primary" />
+        </div>
+      </form>
+    <% else %>
+      <div class="notice">
+      <%= t(".still_open") %>
+      </div>
+    <% end %>
+  <% 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 class="list-unstyled">
+      <% @ways.each do |way| %>
+        <li><%= link_to printable_name(way, :version => true), { :action => "way", :id => way.way_id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %></li>
       <% end %>
-    </p>
-</div>
-  
-<%= render :partial => "tag_details", :object => @changeset %>
+    </ul>
+  <% end %>
 
-<% unless @nodes.empty? %>
-  <div class='browse-section clearfix 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>
+  <% 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 class="list-unstyled">
+      <% @relations.each do |relation| %>
+        <li><%= link_to printable_name(relation, :version => true), { :action => "relation", :id => relation.relation_id.to_s }, { :class => link_class("relation", relation), :title => link_title(relation) } %></li>
       <% end %>
     </ul>
-    <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
-  </div>
-<% end %>
+  <% end %>
 
-<% unless @ways.empty? %>
-  <div class='browse-section clearfix  paginate'>
-    <h4><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></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>
+  <% 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 class="list-unstyled">
+      <% @nodes.each do |node| %>
+        <li><%= link_to printable_name(node, :version => true), { :action => "node", :id => node.node_id.to_s }, { :class => link_class("node", node), :title => link_title(node), :rel => link_follow(node) } %></li>
       <% end %>
     </ul>
-    <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>
-  </div>
-<% end %>
+  <% end %>
+</div>
 
-<% unless @relations.empty? %>
-  <div class='browse-section clearfix  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>
-      <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
+<% 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 %>
+      &middot;
+    <% end %>
+    <%= user = (@prev_by_user || @next_by_user).user.display_name
+        link_to tag.bdi(user), :controller => "changesets", :action => "index", :display_name => user %>
+    <% if @next_by_user %>
+      &middot;
+      <%= link_to "#{@next_by_user.id} >>", :id => @next_by_user.id %>
+    <% end %>
   </div>
 <% end %>
 
-<div class='browse-section secondary-actions clearfix'> 
-  <span><%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
+<div class='secondary-actions'>
+  <%= link_to(t(".changesetxml"), :controller => "api/changesets", :action => "show") %>
   &middot;
-  <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %></span>
+  <%= link_to(t(".osmchangexml"), :controller => "api/changesets", :action => "download") %>
 </div>