dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// revert previous commit

Browse Source
This commit is contained in:
tDidierjean
2011-07-08 16:12:27 +00:00
parent af4c7605de
commit 9b288cecf5
38 changed files with 284 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blockadvertising/blockadvertising.php
+6 -5
View File
@@ -210,11 +210,12 @@ class BlockAdvertising extends Module
*/
function hookRightColumn($params)
{
$context = Context::getContext();
$context->controller->addCSS($this->_path.'blockadvertising.css', 'all');
$context->controller->smarty->assign('image', $context->link->protocol_content.$this->adv_img);
$context->controller->smarty->assign('adv_link', $this->adv_link);
$context->controller->smarty->assign('adv_title', $this->adv_title);
global $smarty, $protocol_content;
Tools::addCSS($this->_path.'blockadvertising.css', 'all');
$smarty->assign('image', $protocol_content.$this->adv_img);
$smarty->assign('adv_link', $this->adv_link);
$smarty->assign('adv_title', $this->adv_title);
return $this->display(__FILE__, 'blockadvertising.tpl');
}
modules/blockbestsellers/blockbestsellers.php
+2 -2
View File
@@ -120,13 +120,13 @@ class BlockBestSellers extends Module
{
return $this->hookRightColumn($params);
}
public function hookHeader($params)
{
if (Configuration::get('PS_CATALOG_MODE'))
return ;
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockbestsellers.css', 'all');
Tools::addCSS(($this->_path).'blockbestsellers.css', 'all');
}
}
modules/blockcart/blockcart.php
+3 -3
View File
@@ -185,10 +185,10 @@ class BlockCart extends Module
{
if (Configuration::get('PS_CATALOG_MODE'))
return;
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockcart.css', 'all');
Tools::addCSS(($this->_path).'blockcart.css', 'all');
if ((int)(Configuration::get('PS_BLOCK_CART_AJAX')))
$context->controller->addJS(($this->_path).'ajax-cart.js');
Tools::addJS(($this->_path).'ajax-cart.js');
}
}
modules/blockcategories/blockcategories.php
+2 -3
View File
@@ -323,9 +323,8 @@ class BlockCategories extends Module
public function hookHeader()
{
$context = Context::getContext();
$context->controller->addJS(_THEME_JS_DIR_.'tools/treeManagement.js');
$context->controller->addCSS(($this->_path).'blockcategories.css', 'all');
Tools::addJS(_THEME_JS_DIR_.'tools/treeManagement.js');
Tools::addCSS(($this->_path).'blockcategories.css', 'all');
}
private function _clearBlockcategoriesCache()
modules/blockcms/blockcms.php
+1 -2
View File
@@ -748,8 +748,7 @@ class BlockCms extends Module
public function hookHeader($params)
{
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockcms.css', 'all');
Tools::addCSS(($this->_path).'blockcms.css', 'all');
}
public function getL($key)
modules/blockcurrencies/blockcurrencies.php
+1 -2
View File
@@ -74,8 +74,7 @@ class BlockCurrencies extends Module
{
if (Configuration::get('PS_CATALOG_MODE'))
return ;
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockcurrencies.css', 'all');
Tools::addCSS(($this->_path).'blockcurrencies.css', 'all');
}
}
modules/blocklanguages/blocklanguages.php
+1 -2
View File
@@ -68,8 +68,7 @@ class BlockLanguages extends Module
function hookHeader($params)
{
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blocklanguages.css', 'all');
Tools::addCSS(($this->_path).'blocklanguages.css', 'all');
}
}
modules/blocklayered/blocklayered.php
+4 -5
View File
@@ -81,11 +81,10 @@ class BlockLayered extends Module
$id_parent = (int)Tools::getValue('id_category', Tools::getValue('id_category_layered', 1));
if ($id_parent == 1)
return;
$context = Context::getContext();
$context->controller->addJS(($this->_path).'blocklayered.js');
$context->controller->addJS(_PS_JS_DIR_.'jquery/jquery-ui-1.8.10.custom.min.js');
$context->controller->addCSS(($this->_path).'blocklayered.css', 'all');
$context->controller->addCSS(_PS_CSS_DIR_.'jquery-ui-1.8.10.custom.css', 'all');
Tools::addJS(($this->_path).'blocklayered.js');
Tools::addJS(_PS_JS_DIR_.'jquery/jquery-ui-1.8.10.custom.min.js');
Tools::addCSS(($this->_path).'blocklayered.css', 'all');
Tools::addCSS(_PS_CSS_DIR_.'jquery-ui-1.8.10.custom.css', 'all');
}
modules/blockmanufacturer/blockmanufacturer.php
+1 -2
View File
@@ -128,7 +128,6 @@ class BlockManufacturer extends Module
function hookHeader($params)
{
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockmanufacturer.css', 'all');
Tools::addCSS(($this->_path).'blockmanufacturer.css', 'all');
}
}
modules/blockmyaccount/blockmyaccount.php
+1 -2
View File
@@ -86,8 +86,7 @@ class BlockMyAccount extends Module
}
function hookHeader($params)
{
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockmyaccount.css', 'all');
Tools::addCSS(($this->_path).'blockmyaccount.css', 'all');
}
}
modules/blocknewproducts/blocknewproducts.php
+1 -2
View File
@@ -113,8 +113,7 @@ class BlockNewProducts extends Module
public function hookHeader($params)
{
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blocknewproducts.css', 'all');
Tools::addCSS(($this->_path).'blocknewproducts.css', 'all');
}
}
modules/blocknewsletter/blocknewsletter.php
+1 -2
View File
@@ -278,8 +278,7 @@ class Blocknewsletter extends Module
function hookHeader($params)
{
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blocknewsletter.css', 'all');
Tools::addCSS(($this->_path).'blocknewsletter.css', 'all');
}
}
modules/blockpaymentlogo/blockpaymentlogo.php
+1 -2
View File
@@ -137,8 +137,7 @@ class BlockPaymentLogo extends Module
{
if (Configuration::get('PS_CATALOG_MODE'))
return ;
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockpaymentlogo.css', 'all');
Tools::addCSS(($this->_path).'blockpaymentlogo.css', 'all');
}
}
modules/blockpermanentlinks/blockpermanentlinks.php
+1 -2
View File
@@ -78,8 +78,7 @@ class BlockPermanentLinks extends Module
function hookHeader($params)
{
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockpermanentlinks.css', 'all');
Tools::addCSS(($this->_path).'blockpermanentlinks.css', 'all');
}
}
modules/blockrss/blockrss.php
+1 -2
View File
@@ -160,8 +160,7 @@ class Blockrss extends Module
function hookHeader($params)
{
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockrss.css', 'all');
Tools::addCSS(($this->_path).'blockrss.css', 'all');
}
}
modules/blocksearch/blocksearch.php
+9 -10
View File
@@ -80,23 +80,22 @@ class BlockSearch extends Module
*/
private function _hookCommon($params)
{
$context = Context::getContext();
$context->controller->smarty->assign('ENT_QUOTES', ENT_QUOTES);
$context->controller->smarty->assign('search_ssl', (int)(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off'));
global $smarty;
$smarty->assign('ENT_QUOTES', ENT_QUOTES);
$smarty->assign('search_ssl', (int)(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off'));
$ajaxSearch=(int)(Configuration::get('PS_SEARCH_AJAX'));
$context->controller->smarty->assign('ajaxsearch', $ajaxSearch);
$smarty->assign('ajaxsearch', $ajaxSearch);
$instantSearch = (int)(Configuration::get('PS_INSTANT_SEARCH'));
$context->controller->smarty->assign('instantsearch', $instantSearch);
$smarty->assign('instantsearch', $instantSearch);
if ($ajaxSearch)
{
$context->controller->addCSS(_PS_CSS_DIR_.'jquery.autocomplete.css');
$context->controller->addJS(_PS_JS_DIR_.'jquery/jquery.autocomplete.js');
Tools::addCSS(_PS_CSS_DIR_.'jquery.autocomplete.css');
Tools::addJS(_PS_JS_DIR_.'jquery/jquery.autocomplete.js');
}
$context->controller->addCSS(_THEME_CSS_DIR_.'product_list.css');
$context->controller->addCSS(($this->_path).'blocksearch.css', 'all');
Tools::addCSS(_THEME_CSS_DIR_.'product_list.css');
Tools::addCSS(($this->_path).'blocksearch.css', 'all');
return true;
}
}
modules/blockspecials/blockspecials.php
+1 -2
View File
@@ -107,8 +107,7 @@ class BlockSpecials extends Module
{
if (Configuration::get('PS_CATALOG_MODE'))
return ;
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockspecials.css', 'all');
Tools::addCSS(($this->_path).'blockspecials.css', 'all');
}
}
modules/blockstore/blockstore.php
+1 -2
View File
@@ -71,8 +71,7 @@ class BlockStore extends Module
function hookHeader($params)
{
$context = Context::getContext();
$context->controller->addCSS($this->_path.'/blockstore.css', 'all');
Tools::addCSS($this->_path.'/blockstore.css', 'all');
}
public function postProcess()
modules/blocksupplier/blocksupplier.php
+1 -2
View File
@@ -133,8 +133,7 @@ class BlockSupplier extends Module
function hookHeader($params)
{
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blocksupplier.css', 'all');
Tools::addCSS(($this->_path).'blocksupplier.css', 'all');
}
}
modules/blocktags/blocktags.php
+1 -2
View File
@@ -119,8 +119,7 @@ class BlockTags extends Module
function hookHeader($params)
{
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blocktags.css', 'all');
Tools::addCSS(($this->_path).'blocktags.css', 'all');
}
}
modules/blockuserinfo/blockuserinfo.php
+1 -2
View File
@@ -74,8 +74,7 @@ class BlockUserInfo extends Module
public function hookHeader($params)
{
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockuserinfo.css', 'all');
Tools::addCSS(($this->_path).'blockuserinfo.css', 'all');
}
}
modules/blockviewed/blockviewed.php
+1 -2
View File
@@ -186,7 +186,6 @@ class BlockViewed extends Module
function hookHeader($params)
{
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockviewed.css', 'all');
Tools::addCSS(($this->_path).'blockviewed.css', 'all');
}
}
modules/blockwishlist/blockwishlist.php
+1 -2
View File
@@ -171,8 +171,7 @@ class BlockWishList extends Module
public function hookHeader($params)
{
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockwishlist.css', 'all');
Tools::addCSS(($this->_path).'blockwishlist.css', 'all');
return $this->display(__FILE__, 'blockwishlist-header.tpl');
}
modules/carriercompare/carriercompare.php
+2 -3
View File
@@ -56,9 +56,8 @@ class CarrierCompare extends Module
$fileName = explode(DIRECTORY_SEPARATOR, $_SERVER['PHP_SELF']);
if ($fileName[(sizeof($fileName)-1)] != 'order.php')
return;
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'style.css', 'all');
$context->controller->addJS(($this->_path).'carriercompare.js');
Tools::addCSS(($this->_path).'style.css', 'all');
Tools::addJS(($this->_path).'carriercompare.js');
}
/*
modules/crossselling/crossselling.php
+1 -2
View File
@@ -96,8 +96,7 @@ class CrossSelling extends Module
public function hookHeader()
{
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'crossselling.css', 'all');
Tools::addCSS(($this->_path).'crossselling.css', 'all');
}
/**
modules/editorial/editorial.php
+1 -2
View File
@@ -313,7 +313,6 @@ class Editorial extends Module
public function hookHeader()
{
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'editorial.css', 'all');
Tools::addCSS(($this->_path).'editorial.css', 'all');
}
}
modules/loyalty/loyalty-program.php
+2 -3
View File
@@ -37,9 +37,8 @@ include_once(dirname(__FILE__).'/LoyaltyStateModule.php');
if (!$cookie->isLogged())
Tools::redirect('index.php?controller=authentication&back=modules/loyalty/loyalty-program.php');
$context = Context::getContext();
$context->controller->addCSS(_PS_CSS_DIR_.'jquery.cluetip.css', 'all');
$context->controller->addJS(array(_PS_JS_DIR_.'jquery/jquery.dimensions.js',_PS_JS_DIR_.'jquery/jquery.cluetip.js'));
Tools::addCSS(_PS_CSS_DIR_.'jquery.cluetip.css', 'all');
Tools::addJS(array(_PS_JS_DIR_.'jquery/jquery.dimensions.js',_PS_JS_DIR_.'jquery/jquery.cluetip.js'));
$customerPoints = (int)(LoyaltyModule::getPointsByCustomer((int)($cookie->id_customer)));
modules/productscategory/productscategory.php
+2 -3
View File
@@ -176,8 +176,7 @@ class productsCategory extends Module
public function hookHeader($params)
{
$context = Context::getContext();
$context->controller->addCSS($this->_path.'productscategory.css', 'all');
$context->controller->addJS(array($this->_path.'productscategory.js', _PS_JS_DIR_.'jquery/jquery.serialScroll-1.2.2-min.js'));
Tools::addCSS($this->_path.'productscategory.css', 'all');
Tools::addJS(array($this->_path.'productscategory.js', _PS_JS_DIR_.'jquery/jquery.serialScroll-1.2.2-min.js'));
}
}
modules/referralprogram/referralprogram-program.php
+2 -3
View File
@@ -35,9 +35,8 @@ include_once(dirname(__FILE__).'/ReferralProgramModule.php');
if (!$cookie->isLogged())
Tools::redirect('index.php?controller=authentication&back=modules/referralprogram/referralprogram-program.php');
$context = Context::getContext();
$context->controller->addCSS(_PS_CSS_DIR_.'thickbox.css', 'all');
$context->controller->addJS(array(_PS_JS_DIR_.'jquery/thickbox-modified.js',_PS_JS_DIR_.'jquery/jquery.idTabs.modified.js'));
Tools::addCSS(_PS_CSS_DIR_.'thickbox.css', 'all');
Tools::addJS(array(_PS_JS_DIR_.'jquery/thickbox-modified.js',_PS_JS_DIR_.'jquery/jquery.idTabs.modified.js'));
include(dirname(__FILE__).'/../../header.php');