- add some padding to the button

- use hidden instead of hidden-visually - add tooltip - use notifications on copy of the dav url- tooltip is used for the description of the button
owncloud · Sep 20, 2016 · 2948482 · 2948482
1 parent c51c8a6
commit 2948482
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 19 deletions.
diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css
@@ -18,8 +18,13 @@
 	display: inline-block;
 }
 
+#app-sidebar .mainFileInfoView .hidden {
+	display: none;
+}
+
 #app-sidebar .mainFileInfoView .icon-external {
 	opacity: .5;
+	padding-left: 8px;
 }
 
 #app-sidebar .mainFileInfoView .permalink {

diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
@@ -18,7 +18,7 @@
 				'<span class="icon icon-public"></span>' +
 				'<span class="hidden-visually">{{permalinkTitle}}</span>' +
 			'</a>' +
-			'<a class="{{#unless showWebDavCopyButton}}hidden-visually{{/unless}} clipboardButton icon icon-external" data-clipboard-text="{{webDavUrl}}"></a>' +
+			'<a class="{{#unless showWebDavCopyButton}}hidden{{/unless}} webDavUrlCopyButton icon icon-external" title="{{webDavUrlTitle}}" data-clipboard-text="{{webDavUrl}}"></a>' +
 		'</div>' +
 		'	<div class="file-details ellipsis">' +
 		'		<a href="#" ' +
@@ -83,7 +83,10 @@
 				throw 'Missing required parameter "fileActions"';
 			}
 
-			OC.Util.setupClipboard('.clipboardButton');
+			OC.Util.setupClipboard('.webDavUrlCopyButton', {
+				notificationMode: 'notification',
+				successMessage: t('files', 'WebDAV link copied!')
+			});
 		},
 
 		_onClickPermalink: function() {
@@ -166,7 +169,8 @@
 					permalink: this._makePermalink(this.model.get('id')),
 					permalinkTitle: t('files', 'Local link'),
 					showWebDavCopyButton: this.model.isDirectory(),
-					webDavUrl: this._makeWebDavUrl(this.model.getFullPath())
+					webDavUrl: this._makeWebDavUrl(this.model.getFullPath()),
+					webDavUrlTitle: t('files', 'Direct WebDAV link')
 				}));
 
 				// TODO: we really need OC.Previews

diff --git a/core/js/js.js b/core/js/js.js
@@ -1935,15 +1935,22 @@ OC.Util = {
 		return false;
 	},
 
-	setupClipboard: function(element) {
+	setupClipboard: function(element, options) {
+		options = options || {};
+		options.notificationMode = options.notificationMode || 'tooltip';
+		options.successMessage = options.successMessage ||  t('core', 'Copied!');
 		var clipboard = new Clipboard(element);
 		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);
+			if (options.notificationMode === 'tooltip') {
+				$input = $(e.trigger);
+				$input.tooltip({placement: 'bottom', trigger: 'manual', title: options.successMessage});
+				$input.tooltip('show');
+				_.delay(function() {
+					$input.tooltip('hide');
+				}, 3000);
+			} else {
+				OC.Notification.showTemporary(options.successMessage);
+			}
 		});
 		clipboard.on('error', function (e) {
 			$input = $(e.trigger);
@@ -1956,15 +1963,19 @@ OC.Util = {
 				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);
+			if (options.notificationMode === 'tooltip') {
+				$input.tooltip({
+					placement: 'bottom',
+					trigger: 'manual',
+					title: actionMsg
+				});
+				$input.tooltip('show');
+				_.delay(function () {
+					$input.tooltip('hide');
+				}, 3000);
+			} else {
+				OC.Notification.showTemporary(options.successMessage);
+			}
 		});
 	}
 };