Download as
Browse Code »

Commit e71534981850804d5653f34012687a73bfd16bee

Authored by Daniela Feitosa
1 parent fc8557c3
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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,6 +63,11 @@
63 <% end %> 63 <% end %>
64 <% end %> 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 <% if logged_in? && (user == profile || user == comment.author || user.has_permission?(:moderate_comments, profile)) %> 71 <% if logged_in? && (user == profile || user == comment.author || user.has_permission?(:moderate_comments, profile)) %>
67 &nbsp; 72 &nbsp;
68 <%= 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') %> 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,10 +80,6 @@
75 :class => 'comment-footer comment-footer-link comment-footer-hide', 80 :class => 'comment-footer comment-footer-link comment-footer-hide',
76 :id => 'comment-reply-to-' + comment.id.to_s 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 <% end %> 83 <% end %>
83 </div> 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,7 +1504,7 @@ body.noosfero a.button.with-text.icon-none, body.noosfero input.button.with-text
1504 padding-left: 2px; 1504 padding-left: 2px;
1505 } 1505 }
1506 a.disabled{ 1506 a.disabled{
1507 - filter: url(filters.svg#grayscale); /* Firefox 3.5+ */ 1507 + filter: url(/filters.svg#grayscale); /* Firefox 3.5+ */
1508 filter: gray; /* IE6-9 */ 1508 filter: gray; /* IE6-9 */
1509 -webkit-filter: grayscale(1); /* Google Chrome & Safari 6+ */ 1509 -webkit-filter: grayscale(1); /* Google Chrome & Safari 6+ */
1510 cursor: default; 1510 cursor: default;