diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-01-26 15:42:42 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-01-29 14:38:36 -0700 |
| commit | 0ef1a582b625f7f6f52e377fc62dc526da34cfb6 (patch) | |
| tree | e75277b93c019b4772c9920b737df1953fd6a9d5 | |
| parent | af6aaf39f996e888ecfc536a42f25610623f6e02 (diff) | |
| download | gitlab-ce-0ef1a582b625f7f6f52e377fc62dc526da34cfb6.tar.gz | |
Add modal for label deletion
| -rw-r--r-- | app/assets/stylesheets/framework/modal.scss | 4 | ||||
| -rw-r--r-- | app/views/shared/_delete_label_modal.html.haml | 20 | ||||
| -rw-r--r-- | app/views/shared/_label.html.haml | 9 |
3 files changed, 30 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index 32b9894ae04..5438a4fa207 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -4,6 +4,10 @@ .page-title { margin-top: 0; + + .label { + font-size: initial; + } } } diff --git a/app/views/shared/_delete_label_modal.html.haml b/app/views/shared/_delete_label_modal.html.haml new file mode 100644 index 00000000000..f29c8f00d52 --- /dev/null +++ b/app/views/shared/_delete_label_modal.html.haml @@ -0,0 +1,20 @@ +.modal{ id: "modal-delete-label-#{label.id}", tabindex: -1 } + .modal-dialog + .modal-content + .modal-header + %button.close{ data: {dismiss: 'modal' } } × + %h3.page-title Delete #{render_colored_label(label, tooltip: false)} ? + + .modal-body + %p + %strong #{label.name} + will be permanently deleted from #{label.group.name}. This cannot be undone. + + .modal-footer + %a{ href: '#', data: { dismiss: 'modal' }, class: 'btn btn-default' } Cancel + + = link_to 'Delete label', + destroy_label_path(label), + title: 'Delete', + method: :delete, + class: 'btn btn-remove' diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml index 6a103f56706..dd9b4b4db44 100644 --- a/app/views/shared/_label.html.haml +++ b/app/views/shared/_label.html.haml @@ -55,9 +55,10 @@ = link_to edit_label_path(label), title: "Edit", class: 'btn btn-transparent btn-action', data: {toggle: "tooltip"} do %span.sr-only Edit = sprite_icon('pencil') - = link_to destroy_label_path(label), title: "Delete", class: 'btn btn-transparent btn-action remove-row', method: :delete, data: {confirm: label_deletion_confirm_text(label), toggle: "tooltip"} do - %span.sr-only Delete - = sprite_icon('remove') + %span{ data: { toggle: 'modal', target: "#modal-delete-label-#{label.id}" } } + = link_to "#", title: "Delete", class: 'btn btn-transparent btn-action remove-row', data: { toggle: "tooltip" } do + %span.sr-only Delete + = sprite_icon('remove') - if current_user .label-subscription.inline - if can_subscribe_to_label_in_different_levels?(label) @@ -79,3 +80,5 @@ %button.js-subscribe-button.label-subscribe-button.btn.btn-default{ type: 'button', data: { status: status, url: toggle_subscription_path } } %span= label_subscription_toggle_button_text(label, @project) = icon('spinner spin', class: 'label-subscribe-button-loading') + += render 'shared/delete_label_modal', label: label |