Merge branch 'sw-24691/5.6/fix-issue-with-overlay' into '5.6'

SW-24691 - Fix issue with off-canvas menu being visible for a second, added...

See merge request shopware/5/product/shopware!184

Author: shyim

_sql/migrations/1649-add-cookie-consent-manager-site.php

@@ -12,7 +12,7 @@ public function up($modus)
 
         $sql = <<<SQL
             INSERT INTO `s_cms_static` (`active`, `tpl1variable`, `tpl1path`, `tpl2variable`, `tpl2path`, `tpl3variable`, `tpl3path`, `description`, `html`, `grouping`, `position`, `link`, `target`, `parentID`, `page_title`, `meta_keywords`, `meta_description`, `changed`, `shop_ids`) VALUES
-            (1, '',	'',	'',	'',	'',	'',	'Cookie Einstellungen',	'', 'bottom2|left',	0, 'javascript:openCookieConsentManager()',	'',	0, '', '', '', '2019-11-01 00:00:00', NULL);
+            (1, '',	'',	'',	'',	'',	'',	'Cookie-Einstellungen',	'', 'bottom2|left',	0, 'javascript:openCookieConsentManager()',	'',	0, '', '', '', '2019-11-01 00:00:00', NULL);
 SQL;
         $this->addSql($sql);
 

snippets/frontend/cookie_consent/cookies.ini

@@ -17,7 +17,7 @@ no_cache = "Customer-specific caching"
 session = "Session"
 csrf = "CSRF-Token"
 shop = "Ausgewählter Shop"
-preferences = "Cookie Einstellungen"
+preferences = "Cookie-Einstellungen"
 slt = "Kunden-Wiedererkennung"
 decline = "Alle Cookies ablehnen"
 allow = "Alle Cookies annehmen"

themes/Frontend/Responsive/frontend/_public/src/js/jquery.cookie-consent-manager.js

@@ -120,6 +120,14 @@
              * @type {string}
              */
             openConsentManagerButton: '*[data-openConsentManager=true]',
+
+            /**
+             * Selector of the element which can be clicked as well to toggle a cookies state.
+             *
+             * @property cookieLabelSelector
+             * @type {string}
+             */
+            cookieLabelSelector: '.cookie--label'
         },
 
         /**
@@ -166,6 +174,7 @@
             this.$el.find(this.opts.cookieGroupToggleInputSelector).on('change', $.proxy(this.onGroupToggleChanged, this));
             this.$el.find(this.opts.cookieActiveInputSelector).on('change', $.proxy(this.onCookieToggleChanged, this));
             this.$el.find(this.opts.saveButtonSelector).on('click', $.proxy(this.onSave, this));
+            this.$el.find(this.opts.cookieLabelSelector).on('click', $.proxy(this.onClickCookieName, this));
 
             this._on(this.opts.openConsentManagerButton, 'click', $.proxy(this.openConsentManager, this));
         },
@@ -271,6 +280,14 @@
             $.publish('plugin/swCookieConsentManager/onBuildCookiePreferences', [ this, preferences ]);
         },
 
+        onClickCookieName: function (event) {
+            var cookieNameEl = $(event.currentTarget),
+                cookieCt = cookieNameEl.parent(this.opts.cookieContainerSelector),
+                inputEl = cookieCt.find(this.opts.cookieActiveInputSelector);
+
+            inputEl.click();
+        },
+
         toggleAllCookiesFromGroup: function (cookies, active) {
             var me = this;
 

themes/Frontend/Responsive/frontend/_public/src/less/_components/cookie-consent-manager.less

@@ -1,6 +1,6 @@
 #cookie-consent:extend(.sidebar-main.off-canvas) {
     .unitize-width(280);
-    .transition(all 0.45s cubic-bezier(.3,0,.15,1));
+    .transition(transform 0.45s cubic-bezier(.3,0,.15,1));
 
     &.off-canvas {
         position: fixed;
@@ -62,6 +62,10 @@
         .unitize-padding(15, 0);
 
         position: relative;
+
+        .cookie--label {
+            cursor: pointer;
+        }
     }
 
     .cookie-consent--group-container {