From e0f8e022f7c8cf73247a3918a689c10c23b19516 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 18 Mar 2015 17:53:43 -0700 Subject: [PATCH 1/4] Improve comment toggle button in diff --- app/assets/javascripts/application.js.coffee | 4 +--- app/views/projects/diffs/_file.html.haml | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index c7acde2afe..fda142293b 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -169,9 +169,7 @@ $ -> # Show/hide comments on diff $("body").on "click", ".js-toggle-diff-comments", (e) -> - $(@).find('i'). - toggleClass('fa fa-chevron-down'). - toggleClass('fa fa-chevron-up') + $(@).toggleClass('active') $(@).closest(".diff-file").find(".notes_holder").toggle() e.preventDefault() diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index a9e4d63cd9..2beb768b92 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -22,9 +22,8 @@ .diff-btn-group - if blob.text? - = link_to '#', class: 'js-toggle-diff-comments btn btn-sm' do - %i.fa.fa-chevron-down - Show/Hide comments + = link_to '#', class: 'js-toggle-diff-comments btn btn-sm active' do + %i.fa.fa-comments   - if @merge_request && @merge_request.source_project From 22038106b48f04e2834b0b4ae0bbc4c10b146517 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 18 Mar 2015 19:11:27 -0700 Subject: [PATCH 2/4] Replace show diff button with link --- app/views/projects/diffs/_stats.html.haml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/views/projects/diffs/_stats.html.haml b/app/views/projects/diffs/_stats.html.haml index d387ec2f75..1625930615 100644 --- a/app/views/projects/diffs/_stats.html.haml +++ b/app/views/projects/diffs/_stats.html.haml @@ -1,17 +1,14 @@ .js-toggle-container .commit-stat-summary Showing - %strong.cdark #{pluralize(diffs.count, "changed file")} + = link_to '#', class: 'js-toggle-button' do + %strong #{pluralize(diffs.count, "changed file")} - if current_controller?(:commit) - unless @commit.has_zero_stats? with %strong.cgreen #{@commit.stats.additions} additions and %strong.cred #{@commit.stats.deletions} deletions -   - = link_to '#', class: 'btn btn-sm js-toggle-button' do - Show diff stats - %i.fa.fa-chevron-down .file-stats.js-toggle-content.hide %ul.bordered-list - diffs.each_with_index do |diff, i| From e07d32eb418584bef4289260fcb4792d6b6ca39e Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 18 Mar 2015 19:21:24 -0700 Subject: [PATCH 3/4] Add some space aroung diff stats block --- app/views/projects/diffs/_diffs.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml index 48d4c33ce8..1747f36dcf 100644 --- a/app/views/projects/diffs/_diffs.html.haml +++ b/app/views/projects/diffs/_diffs.html.haml @@ -1,4 +1,4 @@ -.row +.row.prepend-top-20.append-bottom-10 .col-md-8 = render 'projects/diffs/stats', diffs: diffs .col-md-4 From 1cf138170c17913b180e7b3d2840ca4439c618a1 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 18 Mar 2015 20:12:19 -0700 Subject: [PATCH 4/4] Add tooltip for comment toggle in diff. Add changelog item and fix tests --- CHANGELOG | 1 + app/views/projects/diffs/_file.html.haml | 2 +- features/steps/project/merge_requests.rb | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 22f38024f9..328c672338 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ v 7.10.0 (unreleased) - Add a service to support external wikis (Hannes Rosenögger) - List new commits for newly pushed branch in activity view. - Add changelog, license and contribution guide links to project sidebar. + - Improve diff UI v 7.9.0 (unreleased) - Add HipChat integration documentation (Stan Hu) diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index 2beb768b92..860ab09634 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -22,7 +22,7 @@ .diff-btn-group - if blob.text? - = link_to '#', class: 'js-toggle-diff-comments btn btn-sm active' do + = link_to '#', class: 'js-toggle-diff-comments btn btn-sm active has_tooltip', title: "Toggle comments for this file" do %i.fa.fa-comments   diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 6e2f60972b..6f6ce439f3 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -209,13 +209,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps step 'I click link "Hide inline discussion" of the second file' do within '.files [id^=diff]:nth-child(2)' do - click_link 'Show/Hide comments' + find('.js-toggle-diff-comments').click end end step 'I click link "Show inline discussion" of the second file' do within '.files [id^=diff]:nth-child(2)' do - click_link 'Show/Hide comments' + find('.js-toggle-diff-comments').click end end