Download as
Browse Code »

Commit 79840d9f3a56418f61ef362713df0a8e25abb333

Authored by Antonio Terceiro
1 parent 6d4cd0b7
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

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 14 <%= profile_image_link(membership, :portrait, 'div') %>
15 15 </div>
16 16 <span class='profile-details'>
17   - <strong><%= membership.short_name %></strong><br/>
  17 + <strong><%= membership.name %></strong><br/>
18 18 <%= _('Role: %s') % rolename_for(profile, membership) %> <br/>
19 19 <%= _('Type: %s') % getterm(membership.class.name) %> <br/>
20 20 <%= _('Description: %s') % membership.description + '<br/>' if membership.community? %>
21 21 <%= _('Members: %s') % membership.members.size.to_s %> <br/>
22 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 30 </span>
29 31 <br class="may-clear" />
30 32 </li>
... ...
public/stylesheets/controller_memberships.css
  Diff comments   View file @79840d9
... ... @@ -24,7 +24,7 @@
24 24  
25 25 #memberships-index li .profile-details {
26 26 display: block;
27   - padding: 3% 0px 3% 30px;
  27 + padding: 3% 0px 0px 30px;
28 28 }
29 29  
30 30 #memberships-index li .vcard a.profile_link.url {
... ...