From 085f64c85fa09c65f6698efd0def0617eba929f4 Mon Sep 17 00:00:00 2001 From: sThiebaut Date: Thu, 8 Dec 2011 17:07:55 +0000 Subject: [PATCH] // maj git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11066 b9a71923-0436-4b27-9f14-aed3839534dd --- modules/blockbestsellers/blockbestsellers.css | 1 + modules/blockcategories/blockcategories.php | 20 +++++++++++++----- .../blockcategories/category-tree-branch.tpl | 4 ++-- .../blockcategories/img/icon/open-close.png | Bin 0 -> 165 bytes modules/blocklayered/blocklayered-15.css | 3 +++ modules/blocklayered/blocklayered.js | 2 ++ .../blocktopmenu/css/superfish-modified.css | 4 ++-- modules/blockwishlist/blockwishlist.css | 19 ++++++++++------- modules/blockwishlist/img/gift.gif | Bin 0 -> 1895 bytes modules/blockwishlist/img/icon/delete.gif | Bin 0 -> 213 bytes 10 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 modules/blockcategories/img/icon/open-close.png create mode 100644 modules/blockwishlist/img/gift.gif create mode 100644 modules/blockwishlist/img/icon/delete.gif diff --git a/modules/blockbestsellers/blockbestsellers.css b/modules/blockbestsellers/blockbestsellers.css index e07df3095..db88db52c 100644 --- a/modules/blockbestsellers/blockbestsellers.css +++ b/modules/blockbestsellers/blockbestsellers.css @@ -31,6 +31,7 @@ #best-sellers_block_right li p { float:left; margin-left:7px; + padding:0; width:125px; font-weight:bold; font-size:12px diff --git a/modules/blockcategories/blockcategories.php b/modules/blockcategories/blockcategories.php index c0329b5c6..7b7a57488 100644 --- a/modules/blockcategories/blockcategories.php +++ b/modules/blockcategories/blockcategories.php @@ -167,10 +167,20 @@ class BlockCategories extends Module $id_lang = (int)($params['cookie']->id_lang); $smartyCacheId = 'blockcategories|'.$id_current_shop.'_'.$groups.'_'.$id_lang.'_'.$id_product.'_'.$id_category; - Tools::enableCache(); + /*Tools::enableCache(); if (!$this->isCached('blockcategories.tpl', $smartyCacheId)) - { + {*/ $maxdepth = Configuration::get('BLOCK_CATEG_MAX_DEPTH'); + /*p(' + SELECT c.id_parent, c.id_category, cl.name, cl.description, cl.link_rewrite + FROM `'._DB_PREFIX_.'category` c + LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category` AND cl.`id_lang` = '.$id_lang.$this->context->shop->addSqlRestrictionOnLang('cl').') + LEFT JOIN `'._DB_PREFIX_.'category_group` cg ON (cg.`id_category` = c.`id_category`) + WHERE (c.`active` = 1 OR c.`id_category` = 1) + '.((int)($maxdepth) != 0 ? ' AND `level_depth` <= '.(int)($maxdepth) : '').' + AND cg.`id_group` IN ('.pSQL($groups).') + GROUP BY id_category + ORDER BY `level_depth` ASC, '.(Configuration::get('BLOCK_CATEG_SORT') ? 'cl.`name`' : 'c.`position`').' '.(Configuration::get('BLOCK_CATEG_SORT_WAY') ? 'DESC' : 'ASC'));*/ if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT c.id_parent, c.id_category, cl.name, cl.description, cl.link_rewrite FROM `'._DB_PREFIX_.'category` c @@ -193,10 +203,10 @@ class BlockCategories extends Module $resultParents[$row['id_parent']][] = &$row; $resultIds[$row['id_category']] = &$row; } - +//p($resultParents); $blockCategTree = $this->getTree($resultParents, $resultIds, Configuration::get('BLOCK_CATEG_MAX_DEPTH')); unset($resultParents, $resultIds); - +//d($blockCategTree); $isDhtml = (Configuration::get('BLOCK_CATEG_DHTML') == 1 ? true : false); if (Tools::isSubmit('id_category')) { @@ -220,7 +230,7 @@ class BlockCategories extends Module else $this->context->smarty->assign('branche_tpl_path', _PS_MODULE_DIR_.'blockcategories/category-tree-branch.tpl'); $this->context->smarty->assign('isDhtml', $isDhtml); - } + //} $this->context->smarty->cache_lifetime = 31536000; // 1 Year $display = $this->display(__FILE__, 'blockcategories.tpl', $smartyCacheId); Tools::restoreCacheSettings(); diff --git a/modules/blockcategories/category-tree-branch.tpl b/modules/blockcategories/category-tree-branch.tpl index 7c5a16e17..08215c654 100644 --- a/modules/blockcategories/category-tree-branch.tpl +++ b/modules/blockcategories/category-tree-branch.tpl @@ -25,11 +25,11 @@ *}
  • - {$node.name|escape:html:'UTF-8'} + {$node.name|escape:'htmlall':'UTF-8'} {if $node.children|@count > 0}