From 8ddef67ece2743af95e8c58d939542ab17804597 Mon Sep 17 00:00:00 2001
From: Laurent Laffont <llaffont@afi-sa.fr>
Date: Tue, 14 Nov 2017 11:32:51 +0100
Subject: [PATCH] dev #65756 load universal player from Omeka
---
.../Omeka/View/Helper/Album.php | 16 +++++++++++++---
.../digital_resources/Omeka/tests/OmekaTest.php | 4 ++--
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/library/digital_resources/Omeka/View/Helper/Album.php b/library/digital_resources/Omeka/View/Helper/Album.php
index 58b572d8ea2..c8e8c531a9a 100644
--- a/library/digital_resources/Omeka/View/Helper/Album.php
+++ b/library/digital_resources/Omeka/View/Helper/Album.php
@@ -24,9 +24,19 @@ class Omeka_View_Helper_Album extends ZendAfi_View_Helper_TagRessourceNumerique
public function album($album) {
$this->_album = $album;
- return $this->view->tag('div',
- '',
- ['data-uri' => $this->_manifestURI($album)]);
+
+ return
+ $this->view->tag('div',
+ '',
+ ['data-config' => $album->getUrlOrigine() . '/plugins/UniversalViewer/views/public/universal-viewer/config.json',
+ 'data-uri' => $this->_manifestURI($album),
+ 'class' => 'uv',
+ 'style' => 'height:600px'])
+ .
+ $this->view->tag('script',
+ '',
+ ['id' => 'embedUV',
+ 'src' => $album->getUrlOrigine() . '/plugins/UniversalViewer/views/shared/javascripts/uv/lib/embed.js']);
}
diff --git a/library/digital_resources/Omeka/tests/OmekaTest.php b/library/digital_resources/Omeka/tests/OmekaTest.php
index 1e96e025a8c..3fd03ebc71b 100644
--- a/library/digital_resources/Omeka/tests/OmekaTest.php
+++ b/library/digital_resources/Omeka/tests/OmekaTest.php
@@ -105,9 +105,9 @@ class OmekaHarvestedTest extends AbstractControllerTestCase {
/** @test */
- public function alpersRecordPreviewShouldUseUniversalIIIFPlayer() {
+ public function alperRecordPreviewShouldUseUniversalIIIFPlayer() {
$this->dispatch('/noticeajax/resnumeriques/id/1', true);
- $this->assertXPath('//div[@data-uri="http://omeka-demo.biblibre.com/iiif/668/manifest"]');
+ $this->assertXPath('//div[@class="uv"][@data-uri="http://omeka-demo.biblibre.com/iiif/668/manifest"]/following-sibling::script[@id="embedUV"][@src="http://omeka-demo.biblibre.com/plugins/UniversalViewer/views/shared/javascripts/uv/lib/embed.js"]');
}
}
--
GitLab