diff --git a/VERSIONS_HOTLINE/25532_epub b/VERSIONS_HOTLINE/25532_epub new file mode 100644 index 0000000000000000000000000000000000000000..566408b8d77bd661b785cb52356fe9e3874fbfc1 --- /dev/null +++ b/VERSIONS_HOTLINE/25532_epub @@ -0,0 +1 @@ +- ticket #25532 : Correction de la prévisualisation des epub dans Internet Explorer 11 \ No newline at end of file diff --git a/library/ZendAfi/View/Helper/MonocleReaderServerSide.php b/library/ZendAfi/View/Helper/MonocleReaderServerSide.php index 95e26668511d57222f102736030823143cc31d11..9436d00df1d8389204297b8fe5c5510d342c0ec2 100644 --- a/library/ZendAfi/View/Helper/MonocleReaderServerSide.php +++ b/library/ZendAfi/View/Helper/MonocleReaderServerSide.php @@ -64,7 +64,7 @@ class ZendAfi_View_Helper_MonocleReaderServerSide extends Zend_View_Helper_HtmlE $components = []; foreach ($epub->getSpineItems() as $item) { - $href=$epub->getItemElById($item['id'])->getAttribute('href') ; + $href=$urlepub.$epub->getItemElById($item['id'])->getAttribute('href') ; $components[$item['id']]= $href; } @@ -80,7 +80,7 @@ class ZendAfi_View_Helper_MonocleReaderServerSide extends Zend_View_Helper_HtmlE ->addInlineScript(sprintf('initMonocleServer(%s,\'%s\',%s,\'%s\');', json_encode($contents),$urlepub,json_encode($components),$this->getIdAjaxDiv())); - return ' <BASE href="'.$urlepub.'" /><div id='.$this->getIdAjaxDiv().'><p></p></div>'.Class_ScriptLoader::getInstance()->html(); + return '<div id='.$this->getIdAjaxDiv().'><p></p></div>'.Class_ScriptLoader::getInstance()->html(); } diff --git a/public/admin/js/efm/js/monocore.js b/public/admin/js/efm/js/monocore.js index f8d0af97c4e28e0e655bf4bccab050ba15f2ed6b..c609b98b580a9cf84cf7beba7d16975049d116d6 100644 --- a/public/admin/js/efm/js/monocore.js +++ b/public/admin/js/efm/js/monocore.js @@ -1902,7 +1902,7 @@ Monocle.Reader = function (node, bookData, options, onLoadCallback) { if (!Monocle.Browser.env.isCompatible()) { if (dispatchEvent("monocle:incompatible", {}, true)) { - API.billboard.show(k.SUPPORT_URL, { closeButton: false }); + API.billboard.show(document.createTextNode("Your browser is not compatible"), { closeButton: false }); } return; } diff --git a/public/opac/css/global.css b/public/opac/css/global.css index 6b90dfcb56db75726c12b174418928070bfc9bb8..59ed4502f5b608161687ea6409d40482c3d2ae8e 100644 --- a/public/opac/css/global.css +++ b/public/opac/css/global.css @@ -2453,6 +2453,10 @@ table.tablesorter span { height: 100%; } +#resnum #reader { + position: relative; +} + #my_vid { text-align: center; diff --git a/tests/library/ZendAfi/View/Helper/MonocleReaderServerSideTest.php b/tests/library/ZendAfi/View/Helper/MonocleReaderServerSideTest.php index 45b3936599ae43316f49cbe5ed2b3dc3ac485791..f36cd5474162836084cf823f87abd18756eade31 100644 --- a/tests/library/ZendAfi/View/Helper/MonocleReaderServerSideTest.php +++ b/tests/library/ZendAfi/View/Helper/MonocleReaderServerSideTest.php @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE * along with BOKEH; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ require_once realpath(dirname(__FILE__)) . '/ViewHelperTestCase.php'; @@ -31,25 +31,11 @@ Class MonocleReaderServerSidePrevisuTest extends ViewHelperTestCase { $this->_html = $monocle_view->monocleReaderServerSidePrevisuForUrl(realpath(dirname(__FILE__)). '/../../../../fixtures/ob_b29bc3_edward-bernays-propaganda-comment-manipuler-l-op.epub'); } - + /** @test */ public function javascriptShouldContainsFullPathForFiles() { $this->assertContains('"Text\/%206.%20LA%20PROPAGANDE%20ET%20L%27AUTORIT%C3%89%20POLITIQUE.htm',$this->_html,$this->_html); } - - - - /** @test */ - public function baseShouldContainsText() { - $this->assertXPath($this->_html,"//base[contains(@href,'OEBPS')]",$this->_html) ; - - } - - - - - } ?> -