Merge pull request #3581 from harry-wood/discourage-note-report

Wording to discourage note reporting
This commit is contained in:
Andy Allan 2022-08-03 18:38:36 +01:00 committed by GitHub
commit 9db0808870
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions

View file

@ -28,10 +28,6 @@
<p class='alert alert-warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
<% end -%>
<% if current_user && current_user != @note.author %>
<p class="text-muted"><%= report_link(t(".report"), @note) %></p>
<% end %>
<% if @note_comments.length > 1 %>
<div class='note-comments'>
<ul class="list-unstyled">
@ -47,7 +43,7 @@
<% if @note.status == "open" %>
<% if current_user -%>
<form action="#">
<form class="mb-3" action="#">
<div class="mb-3">
<textarea class="form-control" name="text" cols="40" rows="5" maxlength="2000"></textarea>
</div>
@ -61,7 +57,7 @@
</form>
<% end -%>
<% else %>
<form action="#">
<form class="mb-3" action="#">
<input type="hidden" name="text" value="" autocomplete="off">
<div class="btn-wrapper">
<% if current_user and current_user.moderator? -%>
@ -73,4 +69,8 @@
</div>
</form>
<% end %>
<% if current_user && current_user != @note.author %>
<p><small class="text-muted"><%= t "javascripts.notes.show.report_link_html", :link => report_link(t(".report"), @note) %></small></p>
<% end %>
</div>