diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-22 18:46:17 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-01 12:48:54 +0200 |
| commit | 8625bd362245cad49e268d7bcd82e987f70ba044 (patch) | |
| tree | be659547bc161f9f97f377c6f567a2286ebd0ef4 /app/views | |
| parent | b569f842b37434efd0cbae4b0c197391e0610b12 (diff) | |
| download | gitlab-ce-8625bd362245cad49e268d7bcd82e987f70ba044.tar.gz | |
Improve the request / withdraw access button18310-improve-request-access-button
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/groups/show.html.haml | 9 | ||||
| -rw-r--r-- | app/views/projects/_home_panel.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/members/_access_request_buttons.html.haml | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 69f634e75b9..a83eb7e88bb 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -15,18 +15,15 @@ %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) } = visibility_level_icon(@group.visibility_level, fw: false) - %span.hidden-xs + .group-right-buttons.btn-group + - if current_user + .pull-left.append-right-10= render 'shared/members/access_request_buttons', source: @group = render 'shared/notifications/button', notification_setting: @notification_setting - - if current_user - .pull-right - = render 'shared/members/access_request_buttons', source: @group - - if @group.description.present? .cover-desc.description = markdown(@group.description, pipeline: :description) - %div{ class: container_class } .top-area %ul.nav-links diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index 8ce23379fb4..540efa4780f 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -31,7 +31,7 @@ .project-repo-buttons.btn-group.project-right-buttons - 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/dropdown' diff --git a/app/views/shared/members/_access_request_buttons.html.haml b/app/views/shared/members/_access_request_buttons.html.haml index 480e8ba6c85..c56418f052a 100644 --- a/app/views/shared/members/_access_request_buttons.html.haml +++ b/app/views/shared/members/_access_request_buttons.html.haml @@ -7,8 +7,8 @@ = link_to 'Withdraw Access Request', polymorphic_path([:leave, source, :members]), method: :delete, data: { confirm: remove_member_message(member) }, - class: 'btn access-request-button hidden-xs' + class: 'btn' - else = link_to 'Request Access', polymorphic_path([:request_access, source, :members]), method: :post, - class: 'btn access-request-button hidden-xs' + class: 'btn' |