Merge pull request #118 from micka-fdz/move-iframe-css

PrestaSafe · Jul 20, 2023 · d9f6057 · d9f6057
2 parents 335bd83 + 87294da
commit d9f6057
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 48 deletions.
diff --git a/views/css/utility.css → _dev/public/iframe.css b/views/css/utility.css → _dev/public/iframe.css
@@ -42,7 +42,7 @@
     }
   }
 
-  h1, h2, h3, h4, h5, h6 {
+  .ptb-title {
     font-weight: normal;
     margin: 0;
   }

diff --git a/_dev/src/scripts/iframe.js b/_dev/src/scripts/iframe.js
@@ -267,6 +267,14 @@ async loadIframe () {
                 emitter.emit('scrollInIframe', currentBlock.id_prettyblocks)
             }
 
+            // we inject css in iframe
+            let cssLink = doc.createElement('link');
+            cssLink.rel = 'stylesheet';
+            cssLink.href = base_url + 'modules/prettyblocks/build/iframe.css';
+            cssLink.type = 'text/css';
+            cssLink.media = 'all';
+            doc.head.appendChild(cssLink);
+
             this.loadContext(e)
 
         }, false)

diff --git a/prettyblocks.php b/prettyblocks.php
@@ -50,7 +50,6 @@ class PrettyBlocks extends Module implements WidgetInterface
         'displayLeftColumn',
         'displayRightColumn',
         'actionDispatcher',
-        'actionFrontControllerSetMedia',
         'actionFrontControllerSetVariables',
     ];
 
@@ -168,18 +167,6 @@ public function uninstall()
             && $this->removeDb();
     }
 
-    public function hookActionFrontControllerSetMedia()
-    {
-        $this->context->controller->registerStylesheet(
-            'prettyblocksutility',
-            'modules/' . $this->name . '/views/css/utility.css',
-            [
-                'media' => 'all',
-                'priority' => 100,
-            ]
-        );
-    }
-
     public function hookActionFrontControllerSetVariables()
     {
         return [

diff --git a/src/Controller/AdminThemeManagerController.php b/src/Controller/AdminThemeManagerController.php
@@ -207,6 +207,7 @@ public function indexAction()
 
         return $this->render('@Modules/prettyblocks/views/templates/admin/index.html.twig', [
             'css_back_custom' => $uri,
+            'base_url' => $link->getBaseLink(),
             'favicon_url' => \Tools::getShopDomainSsl(true) . '/modules/' . $module->name . '/views/images/favicon.ico',
             'module_name' => $module->displayName,
             'shop_name' => $context->shop->name,

diff --git a/views/css/index.php b/views/css/index.php
diff --git a/views/templates/admin/index.html.twig b/views/templates/admin/index.html.twig
@@ -26,9 +26,11 @@
     {% endif %}
 
     <script>
+      var base_url = {{ base_url|json_encode|raw }}
       var ajax_urls = {{ ajax_urls|json_encode|raw }}
       var trans_app = {{ trans_app|json_encode|raw }}
       var security_app = {{ security_app|json_encode|raw }}
+      window.base_url = base_url  
       window.ajax_urls = ajax_urls  
       window.trans_app = trans_app  
       window.security_app = security_app