Reposition the note and user report flags

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index f1fdc136b502f632a2ba0b82501e35b33c09d243..f647302fba81101828872b4860f1759d5a84c1fa 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -2838,10 +2838,6 @@ input.richtext_title[type="text"] {
   width:475px;
 }
 
   width:475px;
 }
 

-.report-button {
-  float:right;
-}
-

 .report-disclaimer {
   background: #fff1f0;
   color: #d85030;
 .report-disclaimer {
   background: #fff1f0;
   color: #d85030;

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 723f9d1977e777fdd7fc225ee9d4ed5d1fad00fa..075ac6462de78eaa2da850e9ca517adc0a1655fa 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -3,11 +3,6 @@
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
   <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
   <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>

-  <% if current_user && current_user != @note.author %>
-    <%= link_to new_report_url(reportable_id: @note.id, reportable_type: @note.class.name), :title => t('browse.note.report') do %>
-        &nbsp;&#9872;
-    <% end %>
-  <% end %>

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


@@ -22,6 +17,11 @@
       <br/>
       <%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %>
     <% end %>
       <br/>
       <%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %>
     <% end %>

+    <% if current_user && current_user != @note.author %>
+      <%= link_to new_report_url(reportable_id: @note.id, reportable_type: @note.class.name), :title => t('browse.note.report') do %>
+          &nbsp;&#9872;
+      <% end %>
+    <% end %>

   </div>
 
   <% if @note_comments.find { |comment| comment.author.nil? } -%>
   </div>
 
   <% if @note_comments.find { |comment| comment.author.nil? } -%>

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index 15c60beeb3ace5c7eadae4d99adb9047a3f40319..be2e90b8a537f35d8ed0817e03752760df86a20f 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -102,6 +102,13 @@
             </li>
           <% end %>
 
             </li>
           <% end %>
 

+          <% if current_user and @this_user.id != current_user.id %>
+            <li>
+              <%= link_to new_report_url(reportable_id: @this_user.id, reportable_type: @this_user.class.name), :title => t('user.view.report') do %>
+                &nbsp;&#9872;
+              <% end %>
+            </li>
+          <% end %>

         </ul>
 
       <% end %>
         </ul>
 
       <% end %>


@@ -154,14 +161,6 @@
       </p>
     </div>
 
       </p>
     </div>
 

-    <% if current_user and @this_user.id != current_user.id %>
-      <div class="report-button">
-         <%= link_to new_report_url(reportable_id: @this_user.id, reportable_type: @this_user.class.name), :title => t('user.view.report') do %>
-            &nbsp;&#9872;
-         <% end %>
-      </div>
-    <% end %>
-

     <div class="user-description richtext"><%= @this_user.description.to_html %></div>
 
   </div>
     <div class="user-description richtext"><%= @this_user.description.to_html %></div>
 
   </div>