Merge remote-tracking branch 'upstream/pull/2060'

[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 aa333cfff72876e34c16db4767b9630d2c057dce..c63b0112e0819d07e4cfbc53d937dc0400241217 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,16 +1,87 @@
-<% set_title(t('browse.changeset.title', :id => @changeset.id)) %>
+<% set_title(t('.title', :id => @changeset.id)) %>

 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>

-  <%= t('browse.changeset.title', :id => @changeset.id) %>
+  <%= t('.title', :id => @changeset.id) %>

 </h2>
 
 <div class="browse-section">
 </h2>
 
 <div class="browse-section">

-  <h4><%= @changeset.tags['comment'].to_s.presence || t('browse.no_comment') %></h4>
+  <h4><%= linkify(h(@changeset.tags['comment'].to_s.presence || t('browse.no_comment'))) %></h4>

   <div class="details"><%= changeset_details(@changeset) %></div>
 
   <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %>
 
   <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" 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 %>
+      </form>
+    </div>
+  <% end %>
+
+  <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(".commented_by",
+                    :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at),
+                    :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %>
+                  <% if current_user and current_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 current_user and current_user.moderator? %>
+              <li id="c<%= comment.id %>">
+                <small class='deemphasize'>
+                  <%= t(".hidden_commented_by",
+                    :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at),
+                    :user => link_to(h(comment.author.display_name), user_path(comment.author))).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 %>
+
+  <% unless current_user %>
+    <div class="notice">
+      <%= link_to(t(".join_discussion"), :controller => 'users', :action => 'login', :referer => request.fullpath) %>
+    </div>
+  <% end %>
+
+  <% if current_user %>
+    <% unless @changeset.is_open? %>
+      <form action="#">
+        <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>
+    <% else %>
+      <div class="notice">
+      <%= t('.still_open') %>
+      </div>
+    <% end %>
+  <% end %>
+

   <% unless @ways.empty? %>
     <h4>
       <%= type_and_paginated_count('way', @way_pages) %>
   <% unless @ways.empty? %>
     <h4>
       <%= type_and_paginated_count('way', @way_pages) %>


@@ -18,7 +89,7 @@
     </h4>
     <ul>
       <% @ways.each do |way| %>
     </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>
   <% end %>
       <% end %>
     </ul>
   <% end %>


@@ -30,7 +101,7 @@
     </h4>
     <ul>
       <% @relations.each do |relation| %>
     </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>
+        <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 %>
       <% end %>
     </ul>
   <% end %>


@@ -42,14 +113,31 @@
     </h4>
     <ul>
       <% @nodes.each do |node| %>
     </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>
+        <li><%= link_to printable_name(node, 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>
 
       <% 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 content_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='secondary-actions'>
 <div class='secondary-actions'>

-  <%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
+  <%= link_to(t('.changesetxml'), :controller => "changesets", :action => "read") %>

   &middot;
   &middot;

-  <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>
+  <%= link_to(t('.osmchangexml'), :controller => "changesets", :action => "download") %>

 </div>
 </div>