From 0f864f741f7d43ad86be3b9b84c78ebefc06a3f5 Mon Sep 17 00:00:00 2001 From: Jo Vuit Date: Wed, 13 Feb 2019 19:06:52 +0100 Subject: [PATCH 1/6] Modified Copy button in the EmbedWizard component to match with the style of the other Copy buttons on the App --- front/src/components/audio/EmbedWizard.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/components/audio/EmbedWizard.vue b/front/src/components/audio/EmbedWizard.vue index f919ec5cd..3e373e47c 100644 --- a/front/src/components/audio/EmbedWizard.vue +++ b/front/src/components/audio/EmbedWizard.vue @@ -17,7 +17,7 @@
- +

Copy/paste this code in your website HTML

From f9a3ae96a873fcc8f5eaad9117188e0edec9986a Mon Sep 17 00:00:00 2001 From: Jo Vuit Date: Wed, 13 Feb 2019 19:07:49 +0100 Subject: [PATCH 2/6] Removed unnecessary hidden divider so the input field and the textarea are at the same height --- front/src/components/audio/EmbedWizard.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/front/src/components/audio/EmbedWizard.vue b/front/src/components/audio/EmbedWizard.vue index 3e373e47c..b25866019 100644 --- a/front/src/components/audio/EmbedWizard.vue +++ b/front/src/components/audio/EmbedWizard.vue @@ -20,7 +20,6 @@

Copy/paste this code in your website HTML

-
From 6d5aa43e1116b58733855c33c106b0ac7df1f641 Mon Sep 17 00:00:00 2001 From: Jo Vuit Date: Wed, 13 Feb 2019 19:11:44 +0100 Subject: [PATCH 3/6] Increased the size of the textarea --- front/src/components/audio/EmbedWizard.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/components/audio/EmbedWizard.vue b/front/src/components/audio/EmbedWizard.vue index b25866019..73569e64f 100644 --- a/front/src/components/audio/EmbedWizard.vue +++ b/front/src/components/audio/EmbedWizard.vue @@ -20,7 +20,7 @@

Copy/paste this code in your website HTML

- From 4a549e6353abd382456903a6a396a7a655c34ada Mon Sep 17 00:00:00 2001 From: Jo Vuit Date: Wed, 13 Feb 2019 19:33:43 +0100 Subject: [PATCH 4/6] Added a message to be displayed for 5 seconds after the copied button has been clicked. The copy() function has been modified according to components/common/CopyInput.vue --- front/src/components/audio/EmbedWizard.vue | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/front/src/components/audio/EmbedWizard.vue b/front/src/components/audio/EmbedWizard.vue index 73569e64f..a5311d106 100644 --- a/front/src/components/audio/EmbedWizard.vue +++ b/front/src/components/audio/EmbedWizard.vue @@ -22,6 +22,9 @@

Copy/paste this code in your website HTML

+
+

Text copied to clipboard!

+
@@ -40,7 +43,8 @@ export default { let d = { width: null, height: 150, - minHeight: 100 + minHeight: 100, + copied: false } if (this.type === 'album') { d.height = 330 @@ -69,6 +73,11 @@ export default { copy () { this.$refs.textarea.select() document.execCommand("Copy") + let self = this + self.copied = true + this.timeout = setTimeout(() => { + self.copied = false + }, 5000) } } } @@ -76,4 +85,9 @@ export default { From 02aadb9c84e4a644d728046e4e54bf252ab7a1d8 Mon Sep 17 00:00:00 2001 From: Jo Vuit Date: Wed, 13 Feb 2019 19:38:43 +0100 Subject: [PATCH 5/6] Changelog fragment --- changes/changelog.d/embed-wizard.enhancement | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/changelog.d/embed-wizard.enhancement diff --git a/changes/changelog.d/embed-wizard.enhancement b/changes/changelog.d/embed-wizard.enhancement new file mode 100644 index 000000000..8cd079a27 --- /dev/null +++ b/changes/changelog.d/embed-wizard.enhancement @@ -0,0 +1 @@ +Enhanced the design of the embed wizard. From 4d785d2aa734790ef9ca78af7dd09f103081bccb Mon Sep 17 00:00:00 2001 From: Jo Vuit Date: Wed, 13 Feb 2019 19:42:18 +0100 Subject: [PATCH 6/6] Added MR id to changelog's fragment --- changes/changelog.d/embed-wizard.enhancement | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/changelog.d/embed-wizard.enhancement b/changes/changelog.d/embed-wizard.enhancement index 8cd079a27..7c3491322 100644 --- a/changes/changelog.d/embed-wizard.enhancement +++ b/changes/changelog.d/embed-wizard.enhancement @@ -1 +1 @@ -Enhanced the design of the embed wizard. +Enhanced the design of the embed wizard. (!619)