diff --git a/core/css/share.css b/core/css/share.css
index 1436b868cb37..d093fdaf3595 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -69,7 +69,6 @@
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
- line-height: 32px;
vertical-align: middle;
}
@@ -77,6 +76,11 @@
margin-right: 5px;
}
+.share-autocomplete-item .autocomplete-item-typeInfo {
+ font-size: smaller;
+ font-style: italic;
+}
+
.share-autocomplete-item .avatardiv {
flex-shrink: 0;
}
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index bfed8e2acffb..ee4453769013 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -54,8 +54,9 @@
'
' +
'{{displayName}}' +
'{{#if additionalInfo}}' +
- '({{additionalInfo}})' +
+ '
({{additionalInfo}})' +
'{{/if}}' +
+ '
{{typeInfo}}' +
'
' +
'' +
'' +
@@ -310,20 +311,20 @@
autocompleteRenderItem: function(ul, item) {
var text = item.label;
+ var typeInfo = t('core', 'User');
if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
- text = t('core', '{sharee} (group)', {
- sharee: text
- }, null, {escape: false});
- } else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) {
+ typeInfo = t('core', 'Group');
+ }
+ if (item.value.shareType === OC.Share.SHARE_TYPE_GUEST) {
+ typeInfo = t('core', 'Guest');
+ }
+ if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) {
if (item.value.server) {
- text = t('core', '{sharee} (at {server})', {
- sharee: text,
+ typeInfo = t('core', 'At {server}', {
server: item.value.server
});
} else {
- text = t('core', '{sharee} (federated)', {
- sharee: text
- });
+ typeInfo = t('core', 'Federated');
}
}
@@ -331,6 +332,7 @@
var $el = $(template({
showAvatar: this.configModel.areAvatarsEnabled(),
displayName: text,
+ typeInfo: typeInfo,
additionalInfo: item.value.shareWithAdditionalInfo,
shareTypeClass: (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) ? 'group' : 'user'
}));