Commit a5fa8228 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'gt-update-project-and-group-labels-empty-state' into 'master'

Update project and group labels empty state

See merge request gitlab-org/gitlab-ce!22745
parents f702b39a 5abba8bf
...@@ -348,6 +348,7 @@ ...@@ -348,6 +348,7 @@
@include media-breakpoint-down(xs) { @include media-breakpoint-down(xs) {
width: 100%; width: 100%;
margin: $btn-side-margin 0;
} }
} }
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
- subscribed = params[:subscribed] - subscribed = params[:subscribed]
- labels_or_filters = @labels.exists? || search.present? || subscribed.present? - labels_or_filters = @labels.exists? || search.present? || subscribed.present?
- if can_admin_label - if @labels.present? && can_admin_label
- content_for(:header_content) do - content_for(:header_content) do
.nav-controls .nav-controls
= link_to _('New label'), new_group_label_path(@group), class: "btn btn-success" = link_to _('New label'), new_group_label_path(@group), class: "btn btn-success"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
- subscribed = params[:subscribed] - subscribed = params[:subscribed]
- labels_or_filters = @labels.exists? || @prioritized_labels.exists? || search.present? || subscribed.present? - labels_or_filters = @labels.exists? || @prioritized_labels.exists? || search.present? || subscribed.present?
- if can_admin_label - if @labels.present? && can_admin_label
- content_for(:header_content) do - content_for(:header_content) do
.nav-controls .nav-controls
= link_to _('New label'), new_project_label_path(@project), class: "btn btn-success qa-label-create-new" = link_to _('New label'), new_project_label_path(@project), class: "btn btn-success qa-label-create-new"
......
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
.text-content .text-content
%h4= _("Labels can be applied to issues and merge requests to categorize them.") %h4= _("Labels can be applied to issues and merge requests to categorize them.")
%p= _("You can also star a label to make it a priority label.") %p= _("You can also star a label to make it a priority label.")
- if can?(current_user, :admin_label, @project) .text-center
= link_to _('New label'), new_project_label_path(@project), class: 'btn btn-success', title: _('New label'), id: 'new_label_link' - if can?(current_user, :admin_label, @project)
= link_to _('Generate a default set of labels'), generate_project_labels_path(@project), method: :post, class: 'btn btn-success btn-inverted', title: _('Generate a default set of labels'), id: 'generate_labels_link' = link_to _('New label'), new_project_label_path(@project), class: 'btn btn-success', title: _('New label'), id: 'new_label_link'
= link_to _('Generate a default set of labels'), generate_project_labels_path(@project), method: :post, class: 'btn btn-success btn-inverted', title: _('Generate a default set of labels'), id: 'generate_labels_link'
- if can?(current_user, :admin_label, @group)
= link_to _('New label'), new_group_label_path(@group), class: 'btn btn-success', title: _('New label'), id: 'new_label_link'
---
title: Update project and group labels empty state
merge_request: 22745
author: George Tsiolis
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment