diff options
| -rw-r--r-- | apps/files/css/files.scss | 4 | ||||
| -rw-r--r-- | core/js/share.js | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index c03b1ce6fad..1fc38f03672 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; diff --git a/core/js/share.js b/core/js/share.js index 659d719788d..c8eaa08878e 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -207,7 +207,7 @@ OC.Share = _.extend(OC.Share || {}, { var parts = this._REMOTE_OWNER_REGEXP.exec(remoteAddress); if (!parts) { // display as is, most likely to be a simple owner name - return escapeHTML(remoteAddress); + return '<div class="avatar" data-userName="' + escapeHTML(remoteAddress) + '" title="' + t('core', 'Shared by') + ' ' + escapeHTML(remoteAddress) + '"></div>'; } var userName = parts[1]; @@ -303,7 +303,12 @@ OC.Share = _.extend(OC.Share || {}, { message = t('core', 'Shared with {recipients}', {recipients: this._formatShareList(recipients.split(", ")).join(", ")}, 0, {escape: false}); } action.html('<span> ' + message + '</span>').prepend(icon); + if (owner || recipients) { + var avatarElement = action.find('.avatar'); + avatarElement.avatar(avatarElement.data('username'), 32); + avatarElement.tooltip({placement: 'top'}); + action.find('.remoteAddress').tooltip({placement: 'top'}); } } |