diff --git a/app/assets/images/switch_icon.png b/app/assets/images/switch_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7c11f20659367c4f3371c27d9f1b2a37cf89dab9 Binary files /dev/null and b/app/assets/images/switch_icon.png differ diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss index aaf9254755ad083c2115f64a8cc45ff71c72743a..12c0a17b1e096a1fd74183a8e25e37310e0e6a17 100644 --- a/app/assets/stylesheets/sections/commits.scss +++ b/app/assets/stylesheets/sections/commits.scss @@ -300,3 +300,12 @@ color: #fff; font-family: $monospace; } + + +.commits-compare-switch{ + background: url('switch_icon.png'); + width: 16px; + height: 18px; + text-indent: -9999px; + display: inline-block; +} \ No newline at end of file diff --git a/app/views/compare/_form.html.haml b/app/views/compare/_form.html.haml index 07f1c818e4d731e4ce75e3af7ec50768ae206c0c..123c1c457f8ed866e09588f8947134641ccecd9f 100644 --- a/app/views/compare/_form.html.haml +++ b/app/views/compare/_form.html.haml @@ -13,12 +13,16 @@ = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge" = "..." = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge" + - 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'} - if @refs_are_same .alert %span Refs are the same .actions = submit_tag "Compare", class: "btn primary wide commits-compare-btn" + + :javascript $(function() { var availableTags = #{@project.ref_names.to_json}; diff --git a/features/steps/project/project_browse_commits.rb b/features/steps/project/project_browse_commits.rb index 6bf164e2c8f0079478c8f5956851434926841473..2c03ce14fc199a56f8cd3cc57e9ffe174e2067e3 100644 --- a/features/steps/project/project_browse_commits.rb +++ b/features/steps/project/project_browse_commits.rb @@ -32,8 +32,8 @@ class ProjectBrowseCommits < Spinach::FeatureSteps end And 'I fill compare fields with refs' do - fill_in "from", with: "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" - fill_in "to", with: "8716fc78f3c65bbf7bcf7b574febd583bc5d2812" + fill_in "from", with: "8716fc78f3c65bbf7bcf7b574febd583bc5d2812" + fill_in "to", with: "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" click_button "Compare" end