From 18ab409eeb675d230e4989765ac468c56000b705 Mon Sep 17 00:00:00 2001 From: PhpMadman Date: Fri, 4 Oct 2013 10:38:03 +0200 Subject: [PATCH 001/141] [*] BO: #PNM-1472 Changed label and transparency range check to 1 Changed label to 1-100 since, there is no need to set transparency to 0, since it will pretty much will be invisible already at 1 --- modules/watermark/watermark.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/watermark/watermark.php b/modules/watermark/watermark.php index 9e396006a..b395dfb54 100644 --- a/modules/watermark/watermark.php +++ b/modules/watermark/watermark.php @@ -97,7 +97,7 @@ class Watermark extends Module if (empty($transparency)) $this->_postErrors[] = $this->l('Transparency required.'); - elseif ($transparency < 0 || $transparency > 100) + elseif ($transparency < 1 || $transparency > 100) $this->_postErrors[] = $this->l('Transparency is not in allowed range.'); if (empty($yalign)) @@ -174,7 +174,7 @@ class Watermark extends Module - '.$this->l('Watermark transparency (0-100)').' + '.$this->l('Watermark transparency (1-100)').' '.$this->l('Watermark X align').' From 0bc1d214324b01606cf08df6a38a51949fc253b7 Mon Sep 17 00:00:00 2001 From: Julien Date: Sat, 26 Oct 2013 15:08:07 +0200 Subject: [PATCH 002/141] [-] MO : Fix NetworkError 404 Not Found on admin in blocklayered.php These files not exists : - /js/jquery/jquery-ui-1.8.10.custom.min.js - /css/jquery-ui-1.8.10.custom.css --- modules/blocklayered/blocklayered.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php index 3d2039ed9..348a03284 100644 --- a/modules/blocklayered/blocklayered.php +++ b/modules/blocklayered/blocklayered.php @@ -1186,7 +1186,6 @@ class BlockLayered extends Module $this->context->controller->addJS(($this->_path).'blocklayered.js'); - $this->context->controller->addJS(_PS_JS_DIR_.'jquery/jquery-ui-1.8.10.custom.min.js'); $this->context->controller->addJQueryUI('ui.slider'); $this->context->controller->addCSS(($this->_path).'blocklayered-15.css', 'all'); $this->context->controller->addJQueryPlugin('scrollTo'); @@ -1686,7 +1685,6 @@ class BlockLayered extends Module
'.$this->l('Build your own filter template').' -