From c65e767e45d6199c52bc96589c5051d04f26bd95 Mon Sep 17 00:00:00 2001 From: Jaime Perez Crespo <jaime.perez@uninett.no> Date: Fri, 6 Nov 2015 12:39:36 +0100 Subject: [PATCH] Fix the URLs for the clipboard.svg image, once and for all. --- modules/core/templates/show_metadata.tpl.php | 2 +- templates/error.php | 2 +- templates/metadata-converter.php | 2 +- templates/metadata.php | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/core/templates/show_metadata.tpl.php b/modules/core/templates/show_metadata.tpl.php index 3996fbd2e..9d5a7c3bd 100644 --- a/modules/core/templates/show_metadata.tpl.php +++ b/modules/core/templates/show_metadata.tpl.php @@ -3,7 +3,7 @@ $this->includeAtTemplateBase('includes/header.php'); ?> <div class="metadatabox"> <button data-clipboard-target="#metadata" id="btncp" class="btn topright" style="margin-right: 0.5em;"> - <img src="<?php echo $this->data['baseurlpath'].'/resources/icons/clipboard.svg'; ?>" + <img src="/<?php echo $this->data['baseurlpath'].'resources/icons/clipboard.svg'; ?>" alt="Copy to clipboard"> </button> <pre id="metadata"> diff --git a/templates/error.php b/templates/error.php index e1aa2f29b..62c2bd512 100644 --- a/templates/error.php +++ b/templates/error.php @@ -22,7 +22,7 @@ if (isset($this->data['includeTemplate'])) { <div class="input-group" style="width: 1em;"> <pre id="trackid" class="input-left"><?php echo $this->data['error']['trackId']; ?></pre> <button data-clipboard-target="#trackid" id="btntrackid" class="btnaddonright"> - <img src="<?php echo $this->data['baseurlpath'].'/resources/icons/clipboard.svg'; ?>" + <img src="/<?php echo $this->data['baseurlpath'].'resources/icons/clipboard.svg'; ?>" alt="Copy to clipboard"> </button> </div> diff --git a/templates/metadata-converter.php b/templates/metadata-converter.php index 907fc9bc7..13a580941 100644 --- a/templates/metadata-converter.php +++ b/templates/metadata-converter.php @@ -33,7 +33,7 @@ if (!empty($output)) { <div class="metadatabox"> <button data-clipboard-target="#metadata<?php echo $i; ?>" id="btn<?php echo $i; ?>" class="btn topright" style="margin-right: 0.5em;"> - <img src="<?php echo $this->data['baseurlpath'].'/resources/icons/clipboard.svg'; ?>" + <img src="/<?php echo $this->data['baseurlpath'].'resources/icons/clipboard.svg'; ?>" alt="Copy to clipboard"> </button> <pre id="metadata<?php echo $i; ?>"><?php diff --git a/templates/metadata.php b/templates/metadata.php index 6dcd276ce..a30e2cc1d 100644 --- a/templates/metadata.php +++ b/templates/metadata.php @@ -8,7 +8,7 @@ $this->includeAtTemplateBase('includes/header.php'); ?> <div class="input-group"> <pre id="metadataurl" class="input-left"><?php echo htmlspecialchars($this->data['metaurl']); ?></pre> <button data-clipboard-target="#metadataurl" id="btnurl" class="btnaddonright"> - <img src="<?php echo $this->data['baseurlpath'].'/resources/icons/clipboard.svg'; ?>" + <img src="/<?php echo $this->data['baseurlpath'].'resources/icons/clipboard.svg'; ?>" alt="Copy to clipboard"> </button> </div> @@ -17,7 +17,7 @@ $this->includeAtTemplateBase('includes/header.php'); ?> <p><?php echo($this->t('metadata_xmlformat')); ?></p> <div class="metadatabox"> <button data-clipboard-target="#xmlmetadata" id="btnxml" class="btn topright" style="margin-right: 0.5em;"> - <img src="<?php echo $this->data['baseurlpath'].'/resources/icons/clipboard.svg'; ?>" + <img src="/<?php echo $this->data['baseurlpath'].'resources/icons/clipboard.svg'; ?>" alt="Copy to clipboard"> </button> <pre id="xmlmetadata"><?php echo $this->data['metadata']; ?></pre> @@ -26,7 +26,7 @@ $this->includeAtTemplateBase('includes/header.php'); ?> <p><?php echo($this->t('metadata_simplesamlformat')); ?></p> <div class="metadatabox"> <button data-clipboard-target="#phpmetadata" id="btnphp" class="btn topright" style="margin-right: 0.5em;"> - <img src="<?php echo $this->data['baseurlpath'].'/resources/icons/clipboard.svg'; ?>" + <img src="/<?php echo $this->data['baseurlpath'].'resources/icons/clipboard.svg'; ?>" alt="Copy to clipboard"> </button> <pre id="phpmetadata"><?php echo $this->data['metadataflat']; ?></pre> -- GitLab