Merge pull request #15 from september-werbeagentur/feature/show-3d-vi…

…ewer-on-page Insert 3d view as an iframe
september-werbeagentur · Aug 14, 2019 · e450a8a · e450a8a
2 parents 34c64f6 + c5467c3
commit e450a8a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/Resources/contao/dca/tl_realestate.php b/src/Resources/contao/dca/tl_realestate.php
@@ -172,7 +172,7 @@
             'inputType' => 'text',
             'eval' => [
                 'rgxp' => 'url',
-                'decodeEntities' => true,
+                'decodeEntities' => false,
                 'maxlength' => 255,
                 'dcaPicker' => true,
                 'tl_class' => 'w50 wizard',

diff --git a/src/Resources/contao/languages/de/tl_realestate.php b/src/Resources/contao/languages/de/tl_realestate.php
@@ -32,6 +32,6 @@
 $GLOBALS['TL_LANG']['tl_realestate']['slider_images'][0] = 'Sliderbilder';
 $GLOBALS['TL_LANG']['tl_realestate']['slider_images'][1] = 'Wählen Sie die Bilder für den Slider aus.';
 $GLOBALS['TL_LANG']['tl_realestate']['ddd_view'][0] = '3D-Rundgang';
-$GLOBALS['TL_LANG']['tl_realestate']['ddd_view'][1] = 'Wählen Sie eine Seite aus, die als 3D-Rundgang verlinkt werden soll.';
+$GLOBALS['TL_LANG']['tl_realestate']['ddd_view'][1] = 'Geben Sie hier den Pfad zum 3D Rundgang an.';
 $GLOBALS['TL_LANG']['tl_realestate']['banner'][0] = 'Overlay Banner';
 $GLOBALS['TL_LANG']['tl_realestate']['banner'][1] = 'z.B. "bereits 50% verkauft"';
diff --git a/src/Resources/contao/templates/modules/mod_propertyreader.html5 b/src/Resources/contao/templates/modules/mod_propertyreader.html5
@@ -7,11 +7,7 @@
             <h1 class="swa-property-reader__title"><?= $this->name; ?></h1>
             <p class="swa-property-reader__address"><?= $this->address; ?></p>
         </div>
-        <?php if ($this->ddd_view): ?>
-            <a href="<?= $this->ddd_view ?>" class="swa-property-reader__3d-link" title="3D-Rundgang öffnen" target="_blank">
-                <img class="swa-property-reader__3d-icon" src="/bundles/contaorealestate/img/3d-icon.svg" alt="3D-Rundgang">
-            </a>
-        <?php endif; ?>
+
     </div>
     <?php //TODO make alt text maintainable in backend ?>
     <?php if ($this->logoPath): ?>
@@ -24,6 +20,9 @@
             <?= $this->description; ?>
         </div>
     </article>
+    <?php if ($this->ddd_view): ?>
+        <iframe width="100%" height="400" class="swa-property-reader__3d-view" src="<?= $this->ddd_view; ?>"></iframe>
+    <?php endif; ?>
     <?php if (count($this->sliderImagePaths) > 0) : ?>
         <div class="swa-property-reader__slider">
             <?php $this->insert('mod_imageslider', array('imagepaths' => $this->sliderImagePaths)); ?>