diff options
| author | Arinde Eniola <eniolaarinde1@gmail.com> | 2016-04-01 18:41:36 +0100 |
|---|---|---|
| committer | Arinde Eniola <eniolaarinde1@gmail.com> | 2016-04-06 20:27:30 +0100 |
| commit | 0b5ff4714caeedf359ed5a2477bada693ccb24a9 (patch) | |
| tree | d5c1f1cb3afbd4f6b4fae513e5c4781fda5eb4f5 /app/views | |
| parent | 452d1d4a8c3778f056c6c1e91e848ca6bd031edc (diff) | |
| download | gitlab-ce-0b5ff4714caeedf359ed5a2477bada693ccb24a9.tar.gz | |
change the subscribe, delete and edit buttons to icons
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/labels/_label.html.haml | 17 | ||||
| -rw-r--r-- | app/views/shared/_label_row.html.haml | 3 |
2 files changed, 12 insertions, 8 deletions
diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml index 0612863296a..5e2dd8ac61e 100644 --- a/app/views/projects/labels/_label.html.haml +++ b/app/views/projects/labels/_label.html.haml @@ -2,23 +2,26 @@ = render "shared/label_row", label: label .pull-right - %strong.append-right-20 + %span.append-right-20 = link_to_label(label, type: :merge_request) do - = pluralize label.open_merge_requests_count, 'open merge request' + = pluralize label.open_merge_requests_count, 'merge request' - %strong.append-right-20 + %span.append-right-20 = link_to_label(label) do = pluralize label.open_issues_count(current_user), 'open issue' - if current_user .label-subscription{data: {url: toggle_subscription_namespace_project_label_path(@project.namespace, @project, label)}} .subscription-status{data: {status: label_subscription_status(label)}} - %button.btn.btn-sm.btn-info.subscribe-button - %span= label_subscription_toggle_button_text(label) + + %a.subscribe-button.action-buttons{data: {toggle: "tooltip", original_title: label_subscription_toggle_button_text(label)}} + %i.fa.fa-rss - 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?"} + = link_to edit_namespace_project_label_path(@project.namespace, @project, label), class: 'action-buttons', data: {toggle: "tooltip", original_title: "Edit"} do + %i.fa.fa-pencil-square-o + = link_to namespace_project_label_path(@project.namespace, @project, label), class: 'action-buttons remove-row', method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?", toggle: "tooltip", original_title: "Delete"} do + %i.fa.fa-trash-o - if current_user :javascript diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml index 4b47b0291be..b38c5e18efb 100644 --- a/app/views/shared/_label_row.html.haml +++ b/app/views/shared/_label_row.html.haml @@ -1,4 +1,5 @@ %span.label-row - = link_to_label(label, tooltip: false) + %span.label-name + = link_to_label(label, tooltip: false) %span.prepend-left-10 = markdown(label.description, pipeline: :single_line) |