// Rename treeview to treeview-categories
@@ -197,11 +197,11 @@ class HelperCore
|
|||||||
if (!$use_radio)
|
if (!$use_radio)
|
||||||
$input_name = $input_name.'[]';
|
$input_name = $input_name.'[]';
|
||||||
|
|
||||||
$this->context->controller->addCSS(_PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.css');
|
$this->context->controller->addCSS(_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.css');
|
||||||
$this->context->controller->addJs(array(
|
$this->context->controller->addJs(array(
|
||||||
_PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.js',
|
_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.js',
|
||||||
_PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.async.js',
|
_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.async.js',
|
||||||
_PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.edit.js',
|
_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.edit.js',
|
||||||
_PS_JS_DIR_.'admin-categories-tree.js'));
|
_PS_JS_DIR_.'admin-categories-tree.js'));
|
||||||
if ($use_search)
|
if ($use_search)
|
||||||
$this->context->controller->addJs(_PS_JS_DIR_.'jquery/plugins/autocomplete/jquery.autocomplete.js');
|
$this->context->controller->addJs(_PS_JS_DIR_.'jquery/plugins/autocomplete/jquery.autocomplete.js');
|
||||||
|
|||||||
@@ -91,11 +91,11 @@ class HelperFormCore extends Helper
|
|||||||
if ($categories)
|
if ($categories)
|
||||||
{
|
{
|
||||||
// Added Jquery plugin treeview (css and js files)
|
// Added Jquery plugin treeview (css and js files)
|
||||||
$this->context->controller->addJqueryPlugin('treeview');
|
$this->context->controller->addJqueryPlugin('treeview-categories');
|
||||||
|
|
||||||
// Added JS files
|
// Added JS files
|
||||||
$this->context->controller->addJS(_PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.async.js');
|
$this->context->controller->addJS(_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.async.js');
|
||||||
$this->context->controller->addJS(_PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.edit.js');
|
$this->context->controller->addJS(_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.edit.js');
|
||||||
$this->context->controller->addJS(_PS_JS_DIR_.'admin-categories-tree.js');
|
$this->context->controller->addJS(_PS_JS_DIR_.'admin-categories-tree.js');
|
||||||
|
|
||||||
if (isset($params['use_search']) && $params['use_search'])
|
if (isset($params['use_search']) && $params['use_search'])
|
||||||
|
|||||||
@@ -3932,16 +3932,16 @@ class AdminProductsControllerCore extends AdminController
|
|||||||
_PS_JS_DIR_.'tinymce.inc.js',
|
_PS_JS_DIR_.'tinymce.inc.js',
|
||||||
_PS_JS_DIR_.'fileuploader.js',
|
_PS_JS_DIR_.'fileuploader.js',
|
||||||
_PS_JS_DIR_.'admin-dnd.js',
|
_PS_JS_DIR_.'admin-dnd.js',
|
||||||
_PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.js',
|
_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.js',
|
||||||
_PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.async.js',
|
_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.async.js',
|
||||||
_PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.edit.js',
|
_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.edit.js',
|
||||||
_PS_JS_DIR_.'admin-categories-tree.js',
|
_PS_JS_DIR_.'admin-categories-tree.js',
|
||||||
_PS_JS_DIR_.'jquery/ui/jquery.ui.progressbar.min.js',
|
_PS_JS_DIR_.'jquery/ui/jquery.ui.progressbar.min.js',
|
||||||
_PS_JS_DIR_.'jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'
|
_PS_JS_DIR_.'jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'
|
||||||
));
|
));
|
||||||
|
|
||||||
$this->addCSS(array(
|
$this->addCSS(array(
|
||||||
_PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.css',
|
_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.css',
|
||||||
_PS_JS_DIR_.'jquery/plugins/timepicker/jquery-ui-timepicker-addon.css',
|
_PS_JS_DIR_.'jquery/plugins/timepicker/jquery-ui-timepicker-addon.css',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|||||||
@@ -16,8 +16,8 @@ $css_files = array(
|
|||||||
array('new_file' => $css_folder.'plugins/fancybox/jquery.fancybox.css'),
|
array('new_file' => $css_folder.'plugins/fancybox/jquery.fancybox.css'),
|
||||||
'jquery.jgrowl.css'=>
|
'jquery.jgrowl.css'=>
|
||||||
array('new_file' => $css_folder.'plugins/jgrowl/jquery.jgrowl.css'),
|
array('new_file' => $css_folder.'plugins/jgrowl/jquery.jgrowl.css'),
|
||||||
'jquery.treeview.css' =>
|
'jquery.treeview-categories.css' =>
|
||||||
array('new_file' => $css_folder.'plugins/treeview/jquery.treeview.css'),
|
array('new_file' => $css_folder.'plugins/treeview-categories/jquery.treeview-categories.css'),
|
||||||
'jqzoom.css' =>
|
'jqzoom.css' =>
|
||||||
array('new_file' => $css_folder.'plugins/jqzoom/jquery.jqzoom.css'),
|
array('new_file' => $css_folder.'plugins/jqzoom/jquery.jqzoom.css'),
|
||||||
'tabpane.css' =>
|
'tabpane.css' =>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 847 B After Width: | Height: | Size: 847 B |
|
Before Width: | Height: | Size: 110 B After Width: | Height: | Size: 110 B |
|
Before Width: | Height: | Size: 105 B After Width: | Height: | Size: 105 B |
|
Before Width: | Height: | Size: 106 B After Width: | Height: | Size: 106 B |
|
Before Width: | Height: | Size: 837 B After Width: | Height: | Size: 837 B |
|
Before Width: | Height: | Size: 841 B After Width: | Height: | Size: 841 B |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 807 B After Width: | Height: | Size: 807 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
@@ -52,14 +52,14 @@ $plugins = array(
|
|||||||
array('new_file' => $plugins_folder.'jquery.hoverIntent.js', 'name' => 'hoverIntent'),
|
array('new_file' => $plugins_folder.'jquery.hoverIntent.js', 'name' => 'hoverIntent'),
|
||||||
'jquery-ui-1.8.10.custom.min.js' =>
|
'jquery-ui-1.8.10.custom.min.js' =>
|
||||||
array('new_file' => __DIR__.'/jquery/jquery-ui.will.be.removed.in.1.6.js', 'name' => ''),
|
array('new_file' => __DIR__.'/jquery/jquery-ui.will.be.removed.in.1.6.js', 'name' => ''),
|
||||||
'jquery.treeview.async.js' =>
|
'jquery.treeview-categories.async.js' =>
|
||||||
array('new_file' => $plugins_folder.'treeview/jquery.treeview.async.js', 'name' => 'treeview.async'),
|
array('new_file' => $plugins_folder.'treeview-categories/jquery.treeview-categories.async.js', 'name' => 'treeview-categories.async'),
|
||||||
'jquery.treeview.edit.js' =>
|
'jquery.treeview-categories.edit.js' =>
|
||||||
array('new_file' => $plugins_folder.'treeview/jquery.treeview.edit.js', 'name' => 'treeview.edit'),
|
array('new_file' => $plugins_folder.'treeview-categories/jquery.treeview-categories.edit.js', 'name' => 'treeview-categories.edit'),
|
||||||
'jquery.treeview.js' =>
|
'jquery.treeview-categories.js' =>
|
||||||
array('new_file' => $plugins_folder.'treeview/jquery.treeview.js', 'name' => 'treeview'),
|
array('new_file' => $plugins_folder.'treeview-categories/jquery.treeview-categories.js', 'name' => 'treeview-categories'),
|
||||||
'jquery.treeview.sortable.js' =>
|
'jquery.treeview-categories.sortable.js' =>
|
||||||
array('new_file' => $plugins_folder.'treeview/jquery.treeview.sortable.js', 'name' => 'treeview.sortable'),
|
array('new_file' => $plugins_folder.'treeview-categories/jquery.treeview-categories.sortable.js', 'name' => 'treeview-categories.sortable'),
|
||||||
'tabpane.js' =>
|
'tabpane.js' =>
|
||||||
array('new_file' => $plugins_folder.'tabpane/jquery.tabpane.js', 'name' => 'tabpane'),
|
array('new_file' => $plugins_folder.'tabpane/jquery.tabpane.js', 'name' => 'tabpane'),
|
||||||
);
|
);
|
||||||
|
|||||||