diff options
| author | André Luís <me@andr3.net> | 2018-08-07 10:56:17 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-08-07 10:56:17 +0000 |
| commit | 4ed7fa94453068285cbfbb6c2d4bb91ef9df3833 (patch) | |
| tree | 49c9a2c9f931745c13713f276a0207aa1badd42b /app/views/admin/labels | |
| parent | 6b2b89f3cdb949b2001218b386bbc922166e4d4e (diff) | |
| download | gitlab-ce-4ed7fa94453068285cbfbb6c2d4bb91ef9df3833.tar.gz | |
Resolve "System level labels UI broken"
Diffstat (limited to 'app/views/admin/labels')
| -rw-r--r-- | app/views/admin/labels/_label.html.haml | 14 | ||||
| -rw-r--r-- | app/views/admin/labels/index.html.haml | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/app/views/admin/labels/_label.html.haml b/app/views/admin/labels/_label.html.haml index c3ea2352898..dbb7224f5f9 100644 --- a/app/views/admin/labels/_label.html.haml +++ b/app/views/admin/labels/_label.html.haml @@ -1,7 +1,7 @@ -%li{ id: dom_id(label) } - .label-row - = render_colored_label(label, tooltip: false) - = markdown_field(label, :description) - .float-right - = link_to _('Edit'), edit_admin_label_path(label), class: 'btn btn-sm' - = link_to _('Delete'), admin_label_path(label), class: 'btn btn-sm btn-remove remove-row', method: :delete, remote: true, data: {confirm: "Delete this label? Are you sure?"} +%li.label-list-item{ id: dom_id(label) } + = render "shared/label_row", label: label + .label-actions-list + = link_to edit_admin_label_path(label), class: 'btn btn-transparent label-action has-tooltip', title: _('Edit'), data: { placement: 'bottom' }, aria_label: _('Edit') do + = sprite_icon('pencil') + = link_to admin_label_path(label), class: 'btn btn-transparent remove-row label-action has-tooltip', title: _('Delete'), data: { placement: 'bottom', confirm: "Delete this label? Are you sure?" }, aria_label: _('Delete'), method: :delete, remote: true do + = sprite_icon('remove') diff --git a/app/views/admin/labels/index.html.haml b/app/views/admin/labels/index.html.haml index d3e5247447a..f1b8658f84e 100644 --- a/app/views/admin/labels/index.html.haml +++ b/app/views/admin/labels/index.html.haml @@ -7,10 +7,11 @@ = _('Labels') %hr -.labels +.labels.labels-container.admin-labels - if @labels.present? - %ul.bordered-list.manage-labels-list + %ul.manage-labels-list = render @labels + = paginate @labels, theme: 'gitlab' - else .card.bg-light |