Commit 8625bd36 authored by Rémy Coutable's avatar Rémy Coutable

Improve the request / withdraw access button

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent b569f842
...@@ -31,8 +31,9 @@ v 8.10.0 (unreleased) ...@@ -31,8 +31,9 @@ v 8.10.0 (unreleased)
- Add basic system information like memory and disk usage to the admin panel - Add basic system information like memory and disk usage to the admin panel
v 8.9.5 (unreleased) v 8.9.5 (unreleased)
- Fix assigning shared runners as admins - Improve the request / withdraw access button. !4860
- Show "locked" label for locked runners on runners admin - Fix assigning shared runners as admins. !4961
- Show "locked" label for locked runners on runners admin. !4961
v 8.9.4 v 8.9.4
- Fix privilege escalation issue with OAuth external users. - Fix privilege escalation issue with OAuth external users.
......
...@@ -71,6 +71,10 @@ ...@@ -71,6 +71,10 @@
display: none; display: none;
} }
.group-right-buttons {
display: none;
}
.container .title { .container .title {
padding-left: 15px !important; padding-left: 15px !important;
} }
......
...@@ -41,14 +41,17 @@ ...@@ -41,14 +41,17 @@
} }
.groups-cover-block { .groups-cover-block {
.container-fluid { .container-fluid {
position: relative; position: relative;
} }
.access-request-button { .group-right-buttons {
position: absolute;
right: 16px;
.btn {
@include btn-gray; @include btn-gray;
margin-right: 10px; padding: 3px 10px;
text-transform: none; background-color: $background-color;
}
} }
} }
...@@ -266,18 +266,6 @@ ...@@ -266,18 +266,6 @@
@media (max-width: $screen-md-max) { @media (max-width: $screen-md-max) {
top: 0; top: 0;
} }
.access-request-button {
position: absolute;
right: 0;
bottom: 61px;
@media (max-width: $screen-md-max) {
position: relative;
bottom: 0;
margin-right: 10px;
}
}
} }
@media (max-width: $screen-md-max) { @media (max-width: $screen-md-max) {
......
...@@ -15,18 +15,15 @@ ...@@ -15,18 +15,15 @@
%span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) } %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) }
= visibility_level_icon(@group.visibility_level, fw: false) = visibility_level_icon(@group.visibility_level, fw: false)
%span.hidden-xs .group-right-buttons.btn-group
= render 'shared/notifications/button', notification_setting: @notification_setting
- if current_user - if current_user
.pull-right .pull-left.append-right-10= render 'shared/members/access_request_buttons', source: @group
= render 'shared/members/access_request_buttons', source: @group = render 'shared/notifications/button', notification_setting: @notification_setting
- if @group.description.present? - if @group.description.present?
.cover-desc.description .cover-desc.description
= markdown(@group.description, pipeline: :description) = markdown(@group.description, pipeline: :description)
%div{ class: container_class } %div{ class: container_class }
.top-area .top-area
%ul.nav-links %ul.nav-links
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
.project-repo-buttons.btn-group.project-right-buttons .project-repo-buttons.btn-group.project-right-buttons
- if current_user - if current_user
= render 'shared/members/access_request_buttons', source: @project .pull-left.append-right-10= render 'shared/members/access_request_buttons', source: @project
= render "projects/buttons/download" = render "projects/buttons/download"
= render 'projects/buttons/dropdown' = render 'projects/buttons/dropdown'
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
= link_to 'Withdraw Access Request', polymorphic_path([:leave, source, :members]), = link_to 'Withdraw Access Request', polymorphic_path([:leave, source, :members]),
method: :delete, method: :delete,
data: { confirm: remove_member_message(member) }, data: { confirm: remove_member_message(member) },
class: 'btn access-request-button hidden-xs' class: 'btn'
- else - else
= link_to 'Request Access', polymorphic_path([:request_access, source, :members]), = link_to 'Request Access', polymorphic_path([:request_access, source, :members]),
method: :post, method: :post,
class: 'btn access-request-button hidden-xs' class: 'btn'
...@@ -51,7 +51,7 @@ If necessary, you can increase the access level of an individual user for a spec ...@@ -51,7 +51,7 @@ If necessary, you can increase the access level of an individual user for a spec
![Barry effectively has 'Master' access to GitLab CI now](groups/override_access_level.png) ![Barry effectively has 'Master' access to GitLab CI now](groups/override_access_level.png)
## Request access to a group ## Requesting access to a group
As a user, you can request to be a member of a group. Go to the group you'd As a user, you can request to be a member of a group. Go to the group you'd
like to be a member of, and click the **Request Access** button on the right like to be a member of, and click the **Request Access** button on the right
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment