diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-17 19:05:49 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-17 19:05:49 +0300 |
commit | 43a25d93ebdabea52f99b05e15b06250cd8f07d7 (patch) | |
tree | dceebdc68925362117480a5d672bcff122fb625b /app/views/admin/groups/show.html.haml | |
parent | 20c84b99005abd1c82101dfeff264ac50d2df211 (diff) |
Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42
Diffstat (limited to 'app/views/admin/groups/show.html.haml')
-rw-r--r-- | app/views/admin/groups/show.html.haml | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index c8b0704c35d..4ba69126906 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -15,13 +15,12 @@ .row .col-md-6 = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-5' }, body_options: { class: 'gl-p-0' }) do |c| - - c.header do + - c.with_header do = _('Group info:') - - c.body do + - c.with_body do %ul.content-list.content-list-items-padding %li - .avatar-container.rect-avatar.s60 - = group_icon(@group, class: "avatar s60") + = render Pajamas::AvatarComponent.new(@group, size: 64, alt: '') %li %span.light= _('Name:') %strong @@ -70,10 +69,10 @@ = render_if_exists 'ldap_group_links/ldap_group_links_show', group: @group = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-5' }, body_options: { class: 'gl-p-0' }) do |c| - - c.header do + - c.with_header do = _('Projects') = gl_badge_tag @group.projects.count - - c.body do + - c.with_body do %ul.content-list.content-list-items-padding - @projects.each do |project| %li @@ -83,16 +82,16 @@ %span.float-right.light %span.monospace= project.full_path + '.git' - unless @projects.size < Kaminari.config.default_per_page - - c.footer do + - c.with_footer do = paginate @projects, param_name: 'projects_page', theme: 'gitlab' - shared_projects = @group.shared_projects.sort_by(&:name) - unless shared_projects.empty? = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-5' }, body_options: { class: 'gl-p-0' }) do |c| - - c.header do + - c.with_header do = _('Projects shared with %{group_name}') % { group_name: @group.name } = gl_badge_tag shared_projects.size - - c.body do + - c.with_body do %ul.content-list.content-list-items-padding - shared_projects.each do |project| %li @@ -109,11 +108,11 @@ = render 'shared/members/requests', membership_source: @group, group: @group, requesters: @requesters, force_mobile_view: true = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-5' }, body_options: { class: 'gl-p-0' }) do |c| - - c.header do + - c.with_header do = html_escape(_("%{group_name} group members")) % { group_name: "<strong>#{html_escape(@group.name)}</strong>".html_safe } = gl_badge_tag @group.users_count = render 'shared/members/manage_access_button', path: group_group_members_path(@group) - - c.body do + - c.with_body do %ul.content-list.group-users-list.members-list = render partial: 'shared/members/member', collection: @members, as: :member, @@ -121,5 +120,5 @@ group: @group, current_user_is_group_owner: current_user_is_group_owner } - unless @members.size < Kaminari.config.default_per_page - - c.footer do + - c.with_footer do = paginate @members, param_name: 'members_page', theme: 'gitlab' |