Version Notes
Bugfix for many 3rd party themes.
Improvement with type box on mobile.
Download this release
Release Info
Developer | Valdecode |
Extension | Vhaldecode_CookieLaw |
Version | 1.1.13 |
Comparing to | |
See all releases |
Code changes from version 1.1.12 to 1.1.13
- app/code/community/Valdecode/CookieLaw/etc/config.xml +1 -1
- app/design/frontend/base/default/template/cookielaw/after_body_start.phtml +4 -2
- app/design/frontend/base/default/template/cookielaw/before_body_end.phtml +4 -2
- app/design/frontend/base/default/template/cookielaw/widget.phtml +27 -32
- package.xml +6 -5
- skin/adminhtml/default/default/valdecode/cookielaw/css/cookielaw.css +2 -2
- skin/frontend/base/default/valdecode/cookielaw/css/cookielaw.css +6 -2
app/code/community/Valdecode/CookieLaw/etc/config.xml
CHANGED
@@ -19,7 +19,7 @@
|
|
19 |
<config>
|
20 |
<modules>
|
21 |
<Valdecode_CookieLaw>
|
22 |
-
<version>1.1.
|
23 |
</Valdecode_CookieLaw>
|
24 |
</modules>
|
25 |
<global>
|
19 |
<config>
|
20 |
<modules>
|
21 |
<Valdecode_CookieLaw>
|
22 |
+
<version>1.1.13</version>
|
23 |
</Valdecode_CookieLaw>
|
24 |
</modules>
|
25 |
<global>
|
app/design/frontend/base/default/template/cookielaw/after_body_start.phtml
CHANGED
@@ -16,6 +16,8 @@
|
|
16 |
*/
|
17 |
?>
|
18 |
<?php $_helper = Mage::helper('cookielaw'); ?>
|
19 |
-
<?php if ($_helper->
|
20 |
-
<?php
|
|
|
|
|
21 |
<?php endif; ?>
|
16 |
*/
|
17 |
?>
|
18 |
<?php $_helper = Mage::helper('cookielaw'); ?>
|
19 |
+
<?php if ($_helper->isActive()): ?>
|
20 |
+
<?php if ($_helper->getType() == 'v-bar' && $_helper->getBarPosition() == 'v-top'): ?>
|
21 |
+
<?php echo $this->getChildHtml('cookielaw.after_body_start.widget'); ?>
|
22 |
+
<?php endif; ?>
|
23 |
<?php endif; ?>
|
app/design/frontend/base/default/template/cookielaw/before_body_end.phtml
CHANGED
@@ -16,6 +16,8 @@
|
|
16 |
*/
|
17 |
?>
|
18 |
<?php $_helper = Mage::helper('cookielaw'); ?>
|
19 |
-
<?php if ($_helper->
|
20 |
-
<?php
|
|
|
|
|
21 |
<?php endif; ?>
|
16 |
*/
|
17 |
?>
|
18 |
<?php $_helper = Mage::helper('cookielaw'); ?>
|
19 |
+
<?php if ($_helper->isActive()): ?>
|
20 |
+
<?php if ($_helper->getType() != 'v-bar' || $_helper->getBarPosition() != 'v-top'): ?>
|
21 |
+
<?php echo $this->getChildHtml('cookielaw.before_body_end.widget'); ?>
|
22 |
+
<?php endif; ?>
|
23 |
<?php endif; ?>
|
app/design/frontend/base/default/template/cookielaw/widget.phtml
CHANGED
@@ -16,42 +16,37 @@
|
|
16 |
*/
|
17 |
?>
|
18 |
<?php $_helper = Mage::helper('cookielaw'); ?>
|
19 |
-
|
20 |
-
|
21 |
-
|
22 |
-
|
23 |
-
|
24 |
-
<?php echo ($_helper->getShow() == 'default') ? $this->__('This websites use cookies. By continuing to browse the site you are agreeing to our use of cookies.') : $_helper->getCustomMessage(); ?>
|
25 |
-
</div>
|
26 |
-
<div class="v-actions">
|
27 |
-
<a href="javascript:cookieLawAccept();" class="v-button v-accept">
|
28 |
-
<?php echo ($_helper->getShow() == 'default') ? $this->__("Accept") : $_helper->getCustomAccept(); ?>
|
29 |
-
</a>
|
30 |
-
<a href="<?php echo $_helper->getCmsPage(); ?>" class="v-button">
|
31 |
-
<?php echo ($_helper->getShow() == 'default') ? $this->__("More information") : $_helper->getCustomMoreInfo(); ?>
|
32 |
-
</a>
|
33 |
-
</div>
|
34 |
</div>
|
35 |
-
<
|
36 |
-
|
37 |
-
|
38 |
-
|
39 |
-
|
40 |
-
)
|
41 |
-
|
42 |
-
|
43 |
-
|
44 |
-
|
45 |
-
|
46 |
-
|
|
|
|
|
|
|
47 |
}
|
|
|
|
|
|
|
48 |
|
49 |
-
|
50 |
|
51 |
-
|
52 |
setTimeout(function () {
|
53 |
cookieLawAccept();
|
54 |
}, <?php echo $_helper->getAutohide()*1000; ?>);
|
55 |
-
|
56 |
-
|
57 |
-
<?php endif; ?>
|
16 |
*/
|
17 |
?>
|
18 |
<?php $_helper = Mage::helper('cookielaw'); ?>
|
19 |
+
<div id="v-cookielaw"
|
20 |
+
class="<?php echo $_helper->getType(); ?> <?php echo $_helper->getSkin(); ?> <?php echo ($_helper->getType() == 'v-bar') ? $_helper->getBarPosition() : $_helper->getBoxPosition(); ?>"
|
21 |
+
style="display: none">
|
22 |
+
<div class="v-message">
|
23 |
+
<?php echo ($_helper->getShow() == 'default') ? $this->__('This websites use cookies. By continuing to browse the site you are agreeing to our use of cookies.') : $_helper->getCustomMessage(); ?>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
24 |
</div>
|
25 |
+
<div class="v-actions">
|
26 |
+
<a href="javascript:cookieLawAccept();" class="v-button v-accept">
|
27 |
+
<?php echo ($_helper->getShow() == 'default') ? $this->__("Accept") : $_helper->getCustomAccept(); ?>
|
28 |
+
</a>
|
29 |
+
<a href="<?php echo $_helper->getCmsPage(); ?>" class="v-button">
|
30 |
+
<?php echo ($_helper->getShow() == 'default') ? $this->__("More information") : $_helper->getCustomMoreInfo(); ?>
|
31 |
+
</a>
|
32 |
+
</div>
|
33 |
+
</div>
|
34 |
+
<script type="text/javascript">
|
35 |
+
function cookieLawAccept() {
|
36 |
+
var d = null;
|
37 |
+
if (<?php echo $_helper->getBehaviour(); ?>) {
|
38 |
+
d = new Date();
|
39 |
+
d.setTime(d.getTime() + (<?php echo $_helper->getBehaviour(); ?> * 24 * 60 * 60 * 1000));
|
40 |
}
|
41 |
+
Mage.Cookies.set('cookielaw', '1', d);
|
42 |
+
document.getElementById('v-cookielaw').style.display = 'none';
|
43 |
+
}
|
44 |
|
45 |
+
if (!Mage.Cookies.get('cookielaw')) document.getElementById('v-cookielaw').style.display = '';
|
46 |
|
47 |
+
<?php if ($_helper->getAutohide()): ?>
|
48 |
setTimeout(function () {
|
49 |
cookieLawAccept();
|
50 |
}, <?php echo $_helper->getAutohide()*1000; ?>);
|
51 |
+
<?php endif; ?>
|
52 |
+
</script>
|
|
package.xml
CHANGED
@@ -1,18 +1,19 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Vhaldecode_CookieLaw</name>
|
4 |
-
<version>1.1.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.valdecode.com/license/cookielaw/license.txt">MIT</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>With EU Cookie Law Compliance your website complies with the EU Cookie Law. Elegant and responsive.</summary>
|
10 |
<description>With EU Cookie Law Compliance your website complies with the EU Cookie Law. Elegant and responsive.</description>
|
11 |
-
<notes>
|
|
|
12 |
<authors><author><name>Valdecode</name><user>Valdecode</user><email>info@valdecode.com</email></author></authors>
|
13 |
-
<date>
|
14 |
-
<time>
|
15 |
-
<contents><target name="magecommunity"><dir name="Valdecode"><dir name="CookieLaw"><dir><dir name="Helper"><file name="Data.php" hash="4cd6d0b433b2fe866b70a5ca2e243c73"/></dir><dir name="Model"><dir name="Config"><dir name="Bar"><file name="Position.php" hash="2e60a80e597789b717bc36f84b1e4377"/></dir><file name="Behaviour.php" hash="743013d311611109d8ffab0c41389bc9"/><dir name="Box"><file name="Position.php" hash="ef3ad00ae2ac6a06c9a99ec18efc749e"/></dir><file name="Message.php" hash="0e6bfe84b2580ce354552acc035d092c"/><file name="Skin.php" hash="e34c31f5d43fadaa223ff0b6dec99c06"/><file name="Type.php" hash="fc52cb69e4ee80af86cf2c601cf3b86e"/></dir></dir><dir name="etc"><file name="config.xml" hash="
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.3.0</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Vhaldecode_CookieLaw</name>
|
4 |
+
<version>1.1.13</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.valdecode.com/license/cookielaw/license.txt">MIT</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>With EU Cookie Law Compliance your website complies with the EU Cookie Law. Elegant and responsive.</summary>
|
10 |
<description>With EU Cookie Law Compliance your website complies with the EU Cookie Law. Elegant and responsive.</description>
|
11 |
+
<notes>Bugfix for many 3rd party themes.
|
12 |
+
Improvement with type box on mobile.</notes>
|
13 |
<authors><author><name>Valdecode</name><user>Valdecode</user><email>info@valdecode.com</email></author></authors>
|
14 |
+
<date>2015-02-15</date>
|
15 |
+
<time>17:04:18</time>
|
16 |
+
<contents><target name="magecommunity"><dir name="Valdecode"><dir name="CookieLaw"><dir><dir name="Helper"><file name="Data.php" hash="4cd6d0b433b2fe866b70a5ca2e243c73"/></dir><dir name="Model"><dir name="Config"><dir name="Bar"><file name="Position.php" hash="2e60a80e597789b717bc36f84b1e4377"/></dir><file name="Behaviour.php" hash="743013d311611109d8ffab0c41389bc9"/><dir name="Box"><file name="Position.php" hash="ef3ad00ae2ac6a06c9a99ec18efc749e"/></dir><file name="Message.php" hash="0e6bfe84b2580ce354552acc035d092c"/><file name="Skin.php" hash="e34c31f5d43fadaa223ff0b6dec99c06"/><file name="Type.php" hash="fc52cb69e4ee80af86cf2c601cf3b86e"/></dir></dir><dir name="etc"><file name="config.xml" hash="6eb1221e9d1664567238c747f29029c4"/><file name="system.xml" hash="f2207932d8602d2e2533c63605a586d0"/></dir></dir><file name="LICENSE.txt" hash="26b380479366863e061c42923b543b37"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Valdecode_CookieLaw.xml" hash="e7adaa88b42c61d001b26986e5f01729"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="cookielaw.xml" hash="36125de2ff1fcb020f697b723c00104d"/></dir><dir name="template"><dir name="cookielaw"><file name="after_body_start.phtml" hash="9624ba5a3a2b0ff4831d7138c2181bd6"/><file name="before_body_end.phtml" hash="ae1a7a717f0e0f5620c7a5872f15be51"/><file name="widget.phtml" hash="8b6cf8386aa4d4d6f507c43cd50e65b9"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="cookielaw.xml" hash="2664396eb94ee9806237b8866ed96cb1"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="valdecode"><dir name="cookielaw"><dir><dir name="css"><file name="cookielaw.css" hash="dbfdac24ab90decba292081eb48190a3"/></dir></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="valdecode"><dir name="cookielaw"><dir><dir name="css"><file name="cookielaw.css" hash="0b8631bcc4176af10d7983ed01eede18"/></dir><dir name="images"><file name="icon.png" hash="04424030d978ef131b7daafe920f23ea"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="de_DE"><file name="Valdecode_CookieLaw.csv" hash="8c0b438b3b881493196292433da834c0"/></dir><dir name="en_US"><file name="Valdecode_CookieLaw.csv" hash="e20c908d1e19e81e03591209c68b24a4"/></dir><dir name="es_ES"><file name="Valdecode_CookieLaw.csv" hash="a2cbbfa531bf83a7aa242e712994a632"/></dir><dir name="fr_FR"><file name="Valdecode_CookieLaw.csv" hash="a8bac4e60747368d50ae1938237e157d"/></dir><dir name="hu_HU"><file name="Valdecode_CookieLaw.csv" hash="707e25c44bd8ab7c0295f5c3a387292f"/></dir><dir name="nl_NL"><file name="Valdecode_CookieLaw.csv" hash="cd6b304edd0eacbc8cbd188d0375f43b"/></dir><dir name="ro_RO"><file name="Valdecode_CookieLaw.csv" hash="43f1b85b04ac02b1c1f873fb82df76db"/></dir></target></contents>
|
17 |
<compatible/>
|
18 |
<dependencies><required><php><min>5.3.0</min><max>6.0.0</max></php></required></dependencies>
|
19 |
</package>
|
skin/adminhtml/default/default/valdecode/cookielaw/css/cookielaw.css
CHANGED
@@ -13,8 +13,8 @@
|
|
13 |
* @copyright Copyright (c) 2014 Valdecode
|
14 |
* @license http://www.valdecode.com/license/cookielaw/license.txt The MIT License (MIT)
|
15 |
*/
|
16 |
-
ul.tabs.config-tabs a.v-cookielaw-section span { background: url(../images/icon.png) no-repeat
|
17 |
-
ul.tabs.config-tabs a.v-cookielaw-section.active span { background: #fff url(../images/icon.png) no-repeat
|
18 |
|
19 |
.content-header h3.v-cookielaw-header { background: url(../images/icon.png) no-repeat; padding-left: 31px; }
|
20 |
|
13 |
* @copyright Copyright (c) 2014 Valdecode
|
14 |
* @license http://www.valdecode.com/license/cookielaw/license.txt The MIT License (MIT)
|
15 |
*/
|
16 |
+
ul.tabs.config-tabs a.v-cookielaw-section span { background: url(../images/icon.png) no-repeat 187px 3px; }
|
17 |
+
ul.tabs.config-tabs a.v-cookielaw-section.active span { background: #fff url(../images/icon.png) no-repeat 187px 3px; }
|
18 |
|
19 |
.content-header h3.v-cookielaw-header { background: url(../images/icon.png) no-repeat; padding-left: 31px; }
|
20 |
|
skin/frontend/base/default/valdecode/cookielaw/css/cookielaw.css
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
* @copyright Copyright (c) 2014 Valdecode
|
14 |
* @license http://www.valdecode.com/license/cookielaw/license.txt The MIT License (MIT)
|
15 |
*/
|
16 |
-
#v-cookielaw { overflow: hidden; background: #fff; z-index:
|
17 |
#v-cookielaw .v-message { padding: 5px 10px; text-align: left; }
|
18 |
#v-cookielaw .v-actions { }
|
19 |
#v-cookielaw .v-button { color: #222; display: inline-block; background-color: #ececec; background-image: linear-gradient(#f4f4f4, #ececec); border: 1px solid #d4d4d4; padding: 4px 10px; text-decoration: none; text-shadow: 1px 1px 0 #fff; border-radius: 2px; }
|
@@ -36,7 +36,11 @@
|
|
36 |
#v-cookielaw.v-box.v-bottom-right { bottom: 0; right: 0; }
|
37 |
|
38 |
/* RWD */
|
39 |
-
@media
|
|
|
|
|
|
|
|
|
40 |
#v-cookielaw .v-message { float: left; }
|
41 |
#v-cookielaw .v-actions { float: left; margin: 5px 10px; }
|
42 |
#v-cookielaw.v-bar .v-actions { width: auto; }
|
13 |
* @copyright Copyright (c) 2014 Valdecode
|
14 |
* @license http://www.valdecode.com/license/cookielaw/license.txt The MIT License (MIT)
|
15 |
*/
|
16 |
+
#v-cookielaw { overflow: hidden; background: #fff; color: #444; z-index: 9999; }
|
17 |
#v-cookielaw .v-message { padding: 5px 10px; text-align: left; }
|
18 |
#v-cookielaw .v-actions { }
|
19 |
#v-cookielaw .v-button { color: #222; display: inline-block; background-color: #ececec; background-image: linear-gradient(#f4f4f4, #ececec); border: 1px solid #d4d4d4; padding: 4px 10px; text-decoration: none; text-shadow: 1px 1px 0 #fff; border-radius: 2px; }
|
36 |
#v-cookielaw.v-box.v-bottom-right { bottom: 0; right: 0; }
|
37 |
|
38 |
/* RWD */
|
39 |
+
@media (max-width: 480px) {
|
40 |
+
#v-cookielaw.v-box { display: table; width: 100% !important; padding: 5px 0 0; position: fixed; bottom: 0 !important; top: auto !important; border-top: 1px solid #000; max-width: 100%; margin: 0; border-radius: 0; border-right: 0; border-left: 0; border-bottom: 0; }
|
41 |
+
#v-cookielaw.v-box .v-message { display: table-cell; }
|
42 |
+
#v-cookielaw.v-box .v-actions { display: table-cell; vertical-align: middle; width: 250px; padding-right: 10px; text-align: left; }
|
43 |
+
|
44 |
#v-cookielaw .v-message { float: left; }
|
45 |
#v-cookielaw .v-actions { float: left; margin: 5px 10px; }
|
46 |
#v-cookielaw.v-bar .v-actions { width: auto; }
|