summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2017-04-24 15:31:44 +0200
committerGeorg Ehrke <developer@georgehrke.com>2017-04-26 09:28:14 +0200
commit399f08bd330070d53aa36441632bed0578845a53 (patch)
tree47110a3e5573cce33260db2b06669451334fb93d /core
parent4d60aff6ecfcd1d77962d4aa65eb3812fdd6eb72 (diff)
downloadnextcloud-server-399f08bd330070d53aa36441632bed0578845a53.tar.gz
nextcloud-server-399f08bd330070d53aa36441632bed0578845a53.zip
add contactsmenu popover to resharer infobox
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Diffstat (limited to 'core')
-rw-r--r--core/css/share.scss4
-rw-r--r--core/js/sharedialogresharerinfoview.js5
2 files changed, 9 insertions, 0 deletions
diff --git a/core/css/share.scss b/core/css/share.scss
index 2ea80b146b5..2e1c99b6f41 100644
--- a/core/css/share.scss
+++ b/core/css/share.scss
@@ -161,6 +161,10 @@ a {
padding: 6px 4px;
}
+.resharerInfoView.subView {
+ position: relative;
+}
+
#defaultExpireMessage, .reshare {
/* fix shared by text going out of box */
white-space: normal;
diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index a82b495bdcc..201484c52a8 100644
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -100,6 +100,11 @@
$this.avatar($this.data('username'), 32);
});
+ this.$el.find('.reshare').contactsMenu(
+ this.model.getReshareOwner(),
+ OC.Share.SHARE_TYPE_USER,
+ this.$el);
+
return this;
},