From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 4 Jan 2022 18:51:34 +0000 (+0100)
Subject: wip #5002 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=d24fbb5a9041dc857731ac27b5030f1e45d13d36;p=odl.git

wip #5002 @1
---

diff --git a/app/Http/Controllers/FrontController.php b/app/Http/Controllers/FrontController.php
index 7a34456..55e1ca1 100644
--- a/app/Http/Controllers/FrontController.php
+++ b/app/Http/Controllers/FrontController.php
@@ -23,7 +23,6 @@ class FrontController extends Controller
 
     public function resources()
     {
-
         return view('front.resources', $this->_getDataFromCMS());
     }
 
diff --git a/resources/pdfjs/web/viewer.html b/resources/pdfjs/web/viewer.html
index 3f64242..f422e3a 100644
--- a/resources/pdfjs/web/viewer.html
+++ b/resources/pdfjs/web/viewer.html
@@ -30,10 +30,16 @@ See https://github.com/adobe-type-tools/cmap-resources
     <link rel="resource" type="application/l10n" href="locale/locale.properties">
     <script src="jquery.min.js"></script>
     <script>
+        var inFluidbook = window.parent.fluidbook !== undefined;
         $(function () {
             $(document).on('click', 'a[href^="pdf:"]', function () {
                 var e = $(this).attr('href').split('#');
-                var file = window.parent.fluidbook.settings.mediaIDToFile[e[0]];
+                var file;
+                if (inFluidbook) {
+                    file = window.parent.fluidbook.settings.mediaIDToFile[e[0]]
+                } else {
+                    file = window.parent.mediaIDToFile[e[0]];
+                }
                 var hash = '';
                 if (e.length > 1) {
                     var p = parseInt(e[1]);
@@ -43,7 +49,11 @@ See https://github.com/adobe-type-tools/cmap-resources
                         hash = '#page=' + e[1];
                     }
                 }
-                window.location = 'viewer.html?file=../../data/links/' + file + hash;
+                if(inFluidbook) {
+                    window.location = 'viewer.html?file=../../data/links/' + file + hash;
+                }else{
+                    window.location = 'viewer.html?file=' + file + hash;
+                }
                 return false;
             });
         });
diff --git a/resources/views/front/resources.blade.php b/resources/views/front/resources.blade.php
index 809d206..863a0de 100644
--- a/resources/views/front/resources.blade.php
+++ b/resources/views/front/resources.blade.php
@@ -6,7 +6,15 @@
 @endpush
 
 @section('content')
-
+    @php
+        $mediaIDToFile=[];
+        foreach ($resources_pdf as $id=>$item) {
+            $mediaIDToFile[$id]=$resources->getImageURLbyCollection($pdf->get('file_upload'));
+        }
+    @endphp
+    <script>
+        var mediaIDToFile=@json($mediaIDTiFile);
+    </script>
     {{-- RESOURCES --}}
     <div class="resources" x-data="{
         viewerURL: '/front/coeur/pdfjs/web/viewer.html?file=', // Base URL for viewer