Load css from external location

trustpilot · Sep 7, 2018 · 0fe6b93 · 0fe6b93
1 parent b7417f3
commit 0fe6b93
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 40 deletions.
diff --git a/Block/System/Config/Preview.php b/Block/System/Config/Preview.php
@@ -43,11 +43,6 @@ public function getXPathValue()
         return $this->_helper->getTrustboxConfigValue('trustbox_xpath');
     }
 
-    public function getIframeCssUrl()
-    {
-        return $this->getViewFileUrl('Trustpilot_Reviews::css/trustpilot-iframe.css');
-    }
-
     public function getPreviewUrl()
     {
         return $this->_previewUrl;

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "trustpilot/module-reviews",
     "description": "The Trustpilot Review extension makes it simple and easy for merchants to collect reviews from their customers to power their marketing efforts, increase sales conversion, build their online reputation and draw business insights.",
     "type": "magento2-module",
-    "version": "1.0.214",
+    "version": "1.0.216",
     "license": [
       "OSL-3.0"
     ],

diff --git a/etc/config.xml b/etc/config.xml
@@ -10,7 +10,7 @@
                <ConnectUrl>https://ecommerce-invitations.b2b.trustpilot.com/#/magento</ConnectUrl>
                <SnippetUrl>https://businessapp.b2b.trustpilot.com/#/integrations/trustbox/library</SnippetUrl>
                <PreviewUrl>//ecommplugins-scripts.trustpilot.com/</PreviewUrl>
-               <ReleaseNumber>1.0.214</ReleaseNumber>
+               <ReleaseNumber>1.0.216</ReleaseNumber>
                <key></key>
             </general>
        </trustpilotGeneral>

diff --git a/view/adminhtml/templates/system/config/preview.phtml b/view/adminhtml/templates/system/config/preview.phtml
@@ -13,7 +13,7 @@
         data-trustpilot_trustbox_category="<?php echo $this->getPageUrl('trustpilot_trustbox_category'); ?>"
         data-trustpilot_trustbox_product="<?php echo $this->getPageUrl('trustpilot_trustbox_product'); ?>"
         id="trustbox_preview_frame"
-        onload="TrustpilotPreview.init('<?php echo $this->getIframeCssUrl(); ?>');"
+        onload="TrustpilotPreview.init('<?php echo $this->getPreviewUrl(); ?>css/trustpilot-iframe.css');"
         frameborder="0" 
         width="100%" 
         height="800">

diff --git a/view/adminhtml/web/css/trustpilot-iframe.css b/view/adminhtml/web/css/trustpilot-iframe.css
diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0"?>
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <referenceContainer name="header.container">
+        <block class="Trustpilot\Reviews\Block\Head" name="trustpilot.header.head" as="trustpilot.header.head" template="Trustpilot_Reviews::header/head.phtml"/>
+    </referenceContainer>
     <head>
         <css src="Trustpilot_Reviews::css/trustpilot.css"/>
-        <css src="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" src_type="url" />
     </head>
-    <body>
-        <referenceContainer name="header.container">
-            <block class="Trustpilot\Reviews\Block\Head" name="trustpilot.header.head" as="trustpilot.header.head"
-                   template="Trustpilot_Reviews::header/head.phtml"/>
-        </referenceContainer>
-    </body>
 </page>
diff --git a/view/frontend/web/css/trustpilot.css b/view/frontend/web/css/trustpilot.css
@@ -1,3 +1,5 @@
+@import url('https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css');
+
 .shake-and-hide-element {
     -moz-animation: hide-element 0s ease-in 5s forwards, shake-element  1s;
     /* Firefox */