Download as
Browse Code »

Commit e71534981850804d5653f34012687a73bfd16bee

Authored by Daniela Feitosa
1 parent fc8557c3
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Fixes on expirable edit links 

Fixed reference of filters.svg image
Moved comment edit link
Showing 2 changed files with 6 additions and 5 deletions   Show diff stats
app/views/content_viewer/_comment.rhtml
  Diff comments   View file @e715349
... ... @@ -63,6 +63,11 @@
63 63 <% end %>
64 64 <% end %>
65 65  
  66 + <% if comment.author && comment.author == user %>
  67 + &nbsp;
  68 + <%= expirable_comment_link comment, :edit, _('Edit'), {:action => 'edit_comment', :id => comment.id, :profile => profile.identifier} %>
  69 + <% end %>
  70 +
66 71 <% if logged_in? && (user == profile || user == comment.author || user.has_permission?(:moderate_comments, profile)) %>
67 72 &nbsp;
68 73 <%= 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 @@
75 80 :class => 'comment-footer comment-footer-link comment-footer-hide',
76 81 :id => 'comment-reply-to-' + comment.id.to_s
77 82 %>
78   - <% if comment.author && comment.author == user %>
79   - &nbsp;
80   - <%= expirable_comment_link comment, :edit, _('Edit'), {:action => 'edit_comment', :id => comment.id, :profile => profile.identifier} %>
81   - <% end %>
82 83 <% end %>
83 84 </div>
84 85  
... ...
public/stylesheets/application.css
  Diff comments   View file @e715349
... ... @@ -1504,7 +1504,7 @@ body.noosfero a.button.with-text.icon-none, body.noosfero input.button.with-text
1504 1504 padding-left: 2px;
1505 1505 }
1506 1506 a.disabled{
1507   - filter: url(filters.svg#grayscale); /* Firefox 3.5+ */
  1507 + filter: url(/filters.svg#grayscale); /* Firefox 3.5+ */
1508 1508 filter: gray; /* IE6-9 */
1509 1509 -webkit-filter: grayscale(1); /* Google Chrome & Safari 6+ */
1510 1510 cursor: default;
... ...