diff options
| author | Tap <visibletrap@gmail.com> | 2016-02-19 13:34:45 +0800 |
|---|---|---|
| committer | Tap <visibletrap@gmail.com> | 2016-02-19 13:50:56 +0800 |
| commit | c48ac79c18dfe85d6e3907b3006b61238d8900a4 (patch) | |
| tree | 88dca10ce47c9db891683427d4e1192fd7d2c67a | |
| parent | 44a9e260490c8905a15515b70a63425163b3fb67 (diff) | |
| download | gitlab-ce-c48ac79c18dfe85d6e3907b3006b61238d8900a4.tar.gz | |
Pull right side of label row out
| -rw-r--r-- | app/views/projects/labels/_label.html.haml | 11 | ||||
| -rw-r--r-- | app/views/shared/_label_row.html.haml | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml index 3d9118892ff..5b35acc66c0 100644 --- a/app/views/projects/labels/_label.html.haml +++ b/app/views/projects/labels/_label.html.haml @@ -1,2 +1,11 @@ %li{id: dom_id(label)} - = render "shared/label_row", label: label, editable: true + = render "shared/label_row", label: label + + .pull-right + %strong.append-right-20 + = link_to_label(label) do + = pluralize label.open_issues_count, 'open issue' + + - if can? current_user, :admin_label, @project + = link_to 'Edit', edit_namespace_project_label_path(@project.namespace, @project, label), class: 'btn btn-sm' + = link_to 'Delete', namespace_project_label_path(@project.namespace, @project, label), class: 'btn btn-sm btn-remove remove-row', method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?"} diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml index ca74cc3977b..8134b15d245 100644 --- a/app/views/shared/_label_row.html.haml +++ b/app/views/shared/_label_row.html.haml @@ -1,13 +1,4 @@ -.label-row +%span.label-row = link_to_label(label) %span.prepend-left-10 = markdown(label.description, pipeline: :single_line) - - .pull-right - %strong.append-right-20 - = link_to_label(label) do - = pluralize label.open_issues_count, 'open issue' - - - if defined?(editable) && editable && can?(current_user, :admin_label, @project) - = link_to 'Edit', edit_namespace_project_label_path(@project.namespace, @project, label), class: 'btn btn-sm' - = link_to 'Delete', namespace_project_label_path(@project.namespace, @project, label), class: 'btn btn-sm btn-remove remove-row', method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?"} |