From 0dbeffae7556a32c00536a441fc81860232621d4 Mon Sep 17 00:00:00 2001 From: dimitrieh Date: Tue, 31 Jan 2017 14:19:10 +0100 Subject: Show organisation membership and delete comment on smaller viewports, plus change comment author name to username --- app/views/projects/notes/_note.html.haml | 11 +++++++---- ...mobile-issue-view-doesn-t-show-organization-membership.yml | 4 ++++ 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 changelogs/unreleased/25134-mobile-issue-view-doesn-t-show-organization-membership.yml diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 09339e520dd..4272a13c887 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -9,9 +9,12 @@ = image_tag avatar_icon(note.author), alt: '', class: 'avatar s40' .timeline-content .note-header - = link_to_member(note.project, note.author, avatar: false) - .note-headline-light + %a{ href: user_path(note.author), class: 'visible-xs' } = note.author.to_reference + = link_to_member(note.project, note.author, avatar: false, extra_class: 'hidden-xs') + .note-headline-light + %span.hidden-xs + = note.author.to_reference - unless note.system commented - if note.system @@ -23,7 +26,7 @@ .note-actions - access = note_max_access_for_user(note) - if access - %span.note-role.hidden-xs= access + %span.note-role= access - if note.resolvable? - can_resolve = can?(current_user, :resolve_note, note) @@ -59,7 +62,7 @@ - if note_editable = link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do = icon('pencil', class: 'link-highlight') - = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button hidden-xs js-note-delete danger' do + = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete danger' do = icon('trash-o', class: 'danger-highlight') .note-body{ class: note_editable ? 'js-task-list-container' : '' } .note-text.md diff --git a/changelogs/unreleased/25134-mobile-issue-view-doesn-t-show-organization-membership.yml b/changelogs/unreleased/25134-mobile-issue-view-doesn-t-show-organization-membership.yml new file mode 100644 index 00000000000..d35ad0be0db --- /dev/null +++ b/changelogs/unreleased/25134-mobile-issue-view-doesn-t-show-organization-membership.yml @@ -0,0 +1,4 @@ +--- +title: Show organisation membership and delete comment on smaller viewports, plus change comment author name to username +merge_request: +author: -- cgit v1.2.1 From 0c2d915a7180a0450aa73473361d15b572f19ab9 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Tue, 7 Feb 2017 13:34:41 -0600 Subject: Fix static class error --- app/views/projects/notes/_note.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 4272a13c887..4b1da9c73e5 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -9,7 +9,7 @@ = image_tag avatar_icon(note.author), alt: '', class: 'avatar s40' .timeline-content .note-header - %a{ href: user_path(note.author), class: 'visible-xs' } + %a.visible-xs{ href: user_path(note.author) } = note.author.to_reference = link_to_member(note.project, note.author, avatar: false, extra_class: 'hidden-xs') .note-headline-light -- cgit v1.2.1