diff options
| author | Phil Hughes <me@iamphill.com> | 2016-06-24 12:29:42 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-07-08 14:10:32 +0100 |
| commit | 8b9a4963a4f3a9e02f77ace387d25c8ff39d937d (patch) | |
| tree | 4e75bff0e7bd88e9ba019f2a846c8756241cf773 /app/views/projects/compare/_form.html.haml | |
| parent | c160aae6269720b6c2f33de0c4b5c04000f3c745 (diff) | |
| download | gitlab-ce-8b9a4963a4f3a9e02f77ace387d25c8ff39d937d.tar.gz | |
Updated dropdowns to use field instead
Allows a bit more flexibilty and keeps the current functionality
Diffstat (limited to 'app/views/projects/compare/_form.html.haml')
| -rw-r--r-- | app/views/projects/compare/_form.html.haml | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml index ea9e99ac518..af09b3418ea 100644 --- a/app/views/projects/compare/_form.html.haml +++ b/app/views/projects/compare/_form.html.haml @@ -2,19 +2,17 @@ .clearfix - if params[:to] && params[:from] = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has-tooltip', title: 'Switch base of comparison'} - .form-group - = hidden_field_tag :from, params[:from] - .input-group.inline-input-group.compare-input-group.dropdown + .form-group.dropdown.compare-form-group.js-compare-from-dropdown + .input-group.inline-input-group %span.input-group-addon from - = dropdown_toggle h(params[:from].presence || ''), { toggle: "dropdown", refs_url: refs_namespace_project_path(@project.namespace, @project), field_name: 'from', selected: params[:from] }, { toggle_class: "js-project-refs-dropdown js-compare-dropdown" } - = render "ref_dropdown" + = text_field_tag :from, params[:from], class: "form-control js-compare-dropdown", required: true, data: { refs_url: refs_namespace_project_path(@project.namespace, @project), toggle: "dropdown", target: ".js-compare-from-dropdown", selected: params[:from].presence } + = render "ref_dropdown" = "..." - .form-group - = hidden_field_tag :to, params[:to] - .input-group.inline-input-group.compare-input-group.dropdown + .form-group.dropdown.compare-form-group.js-compare-to-dropdown + .input-group.inline-input-group %span.input-group-addon to - = dropdown_toggle h(params[:from].presence || ''), { toggle: "dropdown", refs_url: refs_namespace_project_path(@project.namespace, @project), field_name: 'to', selected: params[:to] }, { toggle_class: "js-project-refs-dropdown js-compare-dropdown" } - = render "ref_dropdown" + = text_field_tag :to, params[:to], class: "form-control js-compare-dropdown", required: true, data: { refs_url: refs_namespace_project_path(@project.namespace, @project), toggle: "dropdown", target: ".js-compare-to-dropdown", selected: params[:to].presence } + = render "ref_dropdown" = button_tag "Compare", class: "btn btn-create commits-compare-btn" - if @merge_request.present? |