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

[+] Classes : added new class Media => It contains all the method related to media like CSS, JS

Browse Source 
[+] Classes : added new method Media::addJquery(), Media::addJqueryUI(), Media::addJqueryPlugin()
[~] Deprecated : All method related to CCC has been moved in class Media
This commit is contained in:
vAugagneur
2011-09-30 13:01:10 +00:00
parent 6f2d02442d
commit e8901103e3
289 changed files with 5588 additions and 3517 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminHomeController.php
+2 -2
View File
@@ -155,8 +155,8 @@ class AdminHomeControllerCore extends AdminController
{
parent::setMedia();
if (strpos($_SERVER['HTTP_USER_AGENT'],'MSIE') !== false)
$this->addJS(_PS_JS_DIR_.'jquery/excanvas.min.js');
$this->addJS(_PS_JS_DIR_.'jquery/jquery.flot.min.js');
$this->addJqueryPlugin('excanvas');
$this->addJqueryPlugin('flot');
}
protected function warnDomainName()
controllers/front/AuthController.php
+2 -1
View File
@@ -358,7 +358,8 @@ class AuthControllerCore extends FrontController
{
parent::setMedia();
$this->addCSS(_THEME_CSS_DIR_.'authentication.css');
$this->addJS(array(_THEME_JS_DIR_.'tools/statesManagement.js', _PS_JS_DIR_.'jquery/jquery-typewatch.pack.js'));
$this->addJqueryPlugin('typewatch');
$this->addJS(_THEME_JS_DIR_.'tools/statesManagement.js');
}
public function process()
controllers/front/CategoryController.php
+1 -1
View File
@@ -36,8 +36,8 @@ class CategoryControllerCore extends FrontController
public function setMedia()
{
parent::setMedia();
//TODO : check why cluetip css is include without js file
$this->addCSS(array(
_PS_CSS_DIR_.'jquery.cluetip.css' => 'all',
_THEME_CSS_DIR_.'scenes.css' => 'all',
_THEME_CSS_DIR_.'category.css' => 'all',
_THEME_CSS_DIR_.'product_list.css' => 'all',
controllers/front/HistoryController.php
+4 -3
View File
@@ -37,10 +37,11 @@ class HistoryControllerCore extends FrontController
parent::setMedia();
$this->addCSS(_THEME_CSS_DIR_.'history.css');
$this->addCSS(_THEME_CSS_DIR_.'addresses.css');
$this->addJqueryPlugin('scrollTo');
$this->addJS(array(
_PS_JS_DIR_.'jquery/jquery.scrollTo-1.4.2-min.js',
_THEME_JS_DIR_.'history.js',
_THEME_JS_DIR_.'tools.js'));
_THEME_JS_DIR_.'history.js',
_THEME_JS_DIR_.'tools.js')
);
}
/**
controllers/front/OrderFollowController.php
+2 -1
View File
@@ -100,6 +100,7 @@ class OrderFollowControllerCore extends FrontController
parent::setMedia();
$this->addCSS(_THEME_CSS_DIR_.'history.css');
$this->addCSS(_THEME_CSS_DIR_.'addresses.css');
$this->addJS(array(_PS_JS_DIR_.'jquery/jquery.scrollTo-1.4.2-min.js', _THEME_JS_DIR_.'history.js'));
$this->addJqueryPlugin('scrollTo');
$this->addJS(_THEME_JS_DIR_.'history.js');
}
}
controllers/front/OrderOpcController.php
+1 -1
View File
@@ -221,7 +221,7 @@ class OrderOpcControllerCore extends ParentOrderController
$this->addCSS(_THEME_CSS_DIR_.'order-opc.css');
// Adding JS files
$this->addJS(_THEME_JS_DIR_.'order-opc.js');
$this->addJS(_PS_JS_DIR_.'jquery/jquery.scrollTo-1.4.2-min.js');
$this->addJqueryPlugin('scrollTo');
$this->addJS(_THEME_JS_DIR_.'tools/statesManagement.js');
}
controllers/front/OrderSlipController.php
+2 -1
View File
@@ -37,7 +37,8 @@ class OrderSlipControllerCore extends FrontController
parent::setMedia();
$this->addCSS(_THEME_CSS_DIR_.'history.css');
$this->addCSS(_THEME_CSS_DIR_.'addresses.css');
$this->addJS(array(_PS_JS_DIR_.'jquery/jquery.scrollTo-1.4.2-min.js',_THEME_JS_DIR_.'history.js'));
$this->addJqueryPlugin('scrollTo');
$this->addJS(_THEME_JS_DIR_.'history.js');
}
/**
controllers/front/ParentOrderController.php
+2 -4
View File
@@ -134,17 +134,15 @@ class ParentOrderControllerCore extends FrontController
// Adding CSS style sheet
$this->addCSS(_THEME_CSS_DIR_.'addresses.css');
$this->addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'screen');
// Adding JS files
$this->addJS(_THEME_JS_DIR_.'tools.js');
if ((Configuration::get('PS_ORDER_PROCESS_TYPE') == 0 && Tools::getValue('step') == 1) || Configuration::get('PS_ORDER_PROCESS_TYPE') == 1)
$this->addJS(_THEME_JS_DIR_.'order-address.js');
$this->addJS(_PS_JS_DIR_.'jquery/jquery.fancybox-1.3.4.js');
$this->addJqueryPlugin('fancybox');
if ((int)(Configuration::get('PS_BLOCK_CART_AJAX')) || Configuration::get('PS_ORDER_PROCESS_TYPE') == 1)
{
$this->addJS(_THEME_JS_DIR_.'cart-summary.js');
$this->addJS(_PS_JS_DIR_.'jquery/jquery-typewatch.pack.js');
$this->addJqueryPlugin('typewatch');
}
}
controllers/front/ProductController.php
+5 -8
View File
@@ -35,18 +35,15 @@ class ProductControllerCore extends FrontController
$this->addCSS(_THEME_CSS_DIR_.'product.css');
$this->addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'screen');
$this->addJqueryPlugin(array('fancybox', 'idTabs', 'scrollTo', 'serialScroll'));
$this->addJS(array(
_PS_JS_DIR_.'jquery/jquery.fancybox-1.3.4.js',
_PS_JS_DIR_.'jquery/jquery.idTabs.modified.js',
_PS_JS_DIR_.'jquery/jquery.scrollTo-1.4.2-min.js',
_PS_JS_DIR_.'jquery/jquery.serialScroll-1.2.2-min.js',
_THEME_JS_DIR_.'tools.js',
_THEME_JS_DIR_.'product.js'));
_THEME_JS_DIR_.'tools.js',
_THEME_JS_DIR_.'product.js')
);
if (Configuration::get('PS_DISPLAY_JQZOOM') == 1)
{
$this->addCSS(_PS_CSS_DIR_.'jqzoom.css', 'screen');
$this->addJS(_PS_JS_DIR_.'jquery/jquery.jqzoom.js');
$this->addJqueryPlugin('jqzoom');
}
}