summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2016-11-15 19:30:59 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2016-11-15 19:30:59 +0100
commitf7c637071ac7445404ccc1392827f424556ee3d4 (patch)
tree537bdc034b6c2a664a0f03e8f1b679a4d4cf89a1
parent571c5aac5e87deee1933f605d366060a82323621 (diff)
downloadnextcloud-server-f7c637071ac7445404ccc1392827f424556ee3d4.tar.gz
nextcloud-server-f7c637071ac7445404ccc1392827f424556ee3d4.zip
Adds copy tooltip to clipboards
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
-rw-r--r--apps/federatedfilesharing/templates/settings-personal.php2
-rw-r--r--core/js/sharedialoglinkshareview.js5
-rw-r--r--settings/templates/personal.php2
3 files changed, 5 insertions, 4 deletions
diff --git a/apps/federatedfilesharing/templates/settings-personal.php b/apps/federatedfilesharing/templates/settings-personal.php
index 98a1cd7f751..c8fc1caf7d6 100644
--- a/apps/federatedfilesharing/templates/settings-personal.php
+++ b/apps/federatedfilesharing/templates/settings-personal.php
@@ -12,7 +12,7 @@ style('federatedfilesharing', 'settings-personal');
<p>
<?php p($l->t('Your Federated Cloud ID:')); ?>
<strong id="cloudid"><?php p($_['cloudId']); ?></strong>
- <a class="clipboardButton icon icon-clippy" data-clipboard-target="#cloudid"></a>
+ <a class="clipboardButton icon icon-clippy hasTooltip" data-clipboard-target="#cloudid" title="<?php p($l->t('Copy')); ?>"></a>
</p>
<br>
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index bbc8f1b4547..3ba124efc15 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -27,7 +27,7 @@
'<div class="oneline">' +
'<label for="linkText-{{cid}}" class="hidden-visually">{{urlLabel}}</label>' +
'<input id="linkText-{{cid}}" class="linkText {{#unless isLinkShare}}hidden{{/unless}}" type="text" readonly="readonly" value="{{shareLinkURL}}" />' +
- '<a class="{{#unless isLinkShare}}hidden-visually{{/unless}} clipboardButton icon icon-clippy" data-clipboard-target="#linkText-{{cid}}"></a>' +
+ '<a class="{{#unless isLinkShare}}hidden-visually{{/unless}} clipboardButton icon icon-clippy hasTooltip" title="{{copy}}" data-clipboard-target="#linkText-{{cid}}"></a>' +
'</div>' +
' {{#if publicUpload}}' +
'<div id="allowPublicUploadWrapper">' +
@@ -333,7 +333,8 @@
publicUploadLabel: t('core', 'Allow upload and editing'),
hideFileListLabel: t('core', 'Hide file listing'),
mailPrivatePlaceholder: t('core', 'Email link to person'),
- mailButtonText: t('core', 'Send')
+ mailButtonText: t('core', 'Send'),
+ copy: t('core', 'Copy')
}));
this.delegateEvents();
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index ea1c7ba6459..ddf09444e5d 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -241,7 +241,7 @@ if($_['passwordChangeSupported']) {
<div class="app-password-row">
<span class="app-password-label"><?php p($l->t('Password')); ?></span>
<input id="new-app-password" type="text" readonly="readonly"/>
- <a class="clipboardButton icon icon-clippy" data-clipboard-target="#new-app-password"></a>
+ <a class="clipboardButton icon icon-clippy hasTooltip" data-clipboard-target="#new-app-password" title="<?php p($l->t('Copy')); ?>"></a>
<button id="app-password-hide" class="button"><?php p($l->t('Done')); ?></button>
</div>
</div>