mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[9.2] Show avatar in share drop down (#25976) 

* Show avatar in share drop down

* Fix share autocomplete vertical align with avatar

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Thomas Müller 2016-10-06 17:12:10 +02:00 committed by Roeland Jago Douma
parent 9785343d6a
commit e6b51cb54c
No known key found for this signature in database
GPG Key ID: 1E152838F164D13B
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/css/share.css
View File

@ -50,6 +50,19 @@
height: 32px; height: 32px;
} }
.share-autocomplete-item {
display: flex;
}
.share-autocomplete-item .autocomplete-item-text {
margin-left: 10px;
margin-right: 10px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
line-height: 32px;
vertical-align: middle;
}
#shareWithList { #shareWithList {
list-style-type:none; list-style-type:none;
padding:8px; padding:8px;

23
core/js/sharedialogview.js
View File

@ -251,7 +251,7 @@
}, },
autocompleteRenderItem: function(ul, item) { autocompleteRenderItem: function(ul, item) {
var insert = $("<a>");
var text = item.label; var text = item.label;
if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) { if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
text = t('core', '{sharee} (group)', { text = t('core', '{sharee} (group)', {
@ -269,15 +269,20 @@
}); });
} }
} }
insert.text(text); var insert = $("<div class='share-autocomplete-item'/>");
insert.attr('title', item.value.shareWith); var avatar = $("<div class='avatardiv'></div>").appendTo(insert);
if(item.value.shareType === OC.Share.SHARE_TYPE_GROUP) { if (item.value.shareType === OC.Share.SHARE_TYPE_USER) {
insert = insert.wrapInner('<strong></strong>'); avatar.avatar(item.value.shareWith, 32, undefined, undefined, undefined, item.label);
} else {
avatar.imageplaceholder(text, undefined, 32);
} }
insert.tooltip({
placement: 'bottom', $("<div class='autocomplete-item-text'></div>")
container: 'body' .text(text)
}); .appendTo(insert);
insert.attr('title', item.value.shareWith);
insert = $("<a>")
.append(insert);
return $("<li>") return $("<li>")
.addClass((item.value.shareType === OC.Share.SHARE_TYPE_GROUP) ? 'group' : 'user') .addClass((item.value.shareType === OC.Share.SHARE_TYPE_GROUP) ? 'group' : 'user')
.append(insert) .append(insert)