Move new diary entry link to the end

[rails.git] / app / views / browse / changeset.html.erb

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 6c60349dd3121042b4a56a773fb0e2cf78d39524..ec4e0c1c200e6f16889744f5340d3751a254da7c 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,67 +1,139 @@
-<% content_for :head do %>
-  <%= stylesheet_link_tag 'browse' %>
-<% end %>
+<% set_title(t(".title", :id => @changeset.id)) %>

 
 

-<h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
+<%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %>

 
 

-<div class='browse-section common'>
-  <div class='browse-field'>
-    <h4><%= t 'browse.changeset_details.created_at' %></h4>
-    <p><%= l @changeset.created_at %></p>
-  </div>
+<div class="browse-section">
+  <p class="fst-italic">
+    <%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>
+  </p>
+  <p class="details"><%= changeset_details(@changeset) %></p>

 
 

-  <div class='browse-field'>
-    <h4><%= t 'browse.changeset_details.closed_at' %></h4>
-    <p><%= l @changeset.closed_at %></p>
+  <%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %>
+
+  <div class="row">
+    <div class="col">
+      <h4><%= t(".discussion") %></h4>
+    </div>
+
+    <% if current_user %>
+      <div class="col-auto">
+        <% if @changeset.subscribers.exists?(current_user.id) %>
+          <button class="action-button btn btn-sm btn-primary" name="unsubscribe" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>"><%= t("javascripts.changesets.show.unsubscribe") %></button>
+        <% else %>
+          <button class="action-button btn btn-sm btn-primary" name="subscribe" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>"><%= t("javascripts.changesets.show.subscribe") %></button>
+        <% end %>
+      </div>
+    <% end %>

   </div>
 
   </div>
 

-  <% if @changeset.user.data_public? %>
-    <div class='browse-field'>
-      <h4><%= t 'browse.changeset_details.belongs_to' %></h4>
-      <p><%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %></p>
+  <% 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(".comment_by_html",
+                        :time_ago => friendly_date_ago(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>
+                <div class="mx-2">
+                  <%= comment.body.to_html %>
+                </div>
+              </li>
+            <% elsif current_user and current_user.moderator? %>
+              <li id="c<%= comment.id %>">
+                <small class='text-muted'>
+                  <%= t(".hidden_comment_by_html",
+                        :time_ago => friendly_date_ago(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>
+                <div class="mx-2">
+                  <%= comment.body.to_html %>
+                </div>
+              </li>
+            <% end %>
+          <% end %>
+        </ul>
+      </form>

     </div>
   <% end %>
     </div>
   <% end %>

-</div>

 
 

-<%= render :partial => "tag_details", :object => @changeset %>
+  <% unless current_user %>
+    <p class="notice">
+      <%= link_to(t(".join_discussion"), login_path(:referer => request.fullpath)) %>
+    </p>
+  <% end %>

 
 

-<% unless @nodes.empty? %>
-  <div class='browse-section clearfix'>
-    <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>
+  <% if current_user %>
+    <% unless @changeset.open? %>
+      <form action="#" class="mb-3">
+        <div class="mb-3">
+          <textarea class="form-control" name="text" cols="40" rows="5"></textarea>
+        </div>
+        <div id="comment-error" class="alert alert-danger p-2 mb-3" hidden>
+        </div>
+        <div>
+          <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 %>
+      <p class="notice">
+        <%= t(".still_open") %>
+      </p>
+    <% end %>
+  <% end %>
+
+  <% unless @ways.empty? %>
+    <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("way", @way_pages), :pages => @way_pages, :page_param => "way_page" } %>
+    <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 %>
     </ul>
       <% end %>
     </ul>

-  </div>
-  <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
-<% end %>
+  <% end %>

 
 

-<% unless @ways.empty? %>
-  <div class='browse-section clearfix'>
-    <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 @relations.empty? %>
+    <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("relation", @relation_pages), :pages => @relation_pages, :page_param => "relation_page" } %>
+    <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>
       <% end %>
     </ul>

-  </div>
-  <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>
-<% end %>
+  <% end %>

 
 

-<% unless @relations.empty? %>
-  <div class='browse-section clearfix'>
-    <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 @nodes.empty? %>
+    <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("node", @node_pages), :pages => @node_pages, :page_param => "node_page" } %>
+    <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>
+  <% 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 %>
+      &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>
   </div>

-  <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>

 <% end %>
 
 <% end %>
 

-<ul class='secondary-actions clearfix'>
-  <li><%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %></li>
-  <li><%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %></li>
-</ul>
+<div class='secondary-actions'>
+  <%= link_to(t(".changesetxml"), :controller => "api/changesets", :action => "show") %>
+  &middot;
+  <%= link_to(t(".osmchangexml"), :controller => "api/changesets", :action => "download") %>
+</div>