Download as
Browse Code »

Commit b804a1e05b6b38087c2122f341c13e0c943c1310

Authored by AurelioAHeckert
1 parent d97b2e18
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

ActionItem657: destroy word reviewed 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2481 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 8 additions and 3 deletions   Show diff stats
app/views/memberships/destroy_community.rhtml
  Diff comments   View file @b804a1e
1 -<h1><%= _('Destroy %s') % @community.short_name %></h1> 1 +<h1><%= _('To remove %s') % @community.short_name %></h1>
2 2
3 -<p><strong><%= _('Are you sure you want to destroy %s?') % @community.short_name %></strong></p> 3 +<p><strong><%= _('Are you sure you want to <u>destroy</u> "%s"?') % content_tag( 'i', @community.name ) %></strong></p>
4 4
5 <% form_tag do %> 5 <% form_tag do %>
6 <%= hidden_field_tag(:confirmation, 1) %> 6 <%= hidden_field_tag(:confirmation, 1) %>
app/views/memberships/index.rhtml
  Diff comments   View file @b804a1e
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <%= _('Created at: %s') % show_date(membership.created_at) %> <br/> 17 <%= _('Created at: %s') % show_date(membership.created_at) %> <br/>
18 <%= [ link_to(_('Manage'), membership.admin_url), 18 <%= [ link_to(_('Manage'), membership.admin_url),
19 link_to(_('Leave'), { :profile => profile.identifier, :controller => 'memberships', :action => 'leave', :id => membership }), 19 link_to(_('Leave'), { :profile => profile.identifier, :controller => 'memberships', :action => 'leave', :id => membership }),
20 - (membership.community? && user.has_permission?(:destroy_profile, membership) ? link_to(_('Destroy'), { :action => 'destroy_community', :id => membership }) : nil) 20 + (membership.community? && user.has_permission?(:destroy_profile, membership) ? link_to(_('Remove'), { :action => 'destroy_community', :id => membership }) : nil)
21 ].compact.join(', ') 21 ].compact.join(', ')
22 %> 22 %>
23 </span> 23 </span>
public/stylesheets/controller_memberships.css
  Diff comments   View file @b804a1e
@@ -35,3 +35,8 @@ @@ -35,3 +35,8 @@
35 #memberships-index li .vcard a.profile_link.url:hover { 35 #memberships-index li .vcard a.profile_link.url:hover {
36 border: 2px solid #2A5896; 36 border: 2px solid #2A5896;
37 } 37 }
  38 +
  39 +.action_memberships_destroy_community .main-block u {
  40 + text-decoration: none;
  41 + border-bottom: 1px dotted red;
  42 +}