diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/views/shared/milestones | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/views/shared/milestones')
5 files changed, 35 insertions, 24 deletions
diff --git a/app/views/shared/milestones/_form_dates.html.haml b/app/views/shared/milestones/_form_dates.html.haml index e0664c1feba..7a41e381a96 100644 --- a/app/views/shared/milestones/_form_dates.html.haml +++ b/app/views/shared/milestones/_form_dates.html.haml @@ -1,13 +1,11 @@ -.col-md-6 - .form-group.row - .col-form-label.col-sm-2 - = f.label :start_date, _('Start Date') - .col-sm-10 - = f.text_field :start_date, class: "datepicker form-control gl-form-input", data: { qa_selector: "start_date_field" }, placeholder: _('Select start date'), autocomplete: 'off' - %a.inline.float-right.gl-mt-2.js-clear-start-date{ href: "#" }= _('Clear start date') - .form-group.row - .col-form-label.col-sm-2 - = f.label :due_date, _('Due Date') - .col-sm-10 - = f.text_field :due_date, class: "datepicker form-control gl-form-input", data: { qa_selector: "due_date_field" }, placeholder: _('Select due date'), autocomplete: 'off' - %a.inline.float-right.gl-mt-2.js-clear-due-date{ href: "#" }= _('Clear due date') +.form-group.row + .col-form-label.col-sm-2 + = f.label :start_date, _('Start Date') + .col-sm-4 + = f.text_field :start_date, class: "datepicker form-control gl-form-input", data: { qa_selector: "start_date_field" }, placeholder: _('Select start date'), autocomplete: 'off' + %a.inline.float-right.gl-mt-2.js-clear-start-date{ href: "#" }= _('Clear start date') + .col-form-label.col-sm-2 + = f.label :due_date, _('Due Date') + .col-sm-4 + = f.text_field :due_date, class: "datepicker form-control gl-form-input", data: { qa_selector: "due_date_field" }, placeholder: _('Select due date'), autocomplete: 'off' + %a.inline.float-right.gl-mt-2.js-clear-due-date{ href: "#" }= _('Clear due date') diff --git a/app/views/shared/milestones/_issuable.html.haml b/app/views/shared/milestones/_issuable.html.haml index 184904dd7ab..12380d4c34e 100644 --- a/app/views/shared/milestones/_issuable.html.haml +++ b/app/views/shared/milestones/_issuable.html.haml @@ -25,3 +25,5 @@ = link_to polymorphic_path(issuable_type_args, { milestone_title: @milestone.title, assignee_id: assignee.id, state: 'all' }), class: 'has-tooltip', title: _("Assigned to %{assignee_name}") % { assignee_name: assignee.name }, data: { container: 'body' } do - image_tag(avatar_icon_for_user(assignee, 16), class: "avatar s16", alt: '') + + = render_if_exists "shared/milestones/issuable_weight", issuable: issuable diff --git a/app/views/shared/milestones/_issuables.html.haml b/app/views/shared/milestones/_issuables.html.haml index 9147e1c50e3..460ddd0897c 100644 --- a/app/views/shared/milestones/_issuables.html.haml +++ b/app/views/shared/milestones/_issuables.html.haml @@ -4,11 +4,15 @@ .card .card-header{ class: panel_class } - .title - = title - - if show_counter - .counter - = number_with_delimiter(issuables.length) + .header.gl-mb-2 + .title + = title + .issuable-count-weight.gl-ml-3 + - if show_counter + %span.counter + = sprite_icon('issues', css_class: 'gl-vertical-align-text-bottom') + = number_with_delimiter(issuables.length) + = render_if_exists "shared/milestones/issuables_weight", issuables: issuables - class_prefix = dom_class(issuables).pluralize %ul{ class: "content-list milestone-#{class_prefix}-list", id: "#{class_prefix}-list-#{id}" } diff --git a/app/views/shared/milestones/_milestone_complete_alert.html.haml b/app/views/shared/milestones/_milestone_complete_alert.html.haml new file mode 100644 index 00000000000..1c25fae747e --- /dev/null +++ b/app/views/shared/milestones/_milestone_complete_alert.html.haml @@ -0,0 +1,10 @@ +- milestone = local_assigns[:milestone] + +- if milestone.complete? && milestone.active? + = render 'shared/global_alert', + variant: :success, + is_contained: true, + alert_data: { testid: 'all-issues-closed-alert' }, + dismissible: false do + .gl-alert-body + = yield diff --git a/app/views/shared/milestones/_top.html.haml b/app/views/shared/milestones/_top.html.haml index c37fdf0c98f..2709a39c475 100644 --- a/app/views/shared/milestones/_top.html.haml +++ b/app/views/shared/milestones/_top.html.haml @@ -5,11 +5,8 @@ = render 'shared/milestones/header', milestone: milestone = render 'shared/milestones/description', milestone: milestone - -- if milestone.complete? && milestone.active? - .gl-alert.gl-alert-success.gl-mt-3 - %span - = _('All issues for this milestone are closed.') - = group ? _('You may close the milestone now.') : _('Navigate to the project to close the milestone.') += render 'shared/milestones/milestone_complete_alert', milestone: milestone do + = _('All issues for this milestone are closed.') + = group ? _('You may close the milestone now.') : _('Navigate to the project to close the milestone.') = render_if_exists 'shared/milestones/burndown', milestone: milestone, project: @project |