Move note reporting link to bottom of the sidebar

Move the 'report this note' and surrounding sentence down the sidebar beneath the commont/resolve form to give it less prominence.

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 1f80a9b5b520c08029d9965e273b92b731ec1429..cd3ae4889ee489e04827a47d337f722668bf088c 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -841,6 +841,10 @@ tr.turn:hover {
     }
   }
 
+  form.note-comment-resolve {
+    margin: 10px 0px 40px 0px;
+  }
+
   .subscribe-buttons input {
     font-size: 90%;
     line-height: 15px;

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 24240d6df93250d22b3e792306b311e258f7adc0..0706dbb464c1abfa33c9cd22328c9b66fc076038 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -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"><%= t "javascripts.notes.show.report_link_html", :link => 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="note-comment-resolve" 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="note-comment-resolve" 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 class="text-muted"><%= t "javascripts.notes.show.report_link_html", :link => report_link(t(".report"), @note) %></p>
+  <% end %>
 </div>