diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2017-11-02 14:51:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-02 14:51:17 +0100 |
| commit | 4a3893b105b5b701e2146b5f27eacdce7f436200 (patch) | |
| tree | e7ac4b812f2f2e9895e73d1bb26005bebcd55138 /apps | |
| parent | 2d901c2ed540ff076de702e810d83463421b9c16 (diff) | |
| parent | 222d99fe961718f267cd092206698b8f6a0f77d7 (diff) | |
| download | nextcloud-server-4a3893b105b5b701e2146b5f27eacdce7f436200.tar.gz nextcloud-server-4a3893b105b5b701e2146b5f27eacdce7f436200.zip | |
Merge pull request #6094 from nextcloud/sharedby-avatar
Show avatar instead of username for shared files
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/css/files.scss | 12 | ||||
| -rw-r--r-- | apps/files_sharing/tests/js/shareSpec.js | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index c03b1ce6fad..c165063bb85 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -555,6 +555,10 @@ a.action > img { #fileList a.action.action-share { padding: 17px 14px; } +#fileList a.action.action-share .avatar { + display: inline-block; + vertical-align: middle; +} #fileList a.action.action-menu { padding-top: 17px; @@ -590,8 +594,12 @@ a.action > img { max-width: 70px; overflow: hidden; text-overflow: ellipsis; - vertical-align: bottom; - padding-left: 6px; + vertical-align: middle; + margin-left: 6px; +} + +#fileList .remoteAddress .userDomain { + margin-left: 0 !important; } #fileList .favorite-mark.permanent { diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js index ea2f427df75..5b0a78c9c64 100644 --- a/apps/files_sharing/tests/js/shareSpec.js +++ b/apps/files_sharing/tests/js/shareSpec.js @@ -145,7 +145,7 @@ describe('OCA.Sharing.Util tests', function() { }]); $tr = fileList.$el.find('tbody tr:first'); $action = $tr.find('.action-share'); - expect($action.find('>span').text().trim()).toEqual('User One'); + expect($action.find('>span').text().trim()).toEqual('Shared by User One'); expect($action.find('.icon').hasClass('icon-shared')).toEqual(true); expect($action.find('.icon').hasClass('icon-public')).toEqual(false); expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg'); @@ -166,7 +166,7 @@ describe('OCA.Sharing.Util tests', function() { }]); $tr = fileList.$el.find('tbody tr:first'); $action = $tr.find('.action-share'); - expect($action.find('>span').text().trim()).toEqual('Shared with User One, User Two'); + expect($action.text().trim()).toEqual('Shared with User One Shared with User Two'); expect($action.find('.icon').hasClass('icon-shared')).toEqual(true); expect($action.find('.icon').hasClass('icon-public')).toEqual(false); expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg'); @@ -273,7 +273,7 @@ describe('OCA.Sharing.Util tests', function() { expect($tr.attr('data-share-recipients')).toEqual('Group One, Group Two, User One, User Two'); - expect($action.find('>span').text().trim()).toEqual('Shared with Group One, Group Two, User One, User Two'); + expect($action.text().trim()).toEqual('Shared with Group One Shared with Group Two Shared with User One Shared with User Two'); expect($action.find('.icon').hasClass('icon-shared')).toEqual(true); expect($action.find('.icon').hasClass('icon-public')).toEqual(false); }); @@ -306,7 +306,7 @@ describe('OCA.Sharing.Util tests', function() { expect($tr.attr('data-share-recipients')).toEqual('User One, User Three, User Two'); - expect($action.find('>span').text().trim()).toEqual('Shared with User One, User Three, User Two'); + expect($action.text().trim()).toEqual('Shared with User One Shared with User Three Shared with User Two'); expect($action.find('.icon').hasClass('icon-shared')).toEqual(true); expect($action.find('.icon').hasClass('icon-public')).toEqual(false); }); @@ -362,7 +362,7 @@ describe('OCA.Sharing.Util tests', function() { expect($tr.attr('data-share-recipients')).toEqual('User Two'); - expect($action.find('>span').text().trim()).toEqual('User One'); + expect($action.find('>span').text().trim()).toEqual('Shared by User One'); expect($action.find('.icon').hasClass('icon-shared')).toEqual(true); expect($action.find('.icon').hasClass('icon-public')).toEqual(false); }); @@ -393,7 +393,7 @@ describe('OCA.Sharing.Util tests', function() { expect($tr.attr('data-share-recipients')).not.toBeDefined(); - expect($action.find('>span').text().trim()).toEqual('User One'); + expect($action.find('>span').text().trim()).toEqual('Shared by User One'); expect($action.find('.icon').hasClass('icon-shared')).toEqual(true); expect($action.find('.icon').hasClass('icon-public')).toEqual(false); }); |