Download as
Browse Code »

Commit 3befe6ec339651feedc8437b5bb10d473c3e3f66

Authored by Dmitriy Zaporozhets
1 parent fefa10c3
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Fix show/hide discussion link 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 1 changed file with 5 additions and 16 deletions   Show diff stats
app/views/projects/notes/_discussion.html.haml
  Diff comments   View file @3befe6e
1 - note = discussion_notes.first 1 - note = discussion_notes.first
2 -.discussion.js-details-container.js-toggler-container.open{ class: note.discussion_id } 2 +.discussion.js-toggle-container{ class: note.discussion_id }
3 .discussion-header 3 .discussion-header
4 .discussion-actions 4 .discussion-actions
5 - = link_to "javascript:;", class: "js-details-target turn-on js-toggler-target" do  
6 - %i.icon-eye-close  
7 - Hide discussion  
8 - = link_to "javascript:;", class: "js-details-target turn-off js-toggler-target" do  
9 - %i.icon-eye-open  
10 - Show discussion 5 + = link_to "#", class: "js-toggle-button" do
  6 + %i.icon-chevron-up
  7 + Show/hide discussion
11 = image_tag avatar_icon(note.author_email), class: "avatar s32" 8 = image_tag avatar_icon(note.author_email), class: "avatar s32"
12 %div 9 %div
13 = link_to_member(@project, note.author, avatar: false) 10 = link_to_member(@project, note.author, avatar: false)
@@ -33,7 +30,7 @@ @@ -33,7 +30,7 @@
33 = link_to_member(@project, last_note.author, avatar: false) 30 = link_to_member(@project, last_note.author, avatar: false)
34 %span.discussion-last-update 31 %span.discussion-last-update
35 #{time_ago_with_tooltip(last_note.updated_at, 'bottom', 'discussion_updated_ago')} 32 #{time_ago_with_tooltip(last_note.updated_at, 'bottom', 'discussion_updated_ago')}
36 - .discussion-body 33 + .discussion-body.js-toggle-content
37 - if note.for_diff_line? 34 - if note.for_diff_line?
38 - if note.active? 35 - if note.active?
39 = render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note 36 = render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note
@@ -47,11 +44,3 @@ @@ -47,11 +44,3 @@
47 .notes{ rel: discussion_notes.first.discussion_id } 44 .notes{ rel: discussion_notes.first.discussion_id }
48 = render discussion_notes 45 = render discussion_notes
49 = render "projects/notes/discussion_reply_button", note: discussion_notes.first 46 = render "projects/notes/discussion_reply_button", note: discussion_notes.first
50 -  
51 - -# will be shown when the other one is hidden  
52 - .discussion-hidden.content.hide  
53 - .note  
54 - %em Hidden discussion.  
55 - = link_to "javascript:;", class: "js-details-target js-toggler-target" do  
56 - %i.icon-eye-open  
57 - Show