Merge branch 'master' into magento2.1.x

opengento · Jul 31, 2018 · c184498 · c184498
2 parents be3197d + 65e8101
commit c184498
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/Block/Messages/PrivacyMessagePopup.php b/Block/Messages/PrivacyMessagePopup.php
@@ -94,9 +94,10 @@ private function getCookieDisclosureInformation(): string
         if (!$this->hasData('cookie_disclosure_information')) {
             $block = $this->getLayout()->createBlock(
                 Block::class,
+                'opengento.gdpr.cookie.disclosure.information',
                 ['data' => ['block_id' => $this->config->getCookieDisclosureInformationBlockId()]]
             );
-            $this->setData('cookie_disclosure_information', $block);
+            $this->setData('cookie_disclosure_information', $block->toHtml());
         }
 
         return (string) $this->_getData('cookie_disclosure_information');

diff --git a/view/frontend/web/js/view/popup.js b/view/frontend/web/js/view/popup.js
@@ -23,33 +23,26 @@ define([
     return Component.extend({
         showPopUp: ko.observable(null),
         popupText: ko.observable(null),
+        popupLink: ko.observable(null),
 
         defaults: {
             template: 'Opengento_Gdpr/message'
         },
 
         /**
-         * Initialize component.
+         * Initialize component
          */
         initialize: function () {
             this._super();
 
             this.showPopUp(!$.cookie(this.cookieName));
             this.popupText(this.notificationText);
+            this.popupLink(this.learnMore);
 
             $(document).on('click', '#enhanced-privacy-popup-agree', function () {
                 this.showPopUp(false);
                 $.cookie(this.cookieName, 1);
             }.bind(this));
-        },
-
-        /**
-         * Get URL to information page.
-         *
-         * @returns {*}
-         */
-        getLearnMoreLink: function () {
-            return this.learnMore;
         }
     });
 });
diff --git a/view/frontend/web/template/message.html b/view/frontend/web/template/message.html
@@ -18,10 +18,10 @@
     <div class="popup content">
         <strong data-bind="i18n: 'Cookie Disclosure'"></strong>
         <div class="block-content">
-            <p data-bind="text: notificationText"></p>
+            <div data-bind="html: notificationText"></div>
             <div class="actions-toolbar">
                 <div class="secondary">
-                    <a class="action" data-bind="attr: {href: getLearnMoreLink() }, i18n: 'Read More'"></a>
+                    <a class="action" data-bind="attr: {href: learnMore}, i18n: 'Read More'"></a>
                 </div>
                 <div class="primary">
                     <button type="button" class="action primary" id="enhanced-privacy-popup-agree" data-bind="i18n: 'Accept'"></button>