From efaf78aac1affc0623995fb868e8c59391883c2a Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Wed, 12 Dec 2018 12:03:52 +0000
Subject: [PATCH] Fix clipboard copy in new UI.
ClipboardJS is initialised once in the bundle for class="copy",
not initialised on each page that uses it.
---
modules/core/templates/show_metadata.twig | 2 +-
templates/error.twig | 2 +-
templates/metadata-converter.twig | 2 +-
templates/metadata.twig | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/core/templates/show_metadata.twig b/modules/core/templates/show_metadata.twig
index 9ff0f3516..f39aee9fe 100644
--- a/modules/core/templates/show_metadata.twig
+++ b/modules/core/templates/show_metadata.twig
@@ -4,7 +4,7 @@
<div class="code-box">
<div class="code-box-title">
<h3>{{ 'Metadata'|trans }}</h3>
- <button data-clipboard-target="#metadata" id="btn{{ loop.index }}" class="pure-button right clipboard-btn">
+ <button data-clipboard-target="#metadata" id="btn{{ loop.index }}" class="pure-button right clipboard-btn copy">
<span class="fa fa-copy"></span>
</button>
</div>
diff --git a/templates/error.twig b/templates/error.twig
index 23e06c570..6468acee2 100644
--- a/templates/error.twig
+++ b/templates/error.twig
@@ -19,7 +19,7 @@
<p>{{ '{errors:report_trackid}' | trans }}</p>
<div class="pure-button-group two-elements" role="group">
<label class="pure-button hollow" disabled><pre id="trackid">{{ error.trackId }}</pre></label>
- <button data-clipboard-target="#trackid" id="btntrackid" class="pure-button clipboard-btn">
+ <button data-clipboard-target="#trackid" id="btntrackid" class="pure-button clipboard-btn copy">
<i class="fa fa-copy"></i>
</button>
</div>
diff --git a/templates/metadata-converter.twig b/templates/metadata-converter.twig
index fff4d685f..b4c9e94c6 100644
--- a/templates/metadata-converter.twig
+++ b/templates/metadata-converter.twig
@@ -31,7 +31,7 @@
<div class="code-box">
<div class="code-box-title">
<h3> {{ type }}</h3>
- <button data-clipboard-target="#metadata{{ loop.index }}" id="btn{{ loop.index }}" class="pure-button right clipboard-btn">
+ <button data-clipboard-target="#metadata{{ loop.index }}" id="btn{{ loop.index }}" class="pure-button right clipboard-btn copy">
<i class="fa fa-copy"></i>
</button>
</div>
diff --git a/templates/metadata.twig b/templates/metadata.twig
index f62aa13a6..cac105104 100644
--- a/templates/metadata.twig
+++ b/templates/metadata.twig
@@ -8,7 +8,7 @@
<p>{{ 'You can get the metadata xml on a dedicated URL:' | trans }}</p>
<div class="input-group">
<pre id="metadataurl" class="input-left">{{ metaurl }}</pre>
- <button data-clipboard-target="#metadataurl" id="btnurl" class="pure-button right clipboard-btn">
+ <button data-clipboard-target="#metadataurl" id="btnurl" class="pure-button right clipboard-btn copy">
<span class="fa fa-copy"></span>
</button>
</div>
@@ -18,7 +18,7 @@
<div class="code-box">
<div class="code-box-title">
<p>{{ 'In SAML 2.0 Metadata XML format:' | trans }}</p>
- <button data-clipboard-target="#xmlmetadata" id="btnxml" class="pure-button right clipboard-btn">
+ <button data-clipboard-target="#xmlmetadata" id="btnxml" class="pure-button right clipboard-btn copy">
<span class="fa fa-copy"></span>
</button>
</div>
@@ -30,7 +30,7 @@
<div class="code-box">
<div class="code-box-title">
<p>{{ 'In SimpleSAMLphp flat file format - use this if you are using a SimpleSAMLphp entity on the other side:' | trans }}</p>
- <button data-clipboard-target="#phpmetadata" id="btnphp" class="pure-button right clipboard-btn">
+ <button data-clipboard-target="#phpmetadata" id="btnphp" class="pure-button right clipboard-btn copy">
<span class="fa fa-copy"></span>
</button>
</div>
--
GitLab