summaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2015-04-09 10:16:29 +0200
committerJan-Christoph Borchardt <hey@jancborchardt.net>2015-04-09 10:16:29 +0200
commit000b09ee7a4f6ee70ac7a02c5182d218eed91629 (patch)
tree1989e0d1a7508c084a3fd4ac62b6995edc1079f2 /core/js
parent0d3bea37c3256e3386b968c327a2b64e357522bd (diff)
downloadnextcloud-server-000b09ee7a4f6ee70ac7a02c5182d218eed91629.tar.gz
nextcloud-server-000b09ee7a4f6ee70ac7a02c5182d218eed91629.zip
add more present info about remote shares, fix layout of inputs
Diffstat (limited to 'core/js')
-rw-r--r--core/js/share.js10
1 files changed, 10 insertions, 0 deletions
diff --git a/core/js/share.js b/core/js/share.js
index 0a36ca2bdbb..646123a6055 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -398,6 +398,11 @@ OC.Share={
html += '<label for="shareWith" class="hidden-visually">'+t('core', 'Share')+'</label>';
html += '<input id="shareWith" type="text" placeholder="' + sharePlaceholder + '" />';
+ if(oc_appconfig.core.remoteShareAllowed) {
+ html += '<a target="_blank" class="icon-info shareWithRemoteInfo" '
+ + 'title="'+t('core', 'Share with people on other ownClouds using the syntax username@example.com/owncloud')+'" '
+ + 'href="https://doc.owncloud.org/server/8.0/user_manual/files/federated_cloud_sharing.html"></a>';
+ }
html += '<span class="shareWithLoading icon-loading-small hidden"></span>';
html += '<ul id="shareWithList">';
html += '</ul>';
@@ -448,6 +453,11 @@ OC.Share={
dropDownEl = $(html);
dropDownEl = dropDownEl.appendTo(appendTo);
+ // trigger remote share info tooltip
+ if(oc_appconfig.core.remoteShareAllowed) {
+ $('.shareWithRemoteInfo').tipsy({gravity: 'e'});
+ }
+
//Get owner avatars
if (oc_config.enable_avatars === true && data !== false && data.reshare !== false && data.reshare.uid_owner !== undefined) {
dropDownEl.find(".avatar").avatar(data.reshare.uid_owner, 32);