Commit 3befe6ec authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix show/hide discussion link

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent fefa10c3
- note = discussion_notes.first - note = discussion_notes.first
.discussion.js-details-container.js-toggler-container.open{ class: note.discussion_id } .discussion.js-toggle-container{ class: note.discussion_id }
.discussion-header .discussion-header
.discussion-actions .discussion-actions
= link_to "javascript:;", class: "js-details-target turn-on js-toggler-target" do = link_to "#", class: "js-toggle-button" do
%i.icon-eye-close %i.icon-chevron-up
Hide discussion Show/hide discussion
= link_to "javascript:;", class: "js-details-target turn-off js-toggler-target" do
%i.icon-eye-open
Show discussion
= image_tag avatar_icon(note.author_email), class: "avatar s32" = image_tag avatar_icon(note.author_email), class: "avatar s32"
%div %div
= link_to_member(@project, note.author, avatar: false) = link_to_member(@project, note.author, avatar: false)
...@@ -33,7 +30,7 @@ ...@@ -33,7 +30,7 @@
= link_to_member(@project, last_note.author, avatar: false) = link_to_member(@project, last_note.author, avatar: false)
%span.discussion-last-update %span.discussion-last-update
#{time_ago_with_tooltip(last_note.updated_at, 'bottom', 'discussion_updated_ago')} #{time_ago_with_tooltip(last_note.updated_at, 'bottom', 'discussion_updated_ago')}
.discussion-body .discussion-body.js-toggle-content
- if note.for_diff_line? - if note.for_diff_line?
- if note.active? - if note.active?
= render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note = render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note
...@@ -47,11 +44,3 @@ ...@@ -47,11 +44,3 @@
.notes{ rel: discussion_notes.first.discussion_id } .notes{ rel: discussion_notes.first.discussion_id }
= render discussion_notes = render discussion_notes
= render "projects/notes/discussion_reply_button", note: discussion_notes.first = render "projects/notes/discussion_reply_button", note: discussion_notes.first
-# will be shown when the other one is hidden
.discussion-hidden.content.hide
.note
%em Hidden discussion.
= link_to "javascript:;", class: "js-details-target js-toggler-target" do
%i.icon-eye-open
Show
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment