summaryrefslogtreecommitdiffstats
path: root/apps/federatedfilesharing
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2016-08-09 16:18:15 +0200
committerGitHub <noreply@github.com>2016-08-09 16:18:15 +0200
commitedeb41ccaff186b116852df4caf8df144db682c8 (patch)
tree5023c146e2eff9f546dffe5dd29f9256a5360bb5 /apps/federatedfilesharing
parent352ec077a216b873e75e921804c6cc6968a42056 (diff)
parent6f37a65b774283a10db2cb7f30179c49f252ecbd (diff)
downloadnextcloud-server-edeb41ccaff186b116852df4caf8df144db682c8.tar.gz
nextcloud-server-edeb41ccaff186b116852df4caf8df144db682c8.zip
Merge pull request #780 from nextcloud/copy_fed_cloud_id
Add clipboard action to Personal Settings Fed Cloud Id
Diffstat (limited to 'apps/federatedfilesharing')
-rw-r--r--apps/federatedfilesharing/css/settings-personal.css8
-rw-r--r--apps/federatedfilesharing/js/settings-personal.js31
-rw-r--r--apps/federatedfilesharing/templates/settings-personal.php3
3 files changed, 41 insertions, 1 deletions
diff --git a/apps/federatedfilesharing/css/settings-personal.css b/apps/federatedfilesharing/css/settings-personal.css
index f53365c9371..6cb69f83cb6 100644
--- a/apps/federatedfilesharing/css/settings-personal.css
+++ b/apps/federatedfilesharing/css/settings-personal.css
@@ -7,6 +7,14 @@
white-space: pre-wrap;
}
+#fileSharingSettings .icon {
+ background-size: 16px 16px;
+ display: inline-block;
+ position: relative;
+ top: 3px;
+ margin-left: 5px;
+}
+
[class^="social-"], [class*=" social-"] {
background-repeat: no-repeat;
background-position: 2px;
diff --git a/apps/federatedfilesharing/js/settings-personal.js b/apps/federatedfilesharing/js/settings-personal.js
index 031a3c9617a..f89022dc8a0 100644
--- a/apps/federatedfilesharing/js/settings-personal.js
+++ b/apps/federatedfilesharing/js/settings-personal.js
@@ -20,4 +20,35 @@ $(document).ready(function() {
}
});
+ // Clipboard!
+ var clipboard = new Clipboard('.clipboardButton');
+ clipboard.on('success', function(e) {
+ $input = $(e.trigger);
+ $input.tooltip({placement: 'bottom', trigger: 'manual', title: t('core', 'Copied!')});
+ $input.tooltip('show');
+ _.delay(function() {
+ $input.tooltip('hide');
+ }, 3000);
+ });
+ clipboard.on('error', function (e) {
+ $input = $(e.trigger);
+ var actionMsg = '';
+ if (/iPhone|iPad/i.test(navigator.userAgent)) {
+ actionMsg = t('core', 'Not supported!');
+ } else if (/Mac/i.test(navigator.userAgent)) {
+ actionMsg = t('core', 'Press ⌘-C to copy.');
+ } else {
+ actionMsg = t('core', 'Press Ctrl-C to copy.');
+ }
+
+ $input.tooltip({
+ placement: 'bottom',
+ trigger: 'manual',
+ title: actionMsg
+ });
+ $input.tooltip('show');
+ _.delay(function () {
+ $input.tooltip('hide');
+ }, 3000);
+ });
});
diff --git a/apps/federatedfilesharing/templates/settings-personal.php b/apps/federatedfilesharing/templates/settings-personal.php
index 9699591b84d..aad1e385982 100644
--- a/apps/federatedfilesharing/templates/settings-personal.php
+++ b/apps/federatedfilesharing/templates/settings-personal.php
@@ -15,7 +15,8 @@ if ($_['showShareIT']) {
<p>
<?php p($l->t('Your Federated Cloud ID:')); ?>
- <strong><?php p($_['cloudId']); ?></strong>
+ <strong id="cloudid"><?php p($_['cloudId']); ?></strong>
+ <a class="clipboardButton icon icon-clippy" data-clipboard-target="#cloudid"></a>
</p>
<br>