summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-07-31 12:28:52 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-07-31 12:46:37 +0300
commit5137df53450f26046da7bf73fee0e8bfbc8dff9f (patch)
tree967493dd9bdc0ad702e262ffda74c02ffe8c58b4
parentf128cdb8962e3a92ec9cb956c3aa674d7dc10ba5 (diff)
downloadgitlab-ce-5137df53450f26046da7bf73fee0e8bfbc8dff9f.tar.gz
Make few minor styling changes to project labels page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/views/projects/labels/index.html.haml12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index 64324078de1..80d64b356df 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -15,20 +15,20 @@
.top-area.adjust
.nav-text
= _('Labels can be applied to issues and merge requests.')
- - if can_admin_label
- %br
- = _('Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging.')
.nav-controls
= form_tag project_labels_path(@project), method: :get do
.input-group
= search_field_tag :search, params[:search], { placeholder: _('Filter'), id: 'label-search', class: 'form-control search-text-input input-short', spellcheck: false }
%span.input-group-append
- %button.btn{ type: "submit", "aria-label" => "Submit search" }
+ %button.btn.btn-default{ type: "submit", "aria-label" => _('Submit search') }
= icon("search")
.labels-container.prepend-top-10
- if can_admin_label
+ %p.text-muted
+ = _('Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging.')
+
-# Only show it in the first page
- hide = @available_labels.empty? || (params[:page].present? && params[:page] != '1')
.prioritized-labels{ class: ('hide' if hide) }
@@ -40,7 +40,7 @@
= render partial: 'shared/label', subject: @project, collection: @prioritized_labels, as: :label, locals: { force_priority: true }
- elsif search.present?
.nothing-here-block
- = _('No labels with such name or description')
+ = _('No prioritised labels with such name or description')
- if @labels.present?
.other-labels
@@ -55,7 +55,7 @@
%h5
= _('Other Labels')
.nothing-here-block
- = _('No labels with such name or description')
+ = _('No other labels with such name or description')
- else
= render 'shared/empty_states/labels'