Merge pull request #2315 from koenpunt/gh-issue-513

Added compare switch

Merge pull request #2315 from koenpunt/gh-issue-513
Added compare switch
Dmitriy Zaporozhets
2 parents 4b02f4a2 b2e31692
Showing 4 changed files with 15 additions and 2 deletions Show diff stats
app/assets/images/switch_icon.png
app/assets/stylesheets/sections/commits.scss
app/views/compare/_form.html.haml
features/steps/project/project_browse_commits.rb
@@ -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
@@ -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};
@@ -32,8 +32,8 @@ class ProjectBrowseCommits &lt; 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
...	...	@@ -300,3 +300,12 @@
300	300	color: #fff;
301	301	font-family: $monospace;
302	302	}
	303	+
	304	+
	305	+.commits-compare-switch{
	306	+ background: url('switch_icon.png');
	307	+ width: 16px;
	308	+ height: 18px;
	309	+ text-indent: -9999px;
	310	+ display: inline-block;
	311	+}
303	312	\ No newline at end of file
...	...
...	...	@@ -13,12 +13,16 @@
13	13	= text_field_tag :from, params[:from], placeholder: "master", class: "xlarge"
14	14	= "..."
15	15	= text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge"
	16	+ - if params[:to] && params[:from]
	17	+ = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'}
16	18	- if @refs_are_same
17	19	.alert
18	20	%span Refs are the same
19	21	.actions
20	22	= submit_tag "Compare", class: "btn primary wide commits-compare-btn"
21	23
	24	+
	25	+
22	26	:javascript
23	27	$(function() {
24	28	var availableTags = #{@project.ref_names.to_json};
...	...
...	...	@@ -32,8 +32,8 @@ class ProjectBrowseCommits < Spinach::FeatureSteps
32	32	end
33	33
34	34	And 'I fill compare fields with refs' do
35		- fill_in "from", with: "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a"
36		- fill_in "to", with: "8716fc78f3c65bbf7bcf7b574febd583bc5d2812"
	35	+ fill_in "from", with: "8716fc78f3c65bbf7bcf7b574febd583bc5d2812"
	36	+ fill_in "to", with: "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a"
37	37	click_button "Compare"
38	38	end
39	39
...	...