diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml index 647464b31f8a995bff67013ec11863e49cca04d0..f7a02c521f56377ed545e0e0aad1606347a12eb9 100644 --- a/app/views/projects/labels/index.html.haml +++ b/app/views/projects/labels/index.html.haml @@ -11,14 +11,14 @@ .labels-container.gl-mt-5 - if can_admin_label && search.blank? %p.text-muted - = _('Labels can be applied to issues and merge requests.') - %br - = _('Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging.') + = _('Labels can be applied to issues and merge requests. Star a label to make it a priority label.') -# Only show it in the first page - hide = @available_labels.empty? || (params[:page].present? && params[:page] != '1') .prioritized-labels.gl-mb-7{ class: [('hide' if hide), ('is-not-draggable' unless can_admin_label)] } %h4.gl-mt-3= _('Prioritized Labels') + %p.text-muted + = _('Drag to reorder prioritized labels and change their relative priority.') .manage-labels-list.js-prioritized-labels{ data: { url: set_priorities_project_labels_path(@project), sortable: can_admin_label } } #js-priority-labels-empty-state.priority-labels-empty-state{ class: "#{'hidden' unless @prioritized_labels.empty? && search.blank?}" } = render 'shared/empty_states/priority_labels' diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml index 252f9c26f065c597f80495f6a8879670d91be275..c351ea29c7c9e3d411f0ec8e835c0136dbbd68f1 100644 --- a/app/views/shared/_label_row.html.haml +++ b/app/views/shared/_label_row.html.haml @@ -3,11 +3,11 @@ - show_label_issues_link = subject_or_group_defined && show_label_issuables_link?(label, :issues) - show_label_merge_requests_link = subject_or_group_defined && show_label_issuables_link?(label, :merge_requests) -.label-name.gl-flex-shrink-0.gl-mt-2.gl-mr-3 +.label-name.gl-flex-shrink-0.gl-mt-2.gl-mr-5 = render_label(label, tooltip: false) .label-description.gl-overflow-hidden.gl-w-full .gl-display-flex.gl-align-items-stretch.gl-flex-wrap.gl-mt-2 - .gl-flex-basis-half.gl-flex-grow-1.gl-overflow-hidden.gl-mr-2 + .gl-flex-basis-half.gl-flex-grow-1.gl-overflow-hidden.gl-mr-5 - if label.description.present? = markdown_field(label, :description) - elsif show_labels_full_path?(@project, @group) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 8e7d31fd88e4ac548176cc40596ea58525f439a9..b86d02d562721ea26befce2290b7fa53b91a6b69 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -13929,6 +13929,9 @@ msgstr "" msgid "Draft: %{filename}" msgstr "" +msgid "Drag to reorder prioritized labels and change their relative priority." +msgstr "" + msgid "Drag your designs here or %{linkStart}click to upload%{linkEnd}." msgstr "" @@ -22949,7 +22952,7 @@ msgstr "" msgid "Labels can be applied to issues and merge requests to categorize them." msgstr "" -msgid "Labels can be applied to issues and merge requests." +msgid "Labels can be applied to issues and merge requests. Star a label to make it a priority label." msgstr "" msgid "Labels with no issues in this iteration:" @@ -37306,9 +37309,6 @@ msgstr "" msgid "Standard" msgstr "" -msgid "Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging." -msgstr "" - msgid "Star labels to start sorting by priority" msgstr ""