Merge pull request #4218 from AntonKhorev/no-user-id-renames

[rails.git] / app / views / notes / show.html.erb

diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
index 3bb97b484289396ffeec14167cff936401c52ad0..a7baccf856dec921056d6c40fd8da7a8c75ff685 100644 (file)
--- a/app/views/notes/show.html.erb
+++ b/app/views/notes/show.html.erb
@@ -49,6 +49,8 @@
         <div class="mb-3">
           <textarea class="form-control" name="text" cols="40" rows="5" maxlength="2000"></textarea>
         </div>
         <div class="mb-3">
           <textarea class="form-control" name="text" cols="40" rows="5" maxlength="2000"></textarea>
         </div>

+        <div id="comment-error" class="alert alert-danger p-2 mb-3" hidden>
+        </div>

         <div class="btn-wrapper">
           <% if current_user.moderator? -%>
             <%= submit_tag t(".hide"), :name => "hide", :class => "btn btn-light",
         <div class="btn-wrapper">
           <% if current_user.moderator? -%>
             <%= submit_tag t(".hide"), :name => "hide", :class => "btn btn-light",


@@ -65,10 +67,16 @@
                                                    :url => comment_api_note_url(@note, "json") } %>
         </div>
       </form>
                                                    :url => comment_api_note_url(@note, "json") } %>
         </div>
       </form>

+    <% else -%>
+      <p>
+        <%= link_to t(".log_in_to_comment"), login_path(:referer => request.fullpath) %>
+      </p>

     <% end -%>
   <% else %>
     <form class="mb-3" action="#">
       <input type="hidden" name="text" value="" autocomplete="off">
     <% end -%>
   <% else %>
     <form class="mb-3" action="#">
       <input type="hidden" name="text" value="" autocomplete="off">

+      <div id="comment-error" class="alert alert-danger p-2 mb-3" hidden>
+      </div>

       <div class="btn-wrapper">
         <% if @note.status != "hidden" and current_user and current_user.moderator? -%>
           <input type="submit" name="hide" value="<%= t(".hide") %>" class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>">
       <div class="btn-wrapper">
         <% if @note.status != "hidden" and current_user and current_user.moderator? -%>
           <input type="submit" name="hide" value="<%= t(".hide") %>" class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>">


@@ -95,7 +103,7 @@
 
   <% if @note.freshly_closed? %>
     <small class="text-muted">
 
   <% if @note.freshly_closed? %>
     <small class="text-muted">

-      <%= t ".disappear_date_html", :disappear_in => disappear_in(@note) %>
+      <%= t ".disappear_date_html", :disappear_in => friendly_date(@note.freshly_closed_until) %>

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