Truncate username in user menu

[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..b3f1244338dc6ab4b704304caf73036715786194 100644 (file)
--- a/app/views/notes/show.html.erb
+++ b/app/views/notes/show.html.erb
@@ -4,7 +4,7 @@
 
 <div>
   <h4><%= t(".description") %></h4>
 
 <div>
   <h4><%= t(".description") %></h4>

-  <div class="note-description">
+  <div class="overflow-hidden ms-2">

     <%= h(@note_comments.first.body.to_html) %>
   </div>
 
     <%= h(@note_comments.first.body.to_html) %>
   </div>
 


@@ -33,7 +33,7 @@
       <ul class="list-unstyled">
         <% @note_comments.drop(1).each do |comment| %>
           <li id="c<%= comment.id %>">
       <ul class="list-unstyled">
         <% @note_comments.drop(1).each do |comment| %>
           <li id="c<%= comment.id %>">

-            <small class='text-muted'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
+            <small class='text-body-secondary'><%= note_event(comment.event, comment.created_at, comment.author) %></small>

             <div class="mx-2">
               <%= comment.body.to_html %>
             </div>
             <div class="mx-2">
               <%= comment.body.to_html %>
             </div>


@@ -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") %>">


@@ -82,7 +90,7 @@
 
   <% if current_user && current_user != @note.author %>
     <p>
 
   <% if current_user && current_user != @note.author %>
     <p>

-      <small class="text-muted">
+      <small class="text-body-secondary">

         <%= t ".report_link_html", :link => report_link(t(".report"), @note) %>
         <% if @note.status == "open" %>
           <%= t ".other_problems_resolve", :link => report_link(t(".report"), @note) %>
         <%= t ".report_link_html", :link => report_link(t(".report"), @note) %>
         <% if @note.status == "open" %>
           <%= t ".other_problems_resolve", :link => report_link(t(".report"), @note) %>


@@ -94,8 +102,8 @@
   <% end %>
 
   <% if @note.freshly_closed? %>
   <% end %>
 
   <% if @note.freshly_closed? %>

-    <small class="text-muted">
-      <%= t ".disappear_date_html", :disappear_in => disappear_in(@note) %>
+    <small class="text-body-secondary">
+      <%= t ".disappear_date_html", :disappear_in => friendly_date(@note.freshly_closed_until) %>

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