Download as
Browse Code »

Commit 79840d9f3a56418f61ef362713df0a8e25abb333

Authored by Antonio Terceiro
1 parent 6d4cd0b7
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Adding proper buttons in "My groups" screen 

(ActionItem1405)
Showing 2 changed files with 9 additions and 7 deletions   Show diff stats
app/views/memberships/index.rhtml
  Diff comments   View file @79840d9
@@ -14,17 +14,19 @@ @@ -14,17 +14,19 @@
14 <%= profile_image_link(membership, :portrait, 'div') %> 14 <%= profile_image_link(membership, :portrait, 'div') %>
15 </div> 15 </div>
16 <span class='profile-details'> 16 <span class='profile-details'>
17 - <strong><%= membership.short_name %></strong><br/> 17 + <strong><%= membership.name %></strong><br/>
18 <%= _('Role: %s') % rolename_for(profile, membership) %> <br/> 18 <%= _('Role: %s') % rolename_for(profile, membership) %> <br/>
19 <%= _('Type: %s') % getterm(membership.class.name) %> <br/> 19 <%= _('Type: %s') % getterm(membership.class.name) %> <br/>
20 <%= _('Description: %s') % membership.description + '<br/>' if membership.community? %> 20 <%= _('Description: %s') % membership.description + '<br/>' if membership.community? %>
21 <%= _('Members: %s') % membership.members.size.to_s %> <br/> 21 <%= _('Members: %s') % membership.members.size.to_s %> <br/>
22 <%= _('Created at: %s') % show_date(membership.created_at) unless membership.enterprise? %> <br/> 22 <%= _('Created at: %s') % show_date(membership.created_at) unless membership.enterprise? %> <br/>
23 - <%= [ link_to(_('Manage'), membership.admin_url),  
24 - lightbox_link_to(_('Leave'), membership.leave_url),  
25 - (membership.community? && user.has_permission?(:destroy_profile, membership) ? link_to(_('Remove'), { :action => 'destroy_community', :id => membership }) : nil)  
26 - ].compact.join(', ')  
27 - %> 23 + <% button_bar do %>
  24 + <%= button 'menu-ctrl-panel', _('Control panel of this group'), membership.admin_url %>
  25 + <%= lightbox_button 'menu-logout', _('Leave'), membership.leave_url %>
  26 + <% if (membership.community? && user.has_permission?(:destroy_profile, membership)) %>
  27 + <%= button 'delete', _('Remove'), { :action => 'destroy_community', :id => membership } %>
  28 + <% end %>
  29 + <% end %>
28 </span> 30 </span>
29 <br class="may-clear" /> 31 <br class="may-clear" />
30 </li> 32 </li>
public/stylesheets/controller_memberships.css
  Diff comments   View file @79840d9
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 24
25 #memberships-index li .profile-details { 25 #memberships-index li .profile-details {
26 display: block; 26 display: block;
27 - padding: 3% 0px 3% 30px; 27 + padding: 3% 0px 0px 30px;
28 } 28 }
29 29
30 #memberships-index li .vcard a.profile_link.url { 30 #memberships-index li .vcard a.profile_link.url {