From e71534981850804d5653f34012687a73bfd16bee Mon Sep 17 00:00:00 2001
From: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
Date: Sun, 7 Oct 2012 11:54:38 -0300
Subject: [PATCH] Fixes on expirable edit links

---
 app/views/content_viewer/_comment.rhtml |  9 +++++----
 public/stylesheets/application.css      |  2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/views/content_viewer/_comment.rhtml b/app/views/content_viewer/_comment.rhtml
index d49bdad..403de25 100644
--- a/app/views/content_viewer/_comment.rhtml
+++ b/app/views/content_viewer/_comment.rhtml
@@ -63,6 +63,11 @@
         <% end %>
       <% end %>
 
+      <% if comment.author && comment.author == user %>
+        &nbsp;
+        <%= expirable_comment_link comment, :edit, _('Edit'), {:action => 'edit_comment', :id => comment.id, :profile => profile.identifier} %>
+      <% end %>
+
       <% if logged_in? && (user == profile || user == comment.author || user.has_permission?(:moderate_comments, profile)) %>
         &nbsp;
         <%= link_to_function(_('Remove'), 'remove_comment(this, %s, %s); return false ;' % [url_for(:profile => params[:profile], :remove_comment => comment.id, :view => params[:view]).to_json, _('Are you sure you want to remove this comment and all its replies?').to_json], :class => 'comment-footer comment-footer-link comment-footer-hide remove-children') %>
@@ -75,10 +80,6 @@
           :class => 'comment-footer comment-footer-link comment-footer-hide',
           :id => 'comment-reply-to-' + comment.id.to_s
         %>
-        <% if comment.author && comment.author == user %>
-          &nbsp;
-          <%= expirable_comment_link comment, :edit, _('Edit'), {:action => 'edit_comment', :id => comment.id, :profile => profile.identifier} %>
-        <% end %>
       <% end %>
     </div>
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 0735f1c..c20e15d 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1504,7 +1504,7 @@ body.noosfero a.button.with-text.icon-none, body.noosfero input.button.with-text
   padding-left: 2px;
 }
 a.disabled{
-  filter: url(filters.svg#grayscale); /* Firefox 3.5+ */
+  filter: url(/filters.svg#grayscale); /* Firefox 3.5+ */
   filter: gray; /* IE6-9 */
   -webkit-filter: grayscale(1); /* Google Chrome & Safari 6+ */
   cursor: default;
--
libgit2 0.21.2