Commit b072f7e1 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'milestone-form-redesign' into 'master'

Milestone form: rearrange input fields

See merge request gitlab-org/gitlab!65718
parents ce2b5a1f 36542b1d
= form_for [@group, @milestone], html: { class: 'milestone-form common-note-form js-quick-submit js-requires-input' } do |f|
= form_errors(@milestone)
.row
.col-md-6
.form-group.row
.col-form-label.col-sm-2
= f.label :title, _("Title")
.col-sm-10
= f.text_field :title, maxlength: 255, class: "form-control", data: { qa_selector: "milestone_title_field" }, required: true, autofocus: true
= render "shared/milestones/form_dates", f: f
.form-group.row.milestone-description
.col-form-label.col-sm-2
= f.label :description, _("Description")
......@@ -19,7 +18,6 @@
placeholder: _('Write milestone description...')
.clearfix
.error-alert
= render "shared/milestones/form_dates", f: f
.form-actions
- if @milestone.new_record?
......
= form_for [@project, @milestone],
html: { class: 'milestone-form common-note-form js-quick-submit js-requires-input' } do |f|
= form_errors(@milestone)
.row
.col-md-6
.form-group.row
.col-form-label.col-sm-2
= f.label :title, _('Title')
.col-sm-10
= f.text_field :title, maxlength: 255, class: 'form-control gl-form-input', data: { qa_selector: 'milestone_title_field' }, required: true, autofocus: true
= render 'shared/milestones/form_dates', f: f
.form-group.row.milestone-description
.col-form-label.col-sm-2
= f.label :description, _('Description')
......@@ -21,7 +20,6 @@
= render 'shared/notes/hints'
.clearfix
.error-alert
= render 'shared/milestones/form_dates', f: f
.form-actions
- if @milestone.new_record?
......
.col-md-6
.form-group.row
.form-group.row
.col-form-label.col-sm-2
= f.label :start_date, _('Start Date')
.col-sm-10
.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')
.form-group.row
.col-form-label.col-sm-2
= f.label :due_date, _('Due Date')
.col-sm-10
.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')
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